diff --git a/Source/UI/LookAndFeel/MaterialButtonLookAndFeel.h b/Source/UI/LookAndFeel/MaterialButtonLookAndFeel.h
index ee04e4bc9d0c13d14ca826f5986fbe41e8053fa4..1b400befe02d76be61cd6bec3ceb09431a8309c3 100644
--- a/Source/UI/LookAndFeel/MaterialButtonLookAndFeel.h
+++ b/Source/UI/LookAndFeel/MaterialButtonLookAndFeel.h
@@ -26,7 +26,6 @@
 
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "../../Processors/PluginManager/OpenEphysPlugin.h"
-#include "CustomLookAndFeel.h"
 
 
 /**
diff --git a/Source/UI/Utils/LinearButtonGroupManager.cpp b/Source/UI/Utils/LinearButtonGroupManager.cpp
index 8c4488b3dd649b7fd5874bcdc2a9c6b9b0769538..a132623ce50b380687169189591efd48a230663c 100644
--- a/Source/UI/Utils/LinearButtonGroupManager.cpp
+++ b/Source/UI/Utils/LinearButtonGroupManager.cpp
@@ -88,7 +88,9 @@ void LinearButtonGroupManager::resized()
     const int height    = getHeight();
 
     const int numButtons = m_buttons.size();
-    const int buttonWidth = width / numButtons;
+    const int buttonWidth = numButtons != 0
+                                ? width / numButtons
+                                : 0;
 
     // Set bounds for each button
     juce::Rectangle<int> buttonBounds (0, 0, buttonWidth, height);
diff --git a/Source/UI/Utils/LinearButtonGroupManager.h b/Source/UI/Utils/LinearButtonGroupManager.h
index a35bf62b9e16053399ffc6af33d2e69318b5c9b8..4e6af5c84a2678f64c07ecf8c3467e4df75edd77 100644
--- a/Source/UI/Utils/LinearButtonGroupManager.h
+++ b/Source/UI/Utils/LinearButtonGroupManager.h
@@ -24,10 +24,9 @@
 #ifndef LINEARBUTTONGROUPMANAGER_H_INCLUDED
 #define LINEARBUTTONGROUPMANAGER_H_INCLUDED
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
 #include "ButtonGroupManager.h"
 
+
 /**
 
     This class provides possibility to store buttons with radiobutton behaviour in the single
diff --git a/Source/UI/Utils/TiledButtonGroupManager.h b/Source/UI/Utils/TiledButtonGroupManager.h
index d1f1fa17d24fca3e2487d184576aed090b1d4192..4286db4a2a814fe9222be1aad0e0211f78d2d6eb 100644
--- a/Source/UI/Utils/TiledButtonGroupManager.h
+++ b/Source/UI/Utils/TiledButtonGroupManager.h
@@ -24,7 +24,6 @@
 #ifndef TILEDBUTTONGROUPMANAGER_H_INCLUDED
 #define TILEDBUTTONGROUPMANAGER_H_INCLUDED
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
 #include "../../Processors/PluginManager/OpenEphysPlugin.h"
 #include "ButtonGroupManager.h"
 
@@ -37,8 +36,6 @@
     using mouse drag selection. (mouse drag - to select, shift+mouse drag to deselect)
 
 */
-
-
 class PLUGIN_API TiledButtonGroupManager : public ButtonGroupManager
 {
 public: