diff --git a/config/tasks.properties b/config/tasks.properties
index 131e315e..c094a1ff 100644
--- a/config/tasks.properties
+++ b/config/tasks.properties
@@ -1 +1 @@
-#scan_guard=3
+scan_guard=3
diff --git a/plugins/HoloScan.form b/plugins/HoloScan.form
index 0475eb1a..9aaa2b97 100644
--- a/plugins/HoloScan.form
+++ b/plugins/HoloScan.form
@@ -354,7 +354,7 @@
       <Layout>
         <DimensionLayout dim="0">
           <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" alignment="0" attributes="0">
+              <Group type="102" attributes="0">
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Component id="buttonScientaSetup" max="32767" attributes="0"/>
@@ -371,6 +371,7 @@
                       <Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
                       <Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
                       <Component id="checkAngleDistribution" alignment="0" min="-2" max="-2" attributes="0"/>
+                      <Component id="checkEndScan" alignment="0" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
               </Group>
@@ -405,7 +406,9 @@
                   <Component id="checkCur2" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="checkCur3" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace type="separate" pref="97" max="32767" attributes="0"/>
+                  <EmptySpace pref="57" max="32767" attributes="0"/>
+                  <Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace type="separate" max="-2" attributes="0"/>
                   <Component id="buttonScientaSetup" min="-2" max="-2" attributes="0"/>
                   <EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
               </Group>
@@ -509,6 +512,11 @@
             <Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
           </Properties>
         </Component>
+        <Component class="javax.swing.JCheckBox" name="checkEndScan">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Turn off beam at end"/>
+          </Properties>
+        </Component>
       </SubComponents>
     </Container>
     <Container class="javax.swing.JPanel" name="jPanel3">
@@ -531,10 +539,6 @@
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Component id="buttonStart" max="32767" attributes="0"/>
                       <Component id="buttonAbort" pref="203" max="32767" attributes="0"/>
-                      <Group type="102" alignment="0" attributes="0">
-                          <Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                      </Group>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
               </Group>
@@ -548,8 +552,6 @@
                   <EmptySpace type="separate" max="-2" attributes="0"/>
                   <Component id="buttonAbort" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="32767" attributes="0"/>
-                  <Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -571,11 +573,6 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonAbortActionPerformed"/>
           </Events>
         </Component>
-        <Component class="javax.swing.JCheckBox" name="checkEndScan">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Turn off beam at end"/>
-          </Properties>
-        </Component>
       </SubComponents>
     </Container>
   </SubComponents>
diff --git a/plugins/HoloScan.java b/plugins/HoloScan.java
index d51503f5..e489c605 100644
--- a/plugins/HoloScan.java
+++ b/plugins/HoloScan.java
@@ -146,10 +146,10 @@ public class HoloScan extends Panel {
         checkCur3 = new javax.swing.JCheckBox();
         buttonScientaSetup = new javax.swing.JButton();
         checkAngleDistribution = new javax.swing.JCheckBox();
+        checkEndScan = new javax.swing.JCheckBox();
         jPanel3 = new javax.swing.JPanel();
         buttonStart = new javax.swing.JButton();
         buttonAbort = new javax.swing.JButton();
-        checkEndScan = new javax.swing.JCheckBox();
 
         panelPhi.setBorder(javax.swing.BorderFactory.createTitledBorder("Positioners"));
         panelPhi.setPreferredSize(new java.awt.Dimension(239, 538));
@@ -385,6 +385,8 @@ public class HoloScan extends Panel {
         checkAngleDistribution.setContentAreaFilled(false);
         checkAngleDistribution.setName("AngleDistribution"); // NOI18N
 
+        checkEndScan.setText("Turn off beam at end");
+
         javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
         panelSensors.setLayout(panelSensorsLayout);
         panelSensorsLayout.setHorizontalGroup(
@@ -405,7 +407,8 @@ public class HoloScan extends Panel {
                     .addComponent(checkCur1)
                     .addComponent(checkCur2)
                     .addComponent(checkCur3)
-                    .addComponent(checkAngleDistribution))
+                    .addComponent(checkAngleDistribution)
+                    .addComponent(checkEndScan))
                 .addContainerGap())
         );
         panelSensorsLayout.setVerticalGroup(
@@ -437,7 +440,9 @@ public class HoloScan extends Panel {
                 .addComponent(checkCur2)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(checkCur3)
-                .addGap(18, 97, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 57, Short.MAX_VALUE)
+                .addComponent(checkEndScan)
+                .addGap(18, 18, 18)
                 .addComponent(buttonScientaSetup)
                 .addGap(26, 26, 26))
         );
