diff --git a/plugins/HoloScan.form b/plugins/HoloScan.form
index 9f5a28bb..c32c92d0 100644
--- a/plugins/HoloScan.form
+++ b/plugins/HoloScan.form
@@ -470,7 +470,7 @@
                   <Component id="checkCur3" min="-2" max="-2" attributes="0"/>
                   <EmptySpace type="separate" max="32767" attributes="0"/>
                   <Component id="buttonScientaSetup" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace max="32767" attributes="0"/>
+                  <EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
diff --git a/plugins/HoloScan.java b/plugins/HoloScan.java
index accc5dba..43ba7c75 100644
--- a/plugins/HoloScan.java
+++ b/plugins/HoloScan.java
@@ -482,7 +482,7 @@ public class HoloScan extends Panel {
                 .addComponent(checkCur3)
                 .addGap(18, 18, Short.MAX_VALUE)
                 .addComponent(buttonScientaSetup)
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addGap(26, 26, 26))
         );
 
         jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("Scan Control"));
diff --git a/plugins/PhotonEnergy.form b/plugins/PhotonEnergy.form
index 878b90ce..c93f9741 100644
--- a/plugins/PhotonEnergy.form
+++ b/plugins/PhotonEnergy.form
@@ -408,7 +408,7 @@
                   <Component id="checkCur3" min="-2" max="-2" attributes="0"/>
                   <EmptySpace type="separate" max="32767" attributes="0"/>
                   <Component id="buttonScientaSetup" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace min="-2" pref="84" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
diff --git a/plugins/PhotonEnergy.java b/plugins/PhotonEnergy.java
index f5b6ba4f..5e6d77c4 100644
--- a/plugins/PhotonEnergy.java
+++ b/plugins/PhotonEnergy.java
@@ -516,7 +516,7 @@ public class PhotonEnergy extends Panel {
                 .addComponent(checkCur3)
                 .addGap(18, 18, Short.MAX_VALUE)
                 .addComponent(buttonScientaSetup)
-                .addGap(84, 84, 84))
+                .addGap(26, 26, 26))
         );
 
         jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("Scan Control"));
diff --git a/plugins/XPSSpectrum.form b/plugins/XPSSpectrum.form
index 4c94b1be..bc8db615 100644
--- a/plugins/XPSSpectrum.form
+++ b/plugins/XPSSpectrum.form
@@ -125,7 +125,7 @@
                   </Group>
                   <EmptySpace type="unrelated" max="32767" attributes="0"/>
                   <Component id="buttonScientaSetup" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace max="32767" attributes="0"/>
+                  <EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
diff --git a/plugins/XPSSpectrum.java b/plugins/XPSSpectrum.java
index 3e198a0c..c1899a82 100644
--- a/plugins/XPSSpectrum.java
+++ b/plugins/XPSSpectrum.java
@@ -362,7 +362,7 @@ public class XPSSpectrum extends Panel {
                     .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)
                 .addComponent(buttonScientaSetup)
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addGap(26, 26, 26))
         );
 
         jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("Scan Control"));