diff --git a/src/main_window.py b/src/main_window.py
index 719c037..82baec6 100644
--- a/src/main_window.py
+++ b/src/main_window.py
@@ -243,12 +243,9 @@ def __create_toolbars(self):
         grid1.Add(self.spinCtrlStop, pos=(1, 6))
         grid1.Add(textGain, pos=(0, 7), flag=wx.ALIGN_CENTER)
         grid1.Add(self.controlGain, pos=(1, 7), flag=wx.ALIGN_CENTER)
+        grid1.Add((5, 1), pos=(0, 8))
         grid1.AddGrowableCol(2)
 
-        self.toolbar1.SetSizerAndFit(grid1)
-        self.toolbar1.Layout()
-        toolSize1 = self.toolbar1.GetMinSize()
-
         self.toolbar2 = wx.Window(self)
 
         textMode = wx.StaticText(self.toolbar2, label="Mode")
@@ -280,8 +277,12 @@ def __create_toolbars(self):
         grid2.Add((20, 1), pos=(0, 3))
         grid2.Add(textDisplay, pos=(0, 4), flag=wx.ALIGN_CENTER)
         grid2.Add(self.choiceDisplay, pos=(1, 4), flag=wx.ALIGN_CENTER)
+        grid2.Add((5, 1), pos=(0, 5))
         grid2.AddGrowableCol(3)
 
+        self.toolbar1.SetSizerAndFit(grid1)
+        self.toolbar1.Layout()
+        toolSize1 = self.toolbar1.GetMinSize()
         self.toolbar2.SetSizerAndFit(grid2)
         self.toolbar2.Layout()
         toolSize2 = self.toolbar2.GetMinSize()
@@ -294,7 +295,9 @@ def __create_toolbars(self):
                           Centre().
                           CentrePane())
         self._mgr.AddPane(self.toolbar1, aui.AuiPaneInfo().
+                          ToolbarPane().
                           Bottom().
+                          Layer(1).
                           LeftDockable(False).
                           RightDockable(False).
                           NotebookDockable(False).
@@ -305,7 +308,9 @@ def __create_toolbars(self):
                           MinimizeButton(True).
                           MinSize(toolSize1))
         self._mgr.AddPane(self.toolbar2, aui.AuiPaneInfo().
+                          ToolbarPane().
                           Bottom().
+                          Layer(2).
                           LeftDockable(False).
                           RightDockable(False).
                           NotebookDockable(False).
@@ -1206,11 +1211,15 @@ def __set_size(self):
         toolSize1 = self.toolbar1.GetMinSize()
         toolSize2 = self.toolbar2.GetMinSize()
 
-        if width < (toolSize1[0] + toolSize2[0] +
-                    (widthBorder * 2) +
-                    (widthFrame * 2)):
-            self._mgr.GetPane(self.toolbar2).Layer(1)
-            self._mgr.Update()
+        paneTool1 = self._mgr.GetPane(self.toolbar1)
+        paneTool2 = self._mgr.GetPane(self.toolbar2)
+        if width >= (toolSize1[0] + toolSize2[0] +
+                     (widthBorder * 2) +
+                     (widthFrame * 2)):
+            paneTool1.ToolbarPane()
+            paneTool2.ToolbarPane()
+            paneTool2.Layer(1)
+        self._mgr.Update()
 
         minWidth = max(toolSize1[0], toolSize2[0]) + widthBorder
         minWidth = max(minWidth, 640)
diff --git a/src/version-timestamp b/src/version-timestamp
index ab2e918..0bc2768 100644
--- a/src/version-timestamp
+++ b/src/version-timestamp
@@ -1 +1 @@
-1447889903
\ No newline at end of file
+1447895477
\ No newline at end of file