@@ -459,8 +464,6 @@ public class HoloScan extends Panel {
             }
         });
 
-        checkEndScan.setText("Turn off beam at end");
-
         javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
         jPanel3.setLayout(jPanel3Layout);
         jPanel3Layout.setHorizontalGroup(
@@ -469,10 +472,7 @@ public class HoloScan extends Panel {
                 .addContainerGap()
                 .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 203, Short.MAX_VALUE)
-                    .addGroup(jPanel3Layout.createSequentialGroup()
-                        .addComponent(checkEndScan)
-                        .addGap(0, 0, Short.MAX_VALUE)))
+                    .addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 203, Short.MAX_VALUE))
                 .addContainerGap())
         );
         jPanel3Layout.setVerticalGroup(
@@ -482,9 +482,7 @@ public class HoloScan extends Panel {
                 .addComponent(buttonStart)
                 .addGap(18, 18, 18)
                 .addComponent(buttonAbort)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(checkEndScan)
-                .addContainerGap())
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
diff --git a/plugins/ManipulatorScan.form b/plugins/ManipulatorScan.form
index 6166af70..71a73491 100644
--- a/plugins/ManipulatorScan.form
+++ b/plugins/ManipulatorScan.form
@@ -359,6 +359,7 @@
                       <Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
                       <Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
                       <Component id="checkAngleDistribution" alignment="0" min="-2" max="-2" attributes="0"/>
+                      <Component id="checkEndScan" alignment="0" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
               </Group>
@@ -394,6 +395,8 @@
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="checkCur3" min="-2" max="-2" attributes="0"/>
                   <EmptySpace type="separate" max="32767" attributes="0"/>
+                  <Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace type="separate" max="-2" attributes="0"/>
                   <Component id="buttonScientaSetup" min="-2" max="-2" attributes="0"/>
                   <EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
               </Group>
@@ -496,6 +499,11 @@
             <Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
           </Properties>
         </Component>
+        <Component class="javax.swing.JCheckBox" name="checkEndScan">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Turn off beam at end"/>
+          </Properties>
+        </Component>
       </SubComponents>
     </Container>
     <Container class="javax.swing.JPanel" name="jPanel3">
@@ -515,10 +523,6 @@
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Component id="buttonStart" max="32767" attributes="0"/>
                       <Component id="buttonAbort" pref="212" max="32767" attributes="0"/>
-                      <Group type="102" alignment="0" attributes="0">
-                          <Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                      </Group>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
               </Group>
@@ -532,8 +536,6 @@
                   <EmptySpace type="separate" max="-2" attributes="0"/>
                   <Component id="buttonAbort" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="32767" attributes="0"/>
-                  <Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -555,11 +557,6 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonAbortActionPerformed"/>
           </Events>
         </Component>
-        <Component class="javax.swing.JCheckBox" name="checkEndScan">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Turn off beam at end"/>
-          </Properties>
-        </Component>
       </SubComponents>
     </Container>
   </SubComponents>
diff --git a/plugins/ManipulatorScan.java b/plugins/ManipulatorScan.java
index ae7393f6..58327cf1 100644
--- a/plugins/ManipulatorScan.java
+++ b/plugins/ManipulatorScan.java
@@ -166,10 +166,10 @@ public class ManipulatorScan extends Panel {
         checkCurrent = new javax.swing.JCheckBox();
         checkImageIntegration = new javax.swing.JCheckBox();
         checkAngleDistribution = new javax.swing.JCheckBox();
+        checkEndScan = new javax.swing.JCheckBox();
         jPanel3 = new javax.swing.JPanel();
         buttonStart = new javax.swing.JButton();
         buttonAbort = new javax.swing.JButton();
-        checkEndScan = new javax.swing.JCheckBox();
 
         panelPositioner.setBorder(javax.swing.BorderFactory.createTitledBorder("Positioner"));
 
@@ -399,6 +399,8 @@ public class ManipulatorScan extends Panel {
         checkAngleDistribution.setContentAreaFilled(false);
         checkAngleDistribution.setName("AngleDistribution"); // NOI18N
 
+        checkEndScan.setText("Turn off beam at end");
+
         javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
         panelSensors.setLayout(panelSensorsLayout);
         panelSensorsLayout.setHorizontalGroup(
@@ -419,7 +421,8 @@ public class ManipulatorScan extends Panel {
                     .addComponent(checkCur1)
                     .addComponent(checkCur2)
                     .addComponent(checkCur3)
-                    .addComponent(checkAngleDistribution))
+                    .addComponent(checkAngleDistribution)
+                    .addComponent(checkEndScan))
                 .addContainerGap())
         );
         panelSensorsLayout.setVerticalGroup(
@@ -452,6 +455,8 @@ public class ManipulatorScan extends Panel {
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(checkCur3)
                 .addGap(18, 18, Short.MAX_VALUE)
+                .addComponent(checkEndScan)
+                .addGap(18, 18, 18)
                 .addComponent(buttonScientaSetup)
                 .addGap(26, 26, 26))
         );
@@ -472,8 +477,6 @@ public class ManipulatorScan extends Panel {
             }
         });
 
