diff --git a/plugins/GunScan.form b/plugins/GunScan.form
index e67067b..a2032ca 100644
--- a/plugins/GunScan.form
+++ b/plugins/GunScan.form
@@ -24,16 +24,16 @@
           <Group type="102" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" max="-2" attributes="0">
-                  <Component id="jPanel1" max="32767" attributes="0"/>
-                  <Component id="jPanel2" min="-2" max="-2" attributes="0"/>
                   <Group type="102" attributes="0">
                       <Component id="buttonStart" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="32767" attributes="0"/>
+                      <EmptySpace min="-2" pref="34" max="-2" attributes="0"/>
                       <Component id="buttonAbort" min="-2" max="-2" attributes="0"/>
                   </Group>
+                  <Component id="jPanel1" max="32767" attributes="0"/>
+                  <Component id="jPanel2" alignment="0" max="32767" attributes="0"/>
               </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Component id="plot" max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="plot" pref="531" max="32767" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
@@ -159,7 +159,7 @@
               <SpinnerModel initial="5.0" maximum="90.0" minimum="1.0" numberType="java.lang.Double" stepSize="1.0" type="number"/>
             </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[53, 20]"/>
+              <Dimension value="[64, 20]"/>
             </Property>
           </Properties>
         </Component>
@@ -174,7 +174,7 @@
               <SpinnerModel initial="0.0" maximum="360.0" minimum="-180.0" numberType="java.lang.Double" stepSize="1.0" type="number"/>
             </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[53, 20]"/>
+              <Dimension value="[64, 20]"/>
             </Property>
           </Properties>
         </Component>
@@ -189,7 +189,7 @@
               <SpinnerModel initial="1.0" maximum="50.0" minimum="1.0" numberType="java.lang.Double" stepSize="1.0" type="number"/>
             </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[53, 20]"/>
+              <Dimension value="[64, 20]"/>
             </Property>
           </Properties>
         </Component>
@@ -204,7 +204,7 @@
               <SpinnerModel initial="0.1" maximum="5.0" minimum="0.0" numberType="java.lang.Double" stepSize="0.01" type="number"/>
             </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[53, 20]"/>
+              <Dimension value="[64, 20]"/>
             </Property>
           </Properties>
         </Component>
@@ -217,7 +217,7 @@
               <Dimension value="[53, 20]"/>
             </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[53, 20]"/>
+              <Dimension value="[64, 20]"/>
             </Property>
           </Properties>
         </Component>
@@ -249,7 +249,7 @@
                           <Component id="spinnerDispersion" min="-2" max="-2" attributes="0"/>
                       </Group>
                   </Group>
-                  <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -278,7 +278,7 @@
               <SpinnerModel initial="1.0" maximum="10.0" minimum="0.0" numberType="java.lang.Double" stepSize="0.01" type="number"/>
             </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[53, 20]"/>
+              <Dimension value="[64, 20]"/>
             </Property>
           </Properties>
         </Component>
@@ -293,7 +293,7 @@
               <SpinnerModel initial="0.0" maximum="10000.0" minimum="0.0" numberType="java.lang.Double" stepSize="0.1" type="number"/>
             </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[53, 20]"/>
+              <Dimension value="[64, 20]"/>
             </Property>
           </Properties>
         </Component>
diff --git a/plugins/GunScan.java b/plugins/GunScan.java
index 9025192..582197e 100644
--- a/plugins/GunScan.java
+++ b/plugins/GunScan.java
@@ -116,26 +116,26 @@ public class GunScan extends Panel {
         stopLabel.setText("Stop:");
 
         spinnerStep.setModel(new javax.swing.SpinnerNumberModel(5.0d, 1.0d, 90.0d, 1.0d));
-        spinnerStep.setPreferredSize(new java.awt.Dimension(53, 20));
+        spinnerStep.setPreferredSize(new java.awt.Dimension(64, 20));
 
         stepLabel.setText("Step:");
 
         spinnerStart.setModel(new javax.swing.SpinnerNumberModel(0.0d, -180.0d, 360.0d, 1.0d));
-        spinnerStart.setPreferredSize(new java.awt.Dimension(53, 20));
+        spinnerStart.setPreferredSize(new java.awt.Dimension(64, 20));
 
         samplesLabel.setText("Nb Samples:");
 
         spinnerSamples.setModel(new javax.swing.SpinnerNumberModel(1.0d, 1.0d, 50.0d, 1.0d));
-        spinnerSamples.setPreferredSize(new java.awt.Dimension(53, 20));
+        spinnerSamples.setPreferredSize(new java.awt.Dimension(64, 20));
 
         latencyLabel.setText("Latency:");
 
         spinnerLatency.setModel(new javax.swing.SpinnerNumberModel(0.1d, 0.0d, 5.0d, 0.01d));
-        spinnerLatency.setPreferredSize(new java.awt.Dimension(53, 20));
+        spinnerLatency.setPreferredSize(new java.awt.Dimension(64, 20));
 
         spinnerStop.setModel(new javax.swing.SpinnerNumberModel(360.0d, -180.0d, 360.0d, 1.0d));
         spinnerStop.setMinimumSize(new java.awt.Dimension(53, 20));
-        spinnerStop.setPreferredSize(new java.awt.Dimension(53, 20));
+        spinnerStop.setPreferredSize(new java.awt.Dimension(64, 20));
 
         javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
         jPanel1.setLayout(jPanel1Layout);
@@ -195,12 +195,12 @@ public class GunScan extends Panel {
         jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("Beam Parameters"));
 
         spinnerDispersion.setModel(new javax.swing.SpinnerNumberModel(1.0d, 0.0d, 10.0d, 0.01d));
-        spinnerDispersion.setPreferredSize(new java.awt.Dimension(53, 20));
+        spinnerDispersion.setPreferredSize(new java.awt.Dimension(64, 20));
 
         energyLabel.setText("Energy:");
 
         spinnerEnergy.setModel(new javax.swing.SpinnerNumberModel(0.0d, 0.0d, 10000.0d, 0.1d));
-        spinnerEnergy.setPreferredSize(new java.awt.Dimension(53, 20));
+        spinnerEnergy.setPreferredSize(new java.awt.Dimension(64, 20));
 
         dispersionLabel.setText("Dispersion:");
 
@@ -219,7 +219,7 @@ public class GunScan extends Panel {
                         .addComponent(dispersionLabel)
                         .addGap(0, 0, 0)
                         .addComponent(spinnerDispersion, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                .addGap(20, 20, 20))
+                .addContainerGap())
         );
         jPanel2Layout.setVerticalGroup(
             jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -248,14 +248,14 @@ public class GunScan extends Panel {
             .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                    .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addGroup(layout.createSequentialGroup()
                         .addComponent(buttonStart)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(buttonAbort)))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(plot, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addGap(34, 34, 34)
+                        .addComponent(buttonAbort))
+                    .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(plot, javax.swing.GroupLayout.DEFAULT_SIZE, 531, Short.MAX_VALUE)
                 .addContainerGap())
         );
         layout.setVerticalGroup(