diff --git a/src/Scienta.java b/src/Scienta.java
index 776ff66..fce5faf 100644
--- a/src/Scienta.java
+++ b/src/Scienta.java
@@ -8,11 +8,15 @@ import ch.psi.pshell.device.Device;
 import ch.psi.pshell.device.DeviceAdapter;
 import ch.psi.pshell.device.DeviceListener;
 import ch.psi.pshell.device.Readable.ReadableCalibratedArray;
+import ch.psi.pshell.device.Writable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import ch.psi.pshell.epics.*;
+import static ch.psi.pshell.epics.Scienta.PASS_ENERGY_VALUES;
+import ch.psi.utils.Arr;
+import ch.psi.utils.Convert;
 import ch.psi.utils.State;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Logger;
@@ -38,7 +42,7 @@ public class Scienta extends AreaDetector {
     public Scienta(final String name, final String channelPrefix) {
         this(name, channelPrefix + ":cam1", channelPrefix + ":image1");
     }
-
+    
     public Scienta(String name, String channelCtrl, String channelData) {
         super(name, channelCtrl, channelData);
         this.channelCtrl = channelCtrl;
@@ -132,6 +136,27 @@ public class Scienta extends AreaDetector {
     }    
     
     
+    @Override
+    protected void doSetSimulated() {
+        super.doSetSimulated();
+        setCache(passEnergy, String.valueOf(PASS_ENERGY_VALUES[0]));
+        setCache(lensMode, LensMode.Transmission.toString());
+        setCache(acquisitionMode, ch.psi.pshell.epics.Scienta.AcquisitionMode.Fixed.toString());
+
+        setSimulatedValue("ENERGY_MODE", EnergyMode.Binding.toString());
+        setSimulatedValue("DETECTOR_MODE", DetectorMode.ADC.toString());
+        setSimulatedValue("ELEMENT_SET", ElementSet.High_Pass_XPS.toString());
+        setSimulatedValue("ACQ_MODE", AcquisitionMode.Fixed.toString());
+        setSimulatedValue("LENS_MODE", LensMode.Transmission.toString());
+        setSimulatedValue("PASS_ENERGY", String.valueOf(PASS_ENERGY_VALUES[0]));
+        setSimulatedValue("ELEMENT_SET_RBV", ElementSet.High_Pass_XPS);
+    }
+    
+    @Override
+    protected void doInitialize() throws IOException, InterruptedException {
+        super.doInitialize();
+    }
+    
     @Override
     protected void doUpdate() throws IOException, InterruptedException {
         super.doUpdate();
@@ -190,7 +215,6 @@ public class Scienta extends AreaDetector {
     }
 
     public enum EnergyMode {
-
         Binding,
         Kinetic
     }
@@ -278,6 +302,64 @@ public class Scienta extends AreaDetector {
     public void zeroSupplies() throws IOException, InterruptedException {
         writeCtrl("ZERO_SUPPLIES", 1);
     }
+    
+    public Writable getPassEnergyDev(){
+        return (Writable) (Object value) -> {
+            setPassEnergy(Integer.valueOf(String.valueOf(value)));
+        };
+    }
+    
+    public Writable getElementSetDev(){
+        return (Writable) (Object value) -> {
+            setElementSet(ElementSet.valueOf(String.valueOf(value)));
+        };
+    }
+    
+    public Writable getDetectorModeDev(){
+        return (Writable) (Object value) -> {
+            setDetectorMode(DetectorMode.valueOf(String.valueOf(value)));
+        };
+    }    
+    
+    public Writable getLensModeDev(){
+        return (Writable) (Object value) -> {
+            setLensMode(LensMode.valueOf(String.valueOf(value)));
+        };
+    }
+    
+    public Writable getAcquisitionModeDev(){
+        return (Writable) (Object value) -> {
+            setAcquisitionMode(AcquisitionMode.valueOf(String.valueOf(value)));
+        };
+    }        
+    
+    public Writable getEnergyModeDev(){
+        return (Writable) (Object value) -> {
+            setEnergyMode(EnergyMode.valueOf(String.valueOf(value)));
+        };
+    }   
+    
+    public Writable getRangeDev(){
+        return (Writable) (Object value) -> {
+            Integer[] range = (Integer[]) value;
+            int[] roi = getROI();
+            if ((range[0]!=null) && (range[1]!=null)){
+                int from = Math.min(range[0], range[1]);
+                int to = Math.max(range[0], range[1]);
+                roi[0]=from;
+                roi[2]=(to-from);
+            }
+            if ((range[2]!=null) && (range[3]!=null)){
+                int from = Math.min(range[2], range[3]);
+                int to = Math.max(range[2], range[3]);
+                roi[1]=from;
+                roi[3]=(to-from);
+            }
+            setROI(roi);
+        };
+    }       
+
+    
 
     //Progress    
     //Disconnected operations
@@ -414,52 +496,45 @@ public class Scienta extends AreaDetector {
 
     public List<Double> getChannelRange() throws IOException, InterruptedException {
         ArrayList<Double> ret = new ArrayList<>();
-        switch (getAcquisitionMode()) {
-            case Fixed:
-                double eCenter = centerEnergy.getValue();
-                int ePass = getPassEnergy();
-                double xe = 0.04464;
-                double xn = 0.04464;
-                ret.add(eCenter - xe * ePass);
-                ret.add(eCenter + xn * ePass);
-                break;
-            default:
+        try {
+            if (isSimulated()){
+                ret.add(100.0);
+                ret.add(200.0);                        
+            } else {
                 ret.add(lowEnergy.getValue());
-                ret.add(highEnergy.getValue());
-                break;
-
-        }
+                ret.add(highEnergy.getValue());        
+            }
+        } catch (Exception ex) {
+            ret.add(Double.NaN);
+            ret.add(Double.NaN);
+        }            
         return ret;
     }
 
     public List<Double> getSliceRange() throws IOException, InterruptedException {
         ArrayList<Double> ret = new ArrayList<>();
-        //ret.add(sliceBegin.getValue());
-        //ret.add(sliceEnd.getValue()); 
         try {
-            switch (getLensMode()) {
-                //TODO:
-                /*
-                case Angular45:
-                    ret.add(-28.148);
-                    ret.add(27.649);
-                    break;
-                case Angular60:
-                    ret.add(-34.736);
-                    ret.add(34.119);
-                    break;
-                */
-                case Transmission:
-                default:
-                    ret.add(-2.332);
-                    ret.add(2.291);
-                    break;
+            if (isSimulated()){
+                ret.add(200.0);
+                ret.add(400.0);                        
+            } else {             
+                switch (getLensMode()) {
+                    case DA30_01:
+                    case DA30_08:
+                        ret.add(lowThetaY.getValue());
+                        ret.add(highThetaY.getValue());                  
+                        break;
+                    default:
+                        ret.add(lowThetaX.getValue());
+                        ret.add(highThetaX.getValue());           
+                        break;
 
+                }
             }
         } catch (Exception ex) {
             ret.add(Double.NaN);
             ret.add(Double.NaN);
-        }
+        }  
         return ret;
     }
     
diff --git a/src/ScientaPanel.form b/src/ScientaPanel.form
index 68d3f41..5588058 100644
--- a/src/ScientaPanel.form
+++ b/src/ScientaPanel.form
@@ -122,7 +122,7 @@
                                       </Group>
                                       <Group type="102" alignment="1" attributes="0">
                                           <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                                          <Component id="jLabel11" linkSize="8" min="-2" max="-2" attributes="0"/>
+                                          <Component id="jLabel11" min="-2" max="-2" attributes="0"/>
                                       </Group>
                                       <Group type="102" alignment="1" attributes="0">
                                           <Component id="valuExcit" linkSize="10" min="-2" max="-2" attributes="0"/>
@@ -251,7 +251,7 @@
                 <Component class="javax.swing.JLabel" name="jLabel3">
                   <Properties>
                     <Property name="horizontalAlignment" type="int" value="11"/>
-                    <Property name="text" type="java.lang.String" value="Pass Energy:"/>
+                    <Property name="text" type="java.lang.String" value="Energy Mode:"/>
                   </Properties>
                 </Component>
                 <Component class="javax.swing.JComboBox" name="comboEnergy">
@@ -324,7 +324,7 @@
                     <DimensionLayout dim="0">
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Group type="102" attributes="0">
-                              <EmptySpace max="-2" attributes="0"/>
+                              <EmptySpace min="-2" max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="1" attributes="0">
                                   <Group type="103" groupAlignment="0" attributes="0">
                                       <Component id="jLabel15" linkSize="8" alignment="0" min="-2" max="-2" attributes="0"/>
@@ -335,14 +335,14 @@
                                   </Group>
                                   <Component id="jLabel33" linkSize="8" min="-2" max="-2" attributes="0"/>
                               </Group>
-                              <EmptySpace max="-2" attributes="0"/>
+                              <EmptySpace min="-2" max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="valueWidth" linkSize="4" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueCount" linkSize="4" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueHigh" linkSize="4" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueCenter" linkSize="4" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueLow" linkSize="4" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueStep" linkSize="4" alignment="1" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueWidth" alignment="0" max="32767" attributes="0"/>
+                                  <Component id="valueCount" alignment="0" max="32767" attributes="0"/>
+                                  <Component id="valueHigh" max="32767" attributes="0"/>
+                                  <Component id="valueCenter" max="32767" attributes="0"/>
+                                  <Component id="valueLow" max="32767" attributes="0"/>
+                                  <Component id="valueStep" alignment="1" max="32767" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
                           </Group>
@@ -352,24 +352,24 @@
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Group type="102" alignment="0" attributes="0">
                               <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="jLabel12" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueLow" min="-2" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="jLabel12" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueLow" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="jLabel13" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueCenter" min="-2" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="jLabel13" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueCenter" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="jLabel14" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueHigh" min="-2" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="jLabel14" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueHigh" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="jLabel33" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueStep" min="-2" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="jLabel33" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueStep" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="2" attributes="0">
@@ -377,9 +377,9 @@
                                   <Component id="valueWidth" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="1" attributes="0">
-                                  <Component id="valueCount" min="-2" max="-2" attributes="0"/>
-                                  <Component id="jLabel20" min="-2" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="jLabel20" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueCount" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
                           </Group>
@@ -472,7 +472,7 @@
                 <Component class="javax.swing.JLabel" name="jLabel11">
                   <Properties>
                     <Property name="horizontalAlignment" type="int" value="11"/>
-                    <Property name="text" type="java.lang.String" value="Pass:"/>
+                    <Property name="text" type="java.lang.String" value="Pass Energy:"/>
                   </Properties>
                 </Component>
                 <Component class="javax.swing.JComboBox" name="comboPass">
@@ -507,7 +507,7 @@
                     <DimensionLayout dim="0">
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Group type="102" alignment="0" attributes="0">
-                              <EmptySpace max="-2" attributes="0"/>
+                              <EmptySpace min="-2" max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
                                   <Component id="jLabel34" linkSize="16" alignment="0" min="-2" max="-2" attributes="0"/>
                                   <Component id="jLabel35" linkSize="16" alignment="0" min="-2" max="-2" attributes="0"/>
@@ -516,14 +516,14 @@
                                   <Component id="jLabel37" linkSize="16" alignment="0" min="-2" max="-2" attributes="0"/>
                                   <Component id="jLabel38" linkSize="16" alignment="0" min="-2" max="-2" attributes="0"/>
                               </Group>
-                              <EmptySpace max="-2" attributes="0"/>
+                              <EmptySpace min="-2" max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="valueWidthTY" linkSize="17" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueCountTY" linkSize="17" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueHighTY" linkSize="17" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueCenterTY" linkSize="17" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueLowTY" linkSize="17" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueStepTY" linkSize="17" alignment="1" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueWidthTY" alignment="0" max="32767" attributes="0"/>
+                                  <Component id="valueCountTY" alignment="0" max="32767" attributes="0"/>
+                                  <Component id="valueHighTY" alignment="0" max="32767" attributes="0"/>
+                                  <Component id="valueCenterTY" alignment="0" max="32767" attributes="0"/>
+                                  <Component id="valueLowTY" alignment="0" max="32767" attributes="0"/>
+                                  <Component id="valueStepTY" alignment="1" max="32767" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
                           </Group>
@@ -533,24 +533,24 @@
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Group type="102" alignment="0" attributes="0">
                               <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="jLabel34" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueLowTY" alignment="0" min="-2" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="jLabel34" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueLowTY" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="jLabel35" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueCenterTY" alignment="0" min="-2" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="jLabel35" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueCenterTY" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="jLabel36" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueHighTY" alignment="0" min="-2" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="jLabel36" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueHighTY" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="jLabel39" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueStepTY" alignment="0" min="-2" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="jLabel39" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueStepTY" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="2" attributes="0">
@@ -558,9 +558,9 @@
                                   <Component id="valueWidthTY" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="1" attributes="0">
-                                  <Component id="valueCountTY" alignment="1" min="-2" max="-2" attributes="0"/>
-                                  <Component id="jLabel38" alignment="1" min="-2" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="jLabel38" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueCountTY" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
                           </Group>
@@ -669,7 +669,7 @@
                     <DimensionLayout dim="0">
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Group type="102" attributes="0">
-                              <EmptySpace max="-2" attributes="0"/>
+                              <EmptySpace min="-2" max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
                                   <Component id="jLabel42" linkSize="18" alignment="1" min="-2" max="-2" attributes="0"/>
                                   <Component id="jLabel43" linkSize="18" alignment="1" min="-2" max="-2" attributes="0"/>
@@ -678,20 +678,14 @@
                                   <Component id="jLabel40" linkSize="18" alignment="1" min="-2" max="-2" attributes="0"/>
                                   <Component id="jLabel41" linkSize="18" alignment="1" min="-2" max="-2" attributes="0"/>
                               </Group>
-                              <EmptySpace max="-2" attributes="0"/>
+                              <EmptySpace min="-2" max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
-                                  <Group type="103" alignment="0" groupAlignment="0" attributes="0">
-                                      <Group type="103" groupAlignment="0" attributes="0">
-                                          <Group type="103" groupAlignment="0" attributes="0">
-                                              <Component id="valueCenterTX" linkSize="19" alignment="0" min="-2" max="-2" attributes="0"/>
-                                              <Component id="valueStepTX" linkSize="19" alignment="1" min="-2" max="-2" attributes="0"/>
-                                          </Group>
-                                          <Component id="valueHighTX" linkSize="19" alignment="1" min="-2" max="-2" attributes="0"/>
-                                      </Group>
-                                      <Component id="valueLowTX" linkSize="19" alignment="1" min="-2" max="-2" attributes="0"/>
-                                  </Group>
-                                  <Component id="valueWidthTX" linkSize="19" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueCountTX" linkSize="19" alignment="0" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueCenterTX" alignment="0" max="32767" attributes="0"/>
+                                  <Component id="valueStepTX" alignment="1" max="32767" attributes="0"/>
+                                  <Component id="valueHighTX" alignment="1" max="32767" attributes="0"/>
+                                  <Component id="valueLowTX" alignment="1" max="32767" attributes="0"/>
+                                  <Component id="valueWidthTX" alignment="0" max="32767" attributes="0"/>
+                                  <Component id="valueCountTX" alignment="0" max="32767" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
                           </Group>
@@ -701,14 +695,14 @@
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Group type="102" alignment="0" attributes="0">
                               <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="jLabel40" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueLowTX" min="-2" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="jLabel40" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueLowTX" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="jLabel41" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueCenterTX" alignment="0" min="-2" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="jLabel41" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueCenterTX" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="2" attributes="0">
@@ -716,9 +710,9 @@
                                   <Component id="valueHighTX" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="jLabel45" min="-2" max="-2" attributes="0"/>
-                                  <Component id="valueStepTX" min="-2" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="jLabel45" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueStepTX" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="2" attributes="0">
@@ -726,9 +720,9 @@
                                   <Component id="valueWidthTX" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="1" attributes="0">
-                                  <Component id="valueCountTX" alignment="1" min="-2" max="-2" attributes="0"/>
-                                  <Component id="jLabel44" alignment="1" min="-2" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="jLabel44" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="valueCountTX" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
                           </Group>
diff --git a/src/ScientaPanel.java b/src/ScientaPanel.java
index 3859250..f447d50 100644
--- a/src/ScientaPanel.java
+++ b/src/ScientaPanel.java
@@ -1,10 +1,6 @@
 import ch.psi.pshell.device.Device;
 import ch.psi.pshell.device.DeviceAdapter;
 import ch.psi.pshell.device.DeviceListener;
-
-
-import ch.psi.pshell.plot.LinePlotSeries;
-import ch.psi.pshell.plot.Plot;
 import ch.psi.utils.State;
 import ch.psi.utils.swing.SwingUtils;
 import java.awt.Component;
@@ -36,11 +32,8 @@ public final class ScientaPanel extends DevicePanel {
                     } else if (origin == valueSlices) {
                         getDevice().getSlices().writeAsync((int) value);
                     } else if (origin == valueChannels) {
-                        getDevice().setIterations((int) value);
-                    }/*else if (origin == valueFrames) {
-                     getDevice().getFrames().writeAsync((int) value);
-                     }*/
-
+                        getDevice().getChannels().writeAsync((int) value);
+                    }
                 } catch (Exception ex) {
                     showException(ex);
                 }
@@ -99,6 +92,14 @@ public final class ScientaPanel extends DevicePanel {
         valueCenter.setMinValue(getDevice().getCenterEnergy().getMinValue());      
         valueHigh.setMaxValue(getDevice().getHighEnergy().getMaxValue());
         valueHigh.setMinValue(getDevice().getHighEnergy().getMinValue());      
+        valueLowTY.setMaxValue(getDevice().getLowThetaY().getMaxValue());
+        valueLowTY.setMinValue(getDevice().getLowThetaY().getMinValue());      
+        valueCenterTY.setMaxValue(getDevice().getCenterThetaY().getMaxValue());
+        valueCenterTY.setMinValue(getDevice().getCenterThetaY().getMinValue());      
+        valueHighTY.setMaxValue(getDevice().getHighThetaY().getMaxValue());
+        valueHighTY.setMinValue(getDevice().getHighThetaY().getMinValue());      
+        valueCenterTX.setMaxValue(getDevice().getCenterThetaX().getMaxValue());
+        valueCenterTX.setMinValue(getDevice().getCenterThetaX().getMinValue());      
     }
 
     DeviceListener progressListener = new DeviceAdapter() {
@@ -208,8 +209,8 @@ public final class ScientaPanel extends DevicePanel {
 
             dd.current = getDevice().getCurrentStep().getValue().intValue();
             dd.total = getDevice().getTotalSteps().getValue().intValue();
-            dd.slices = getDevice().getSlices().getValue();
-            dd.channels = getDevice().getChannels().getValue().intValue();
+            dd.slices =((Number) getDevice().getSlices().getValue()).intValue();
+            dd.channels = ((Number)getDevice().getChannels().getValue()).intValue();
 
             dd.status = new String( getDevice().getStatus().getValue());
             dd.state = getDevice().getDetectorState().getValue();  
@@ -401,7 +402,7 @@ public final class ScientaPanel extends DevicePanel {
         });
 
         jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
-        jLabel3.setText("Pass Energy:");
+        jLabel3.setText("Energy Mode:");
 
         comboEnergy.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
         comboEnergy.addActionListener(new java.awt.event.ActionListener() {
@@ -492,36 +493,34 @@ public final class ScientaPanel extends DevicePanel {
                     .addComponent(jLabel33))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(valueWidth, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(valueCount, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(valueHigh, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(valueCenter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(valueLow, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(valueStep, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(valueWidth, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(valueCount, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(valueHigh, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(valueCenter, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(valueLow, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(valueStep, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                 .addContainerGap())
         );
 
-        jPanel4Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {valueCenter, valueCount, valueHigh, valueLow, valueStep, valueWidth});
-
         jPanel4Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel12, jLabel13, jLabel14, jLabel15, jLabel20, jLabel33});
 
         jPanel4Layout.setVerticalGroup(
             jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel4Layout.createSequentialGroup()
                 .addGap(4, 4, 4)
-                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(jLabel12)
                     .addComponent(valueLow, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(jLabel13)
                     .addComponent(valueCenter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(jLabel14)
                     .addComponent(valueHigh, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(jLabel33)
                     .addComponent(valueStep, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -529,14 +528,14 @@ public final class ScientaPanel extends DevicePanel {
                     .addComponent(jLabel15)
                     .addComponent(valueWidth, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addComponent(valueCount, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jLabel20))
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                    .addComponent(jLabel20)
+                    .addComponent(valueCount, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap())
         );
 
         jLabel11.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
-        jLabel11.setText("Pass:");
+        jLabel11.setText("Pass Energy:");
 
         comboPass.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "2", "5", "10", "20", "50", "100", "200" }));
         comboPass.setToolTipText("");
@@ -613,36 +612,34 @@ public final class ScientaPanel extends DevicePanel {
                     .addComponent(jLabel38))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(valueWidthTY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(valueCountTY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(valueHighTY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(valueCenterTY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(valueLowTY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(valueStepTY, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(valueWidthTY, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(valueCountTY, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(valueHighTY, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(valueCenterTY, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(valueLowTY, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(valueStepTY, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                 .addContainerGap())
         );
 
         jPanel10Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel34, jLabel35, jLabel36, jLabel37, jLabel38, jLabel39});
 
-        jPanel10Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {valueCenterTY, valueCountTY, valueHighTY, valueLowTY, valueStepTY, valueWidthTY});
-
         jPanel10Layout.setVerticalGroup(
             jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel10Layout.createSequentialGroup()
                 .addGap(4, 4, 4)
-                .addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(jLabel34)
                     .addComponent(valueLowTY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(jLabel35)
                     .addComponent(valueCenterTY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(jLabel36)
                     .addComponent(valueHighTY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(jLabel39)
                     .addComponent(valueStepTY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -650,9 +647,9 @@ public final class ScientaPanel extends DevicePanel {
                     .addComponent(jLabel37)
                     .addComponent(valueWidthTY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addComponent(valueCountTY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jLabel38))
+                .addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                    .addComponent(jLabel38)
+                    .addComponent(valueCountTY, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap())
         );
 
@@ -726,31 +723,26 @@ public final class ScientaPanel extends DevicePanel {
                     .addComponent(jLabel41, javax.swing.GroupLayout.Alignment.TRAILING))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                        .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                .addComponent(valueCenterTX, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                .addComponent(valueStepTX, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            .addComponent(valueHighTX, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                        .addComponent(valueLowTX, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addComponent(valueWidthTX, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(valueCountTX, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(valueCenterTX, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(valueStepTX, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(valueHighTX, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(valueLowTX, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(valueWidthTX, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(valueCountTX, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                 .addContainerGap())
         );
 
         jPanel11Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel40, jLabel41, jLabel42, jLabel43, jLabel44, jLabel45});
 
-        jPanel11Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {valueCenterTX, valueCountTX, valueHighTX, valueLowTX, valueStepTX, valueWidthTX});
-
         jPanel11Layout.setVerticalGroup(
             jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel11Layout.createSequentialGroup()
                 .addGap(4, 4, 4)
-                .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(jLabel40)
                     .addComponent(valueLowTX, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(jLabel41)
                     .addComponent(valueCenterTX, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -758,7 +750,7 @@ public final class ScientaPanel extends DevicePanel {
                     .addComponent(jLabel42)
                     .addComponent(valueHighTX, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(jLabel45)
                     .addComponent(valueStepTX, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -766,9 +758,9 @@ public final class ScientaPanel extends DevicePanel {
                     .addComponent(jLabel43)
                     .addComponent(valueWidthTX, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addComponent(valueCountTX, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jLabel44))
+                .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                    .addComponent(jLabel44)
+                    .addComponent(valueCountTX, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap())
         );
 
@@ -1189,19 +1181,7 @@ public final class ScientaPanel extends DevicePanel {
     private javax.swing.JLabel jLabel19;
     private javax.swing.JLabel jLabel2;
     private javax.swing.JLabel jLabel20;
-    private javax.swing.JLabel jLabel21;
-    private javax.swing.JLabel jLabel22;
-    private javax.swing.JLabel jLabel23;
-    private javax.swing.JLabel jLabel24;
-    private javax.swing.JLabel jLabel25;
-    private javax.swing.JLabel jLabel26;
-    private javax.swing.JLabel jLabel27;
-    private javax.swing.JLabel jLabel28;
-    private javax.swing.JLabel jLabel29;
     private javax.swing.JLabel jLabel3;
-    private javax.swing.JLabel jLabel30;
-    private javax.swing.JLabel jLabel31;
-    private javax.swing.JLabel jLabel32;
     private javax.swing.JLabel jLabel33;
     private javax.swing.JLabel jLabel34;
     private javax.swing.JLabel jLabel35;
@@ -1228,8 +1208,6 @@ public final class ScientaPanel extends DevicePanel {
     private javax.swing.JPanel jPanel5;
     private javax.swing.JPanel jPanel6;
     private javax.swing.JPanel jPanel7;
-    private javax.swing.JPanel jPanel8;
-    private javax.swing.JPanel jPanel9;
     private javax.swing.JProgressBar progress;
     private javax.swing.JPanel scientaPanel;
     private javax.swing.JTextField textEst;
@@ -1237,38 +1215,26 @@ public final class ScientaPanel extends DevicePanel {
     private javax.swing.JTextField textStatus;
     private ch.psi.pshell.swing.ValueSelection valuExcit;
     private ch.psi.pshell.swing.ValueSelection valueCenter;
-    private ch.psi.pshell.swing.ValueSelection valueCenter1;
-    private ch.psi.pshell.swing.ValueSelection valueCenter2;
     private ch.psi.pshell.swing.ValueSelection valueCenterTX;
     private ch.psi.pshell.swing.ValueSelection valueCenterTY;
     private ch.psi.pshell.swing.ValueSelection valueChannels;
     private ch.psi.pshell.swing.ValueSelection valueCount;
-    private ch.psi.pshell.swing.ValueSelection valueCount1;
-    private ch.psi.pshell.swing.ValueSelection valueCount2;
     private ch.psi.pshell.swing.ValueSelection valueCountTX;
     private ch.psi.pshell.swing.ValueSelection valueCountTY;
     private ch.psi.pshell.swing.ValueSelection valueCurrent;
     private ch.psi.pshell.swing.ValueSelection valueHigh;
-    private ch.psi.pshell.swing.ValueSelection valueHigh1;
-    private ch.psi.pshell.swing.ValueSelection valueHigh2;
     private ch.psi.pshell.swing.ValueSelection valueHighTX;
     private ch.psi.pshell.swing.ValueSelection valueHighTY;
     private ch.psi.pshell.swing.ValueSelection valueImageCounter;
     private ch.psi.pshell.swing.ValueSelection valueLow;
-    private ch.psi.pshell.swing.ValueSelection valueLow1;
-    private ch.psi.pshell.swing.ValueSelection valueLow2;
     private ch.psi.pshell.swing.ValueSelection valueLowTX;
     private ch.psi.pshell.swing.ValueSelection valueLowTY;
-    private ch.psi.pshell.swing.ValueSelection valueSize1;
-    private ch.psi.pshell.swing.ValueSelection valueSize2;
     private ch.psi.pshell.swing.ValueSelection valueSlices;
     private ch.psi.pshell.swing.ValueSelection valueStep;
     private ch.psi.pshell.swing.ValueSelection valueStepTX;
     private ch.psi.pshell.swing.ValueSelection valueStepTY;
     private ch.psi.pshell.swing.ValueSelection valueTotal;
     private ch.psi.pshell.swing.ValueSelection valueWidth;
-    private ch.psi.pshell.swing.ValueSelection valueWidth1;
-    private ch.psi.pshell.swing.ValueSelection valueWidth2;
     private ch.psi.pshell.swing.ValueSelection valueWidthTX;
     private ch.psi.pshell.swing.ValueSelection valueWidthTY;
     // End of variables declaration//GEN-END:variables