-        checkEndScan.setText("Turn off beam at end");
-
         javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
         jPanel3.setLayout(jPanel3Layout);
         jPanel3Layout.setHorizontalGroup(
@@ -482,10 +485,7 @@ public class ManipulatorScan extends Panel {
                 .addContainerGap()
                 .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 212, Short.MAX_VALUE)
-                    .addGroup(jPanel3Layout.createSequentialGroup()
-                        .addComponent(checkEndScan)
-                        .addGap(0, 0, Short.MAX_VALUE)))
+                    .addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 212, Short.MAX_VALUE))
                 .addContainerGap())
         );
         jPanel3Layout.setVerticalGroup(
@@ -495,9 +495,7 @@ public class ManipulatorScan extends Panel {
                 .addComponent(buttonStart)
                 .addGap(18, 18, 18)
                 .addComponent(buttonAbort)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(checkEndScan)
-                .addContainerGap())
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
diff --git a/plugins/PhotonEnergy.form b/plugins/PhotonEnergy.form
index f908439e..97c4f661 100644
--- a/plugins/PhotonEnergy.form
+++ b/plugins/PhotonEnergy.form
@@ -370,6 +370,7 @@
                       <Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
                       <Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
                       <Component id="checkAngleDistribution" alignment="0" min="-2" max="-2" attributes="0"/>
+                      <Component id="checkEndScan" alignment="0" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
               </Group>
@@ -404,7 +405,9 @@
                   <Component id="checkCur2" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="checkCur3" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace type="separate" max="32767" attributes="0"/>
+                  <EmptySpace max="32767" attributes="0"/>
+                  <Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace type="separate" max="-2" attributes="0"/>
                   <Component id="buttonScientaSetup" min="-2" max="-2" attributes="0"/>
                   <EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
               </Group>
@@ -508,6 +511,11 @@
             <Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
           </Properties>
         </Component>
+        <Component class="javax.swing.JCheckBox" name="checkEndScan">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Turn off beam at end"/>
+          </Properties>
+        </Component>
       </SubComponents>
     </Container>
     <Container class="javax.swing.JPanel" name="jPanel3">
@@ -527,10 +535,6 @@
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Component id="buttonStart" max="32767" attributes="0"/>
                       <Component id="buttonAbort" pref="241" max="32767" attributes="0"/>
-                      <Group type="102" alignment="0" attributes="0">
-                          <Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                      </Group>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
               </Group>
@@ -544,8 +548,6 @@
                   <EmptySpace type="separate" max="-2" attributes="0"/>
                   <Component id="buttonAbort" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="32767" attributes="0"/>
-                  <Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -567,11 +569,6 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonAbortActionPerformed"/>
           </Events>
         </Component>
-        <Component class="javax.swing.JCheckBox" name="checkEndScan">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Turn off beam at end"/>
-          </Properties>
-        </Component>
       </SubComponents>
     </Container>
   </SubComponents>
diff --git a/plugins/PhotonEnergy.java b/plugins/PhotonEnergy.java
index 553ba380..0d8c88cc 100644
--- a/plugins/PhotonEnergy.java
+++ b/plugins/PhotonEnergy.java
@@ -212,10 +212,10 @@ public class PhotonEnergy extends Panel {
         checkCounts4 = new javax.swing.JCheckBox();
         checkCurrent = new javax.swing.JCheckBox();
         checkAngleDistribution = new javax.swing.JCheckBox();
+        checkEndScan = new javax.swing.JCheckBox();
         jPanel3 = new javax.swing.JPanel();
         buttonStart = new javax.swing.JButton();
         buttonAbort = new javax.swing.JButton();
-        checkEndScan = new javax.swing.JCheckBox();
 
         panelPositioner.setBorder(javax.swing.BorderFactory.createTitledBorder("Acquisition"));
 
@@ -474,6 +474,8 @@ public class PhotonEnergy extends Panel {
         checkAngleDistribution.setContentAreaFilled(false);
         checkAngleDistribution.setName("AngleDistribution"); // NOI18N
 
+        checkEndScan.setText("Turn off beam at end");
+
         javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
         panelSensors.setLayout(panelSensorsLayout);
         panelSensorsLayout.setHorizontalGroup(
@@ -494,7 +496,8 @@ public class PhotonEnergy extends Panel {
                     .addComponent(checkCur1)
                     .addComponent(checkCur2)
                     .addComponent(checkCur3)
-                    .addComponent(checkAngleDistribution))
+                    .addComponent(checkAngleDistribution)
+                    .addComponent(checkEndScan))
                 .addContainerGap())
         );
         panelSensorsLayout.setVerticalGroup(
@@ -526,7 +529,9 @@ public class PhotonEnergy extends Panel {
                 .addComponent(checkCur2)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(checkCur3)
-                .addGap(18, 18, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addComponent(checkEndScan)
+                .addGap(18, 18, 18)
                 .addComponent(buttonScientaSetup)
                 .addGap(26, 26, 26))
         );
@@ -547,8 +552,6 @@ public class PhotonEnergy extends Panel {
             }
         });
 
