diff --git a/comp/src/gb.form/.project b/comp/src/gb.form/.project
index 1d6848c70..41dde641e 100644
--- a/comp/src/gb.form/.project
+++ b/comp/src/gb.form/.project
@@ -1,6 +1,6 @@
 # Gambas Project File 3.0
 Title=More controls for graphical components
-Startup=FSwitchButton
+Startup=FTestSidePanel
 Version=3.11.90
 VersionFile=1
 Component=gb.image
diff --git a/comp/src/gb.form/.src/Color/ColorPalette.class b/comp/src/gb.form/.src/Color/ColorPalette.class
index 9bd39b3d1..be45ea730 100644
--- a/comp/src/gb.form/.src/Color/ColorPalette.class
+++ b/comp/src/gb.form/.src/Color/ColorPalette.class
@@ -201,7 +201,9 @@ Public Sub View_MouseMove()
   Dim I As Integer
   Dim sColor As String
   Dim Y As Integer
-
+  
+  'Debug
+  
   Y = Mouse.ScreenY - $hView.ScreenY
   If Y < 0 Or If Y >= $hView.H Then Return
   
@@ -284,7 +286,7 @@ End
 
 Public Sub View_Arrange()
 
-  CUSTOM_W = $hView.ClientH - CUSTOM_D * 2
+  CUSTOM_W = Max(CUSTOM_D, $hView.ClientH - CUSTOM_D * 2)
   UpdateColors
 
 End
diff --git a/comp/src/gb.form/.src/SidePanel/FSidePanel.class b/comp/src/gb.form/.src/SidePanel/FSidePanel.class
index ec3a31aa0..95cfd9ad4 100644
--- a/comp/src/gb.form/.src/SidePanel/FSidePanel.class
+++ b/comp/src/gb.form/.src/SidePanel/FSidePanel.class
@@ -193,11 +193,11 @@ Private Sub RefreshPanel()
   'If $bTransparent Then panSide.Move(0, 0, Me.ClientW, Me.ClientH)
   
   If $bTransparent Then
-    If $bSeparator Then
-      D = 1
-    Else
+    'If $bSeparator Then
+    '  D = 1
+    'Else
       D = 0
-    Endif
+    'Endif
   Else
     D = BUTTON_H
   Endif
@@ -376,7 +376,7 @@ Private Sub RefreshAll()
     panSide.Hide 'Enabled = FALSE
     
     If $bTransparent Then
-      D = If($bSeparator, 1, 0)
+      D = 0 'If($bSeparator, 1, 0)
     Else
       D = BUTTON_H
     Endif