diff --git a/app/src/gambas3/.src/Debug/FTestSuite.form b/app/src/gambas3/.src/Debug/FTestSuite.form
index 200b7d0dc..d09d0207f 100644
--- a/app/src/gambas3/.src/Debug/FTestSuite.form
+++ b/app/src/gambas3/.src/Debug/FTestSuite.form
@@ -6,8 +6,22 @@
   Arrangement = Arrange.Vertical
   Spacing = True
   Margin = True
+  { HBox1 HBox
+    MoveScaled(1,1,79,4)
+    Spacing = True
+    { Label1 Label
+      MoveScaled(0,0,9,4)
+      AutoResize = True
+      Text = ("Test with")
+    }
+    { cmbTestWith ComboBox
+      MoveScaled(10,0,20,4)
+      Expand = True
+      ReadOnly = True
+    }
+  }
   { HBox2 Panel
-    MoveScaled(2,4,77,42)
+    MoveScaled(1,8,77,42)
     Expand = True
     Arrangement = Arrange.Horizontal
     Border = Border.Plain
@@ -87,37 +101,19 @@
     }
   }
   { HBox3 HBox
-    MoveScaled(2,49,80,4)
-    { Panel3 HBox
-      MoveScaled(1,0,31,4)
-      Expand = True
-      Spacing = True
-      { Label1 Label
-        MoveScaled(0,0,9,4)
-        AutoResize = True
-        Text = ("Test with")
-      }
-      { cmbTestWith ComboBox
-        MoveScaled(10,0,20,4)
-        Expand = True
-        ReadOnly = True
-      }
+    MoveScaled(2,51,80,4)
+    Spacing = True
+    Invert = True
+    { btnClose Button
+      MoveScaled(58,0,16,4)
+      Text = ("Close")
+      Picture = Picture["icon:/small/close"]
+      Cancel = True
     }
-    { Panel4 HBox
-      MoveScaled(39,0,38,4)
-      Spacing = True
-      Invert = True
-      { btnClose Button
-        MoveScaled(19,0,16,4)
-        Text = ("Close")
-        Picture = Picture["icon:/small/close"]
-        Cancel = True
-      }
-      { btnReset Button
-        MoveScaled(2,0,16,4)
-        Text = ("Reset")
-        Picture = Picture["icon:/small/undo"]
-      }
+    { btnReset Button
+      MoveScaled(41,0,16,4)
+      Text = ("Reset")
+      Picture = Picture["icon:/small/undo"]
     }
   }
 }