-        checkEndScan.setText("Turn off beam at end");
-
         javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
         jPanel3.setLayout(jPanel3Layout);
         jPanel3Layout.setHorizontalGroup(
@@ -557,10 +560,7 @@ public class PhotonEnergy extends Panel {
                 .addContainerGap()
                 .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 241, Short.MAX_VALUE)
-                    .addGroup(jPanel3Layout.createSequentialGroup()
-                        .addComponent(checkEndScan)
-                        .addGap(0, 0, Short.MAX_VALUE)))
+                    .addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 241, Short.MAX_VALUE))
                 .addContainerGap())
         );
         jPanel3Layout.setVerticalGroup(
@@ -570,9 +570,7 @@ public class PhotonEnergy extends Panel {
                 .addComponent(buttonStart)
                 .addGap(18, 18, 18)
                 .addComponent(buttonAbort)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(checkEndScan)
-                .addContainerGap())
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
diff --git a/plugins/XPSSpectrum.form b/plugins/XPSSpectrum.form
index 712a7906..196bb91a 100644
--- a/plugins/XPSSpectrum.form
+++ b/plugins/XPSSpectrum.form
@@ -85,6 +85,7 @@
                           <Component id="valueIterations" linkSize="3" min="-2" max="-2" attributes="0"/>
                       </Group>
                       <Component id="buttonScientaSetup" alignment="0" max="32767" attributes="0"/>
+                      <Component id="checkEndScan" alignment="0" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
               </Group>
@@ -118,12 +119,14 @@
                       <Component id="jLabel17" alignment="0" min="-2" max="-2" attributes="0"/>
                       <Component id="valueIterations" alignment="0" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace max="32767" attributes="0"/>
+                  <EmptySpace type="separate" max="32767" attributes="0"/>
                   <Group type="103" groupAlignment="2" attributes="0">
                       <Component id="jLabel11" alignment="2" min="-2" max="-2" attributes="0"/>
                       <Component id="comboPass" alignment="2" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace type="unrelated" max="32767" attributes="0"/>
+                  <EmptySpace type="separate" max="32767" attributes="0"/>
+                  <Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace type="separate" max="-2" attributes="0"/>
                   <Component id="buttonScientaSetup" min="-2" max="-2" attributes="0"/>
                   <EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
               </Group>
@@ -236,6 +239,11 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonScientaSetupActionPerformed"/>
           </Events>
         </Component>
+        <Component class="javax.swing.JCheckBox" name="checkEndScan">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Turn off beam at end"/>
+          </Properties>
+        </Component>
       </SubComponents>
     </Container>
     <Container class="javax.swing.JPanel" name="jPanel2">
@@ -254,8 +262,7 @@
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="1" attributes="0">
                       <Group type="102" alignment="1" attributes="0">
-                          <Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace max="32767" attributes="0"/>
+                          <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                           <Component id="btLoad" linkSize="1" min="-2" max="-2" attributes="0"/>
                           <EmptySpace type="unrelated" max="-2" attributes="0"/>
                           <Component id="btSave" linkSize="1" min="-2" max="-2" attributes="0"/>
@@ -265,7 +272,7 @@
                           <Component id="buttonInitialScan" linkSize="1" min="-2" max="-2" attributes="0"/>
                           <EmptySpace type="separate" max="-2" attributes="0"/>
                           <Component id="buttonDetailedScan" linkSize="1" max="32767" attributes="0"/>
-                          <EmptySpace pref="117" max="32767" attributes="0"/>
+                          <EmptySpace pref="66" max="32767" attributes="0"/>
                           <Component id="buttonSkip" linkSize="1" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
                           <Component id="buttonAbort" linkSize="1" min="-2" max="-2" attributes="0"/>
@@ -287,13 +294,10 @@
                       <Component id="buttonSkip" alignment="3" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                  <Component id="rangeSelectionPanel" pref="168" max="32767" attributes="0"/>
+                  <Component id="rangeSelectionPanel" pref="230" max="32767" attributes="0"/>
                   <EmptySpace type="unrelated" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
-                      <Group type="103" alignment="1" groupAlignment="3" attributes="0">
-                          <Component id="btLoad" alignment="3" min="-2" max="-2" attributes="0"/>
-                          <Component id="checkEndScan" alignment="3" min="-2" max="-2" attributes="0"/>
-                      </Group>
+                      <Component id="btLoad" alignment="1" min="-2" max="-2" attributes="0"/>
                       <Component id="btSave" alignment="1" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
@@ -355,11 +359,6 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonSkipActionPerformed"/>
           </Events>
         </Component>
-        <Component class="javax.swing.JCheckBox" name="checkEndScan">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="Turn off beam at end"/>
-          </Properties>
-        </Component>
       </SubComponents>
     </Container>
   </SubComponents>
diff --git a/plugins/XPSSpectrum.java b/plugins/XPSSpectrum.java
index 4e1b9cc9..1fe6aaa2 100644
--- a/plugins/XPSSpectrum.java
+++ b/plugins/XPSSpectrum.java
@@ -218,6 +218,7 @@ public class XPSSpectrum extends Panel {
         jLabel8 = new javax.swing.JLabel();
         jLabel17 = new javax.swing.JLabel();
         buttonScientaSetup = new javax.swing.JButton();
+        checkEndScan = new javax.swing.JCheckBox();
         jPanel2 = new javax.swing.JPanel();
         btLoad = new javax.swing.JButton();
         btSave = new javax.swing.JButton();
@@ -234,7 +235,6 @@ public class XPSSpectrum extends Panel {
         ;
         buttonAbort = new javax.swing.JButton();
         buttonSkip = new javax.swing.JButton();
-        checkEndScan = new javax.swing.JCheckBox();
 
         jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Arguments"));
 
@@ -296,6 +296,8 @@ public class XPSSpectrum extends Panel {
             }
         });
 
+        checkEndScan.setText("Turn off beam at end");
+
         javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
         jPanel1.setLayout(jPanel1Layout);
         jPanel1Layout.setHorizontalGroup(
@@ -327,7 +329,8 @@ public class XPSSpectrum extends Panel {
                         .addComponent(jLabel17)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(valueIterations, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    .addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(checkEndScan))
                 .addContainerGap())
         );
 
@@ -358,11 +361,13 @@ public class XPSSpectrum extends Panel {
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(jLabel17)
                     .addComponent(valueIterations, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addGap(18, 18, Short.MAX_VALUE)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(jLabel11)
                     .addComponent(comboPass, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addGap(18, 18, Short.MAX_VALUE)
+                .addComponent(checkEndScan)
+                .addGap(18, 18, 18)
                 .addComponent(buttonScientaSetup)
                 .addGap(26, 26, 26))
         );
@@ -411,8 +416,6 @@ public class XPSSpectrum extends Panel {
             }
         });
 
