diff --git a/prism/src/userinterface/simulator/GUISimulator.form b/prism/src/userinterface/simulator/GUISimulator.form
index dd45dc6c..9b866750 100644
--- a/prism/src/userinterface/simulator/GUISimulator.form
+++ b/prism/src/userinterface/simulator/GUISimulator.form
@@ -225,10 +225,10 @@
                           </Border>
                         </Property>
                         <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                          <Dimension value="[226, 0]"/>
+                          <Dimension value="[0, 0]"/>
                         </Property>
                         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                          <Dimension value="[285, 50]"/>
+                          <Dimension value="[0, 50]"/>
                         </Property>
                       </Properties>
                       <Constraints>
@@ -531,6 +531,12 @@
                                 <EmptyBorder bottom="0" left="0" right="10" top="0"/>
                               </Border>
                             </Property>
+                            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                              <Dimension value="[0, 0]"/>
+                            </Property>
+                            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                              <Dimension value="[0, 0]"/>
+                            </Property>
                           </Properties>
                           <Constraints>
                             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
diff --git a/prism/src/userinterface/simulator/GUISimulator.java b/prism/src/userinterface/simulator/GUISimulator.java
index 23115de9..0d634819 100644
--- a/prism/src/userinterface/simulator/GUISimulator.java
+++ b/prism/src/userinterface/simulator/GUISimulator.java
@@ -1139,8 +1139,8 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
         topSplit.setOneTouchExpandable(true);
         topSplit.setPreferredSize(new java.awt.Dimension(0, 0));
         tabbedPane.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 10, 0, 0));
-        tabbedPane.setMinimumSize(new java.awt.Dimension(226, 0));
-        tabbedPane.setPreferredSize(new java.awt.Dimension(285, 50));
+        tabbedPane.setMinimumSize(new java.awt.Dimension(0, 0));
+        tabbedPane.setPreferredSize(new java.awt.Dimension(0, 50));
         outerStateLabelPanel.setLayout(new java.awt.BorderLayout());
 
         outerStateLabelPanel.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
@@ -1234,6 +1234,8 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
         topLeftPanel.setLayout(new java.awt.BorderLayout());
 
         topLeftPanel.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 10));
+        topLeftPanel.setMinimumSize(new java.awt.Dimension(0, 0));
+        topLeftPanel.setPreferredSize(new java.awt.Dimension(0, 0));
         innerTopLeftPanel.setLayout(new java.awt.BorderLayout(5, 5));
 
         innerTopLeftPanel.setMinimumSize(new java.awt.Dimension(50, 0));
@@ -1383,7 +1385,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect
 
         autoTimeCheckPanel.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 0, 0, 0));
         autoTimeCheck.setText("Generate time automatically");
-        autoTimeCheck.setToolTipText("When not selected, you will be promted to enter the time spent in state manually");
+        autoTimeCheck.setToolTipText("When not selected, you will be promted to manually enter the time spent in states");
         autoTimeCheck.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
         autoTimeCheck.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
         autoTimeCheck.setMargin(new java.awt.Insets(0, 0, 0, 0));