-        checkEndScan.setText("Turn off beam at end");
-
         javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
         jPanel2.setLayout(jPanel2Layout);
         jPanel2Layout.setHorizontalGroup(
@@ -421,8 +424,7 @@ public class XPSSpectrum extends Panel {
                 .addContainerGap()
                 .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
                     .addGroup(jPanel2Layout.createSequentialGroup()
-                        .addComponent(checkEndScan)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addGap(0, 0, Short.MAX_VALUE)
                         .addComponent(btLoad)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                         .addComponent(btSave))
@@ -431,7 +433,7 @@ public class XPSSpectrum extends Panel {
                         .addComponent(buttonInitialScan)
                         .addGap(18, 18, 18)
                         .addComponent(buttonDetailedScan, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 117, Short.MAX_VALUE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 66, Short.MAX_VALUE)
                         .addComponent(buttonSkip)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(buttonAbort))
@@ -451,12 +453,10 @@ public class XPSSpectrum extends Panel {
                     .addComponent(buttonAbort)
                     .addComponent(buttonSkip))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(rangeSelectionPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 168, Short.MAX_VALUE)
+                .addComponent(rangeSelectionPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 230, Short.MAX_VALUE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                        .addComponent(btLoad)
-                        .addComponent(checkEndScan))
+                    .addComponent(btLoad, javax.swing.GroupLayout.Alignment.TRAILING)
                     .addComponent(btSave, javax.swing.GroupLayout.Alignment.TRAILING))
                 .addContainerGap())
         );