diff --git a/config/devices.properties b/config/devices.properties
index 7e4d5eb..12fdff9 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -8,11 +8,15 @@ id1_mode=ch.psi.pshell.epics.DiscretePositioner|X11MA-ID1:MODE|||true
 id1_alpha=ch.psi.pshell.epics.ChannelDouble|X11MA-ID1:ALPHA|||true
 id1_offset=ch.psi.pshell.epics.ChannelDouble|X11MA-ID1:ENERGY-OFFS|||true
 id1_harmonic=ch.psi.pshell.epics.ChannelDouble|X11MA-ID1:HARMONIC|||true
+id1_gap=ch.psi.pshell.epics.ChannelDouble|X11MA-ID1-GAP:READ 3|||true
+id1_shift=ch.psi.pshell.epics.ChannelDouble|X11MA-ID1-SHIFT:READ|||true
 id1_done=ch.psi.pshell.epics.ChannelString|X11MA-ID1:DONE|Read||true
 id2_mode=ch.psi.pshell.epics.DiscretePositioner|X11MA-ID2:MODE|||true
 id2_alpha=ch.psi.pshell.epics.ChannelDouble|X11MA-ID2:ALPHA|||true
 id2_offset=ch.psi.pshell.epics.ChannelDouble|X11MA-ID2:ENERGY-OFFS|||true
 id2_harmonic=ch.psi.pshell.epics.ChannelDouble|X11MA-ID2:HARMONIC|||true
+id2_gap=ch.psi.pshell.epics.ChannelDouble|X11MA-ID2-GAP:READ 3|||true
+id2_shift=ch.psi.pshell.epics.ChannelDouble|X11MA-ID2-SHIFT:READ|||true
 id2_done=ch.psi.pshell.epics.ChannelString|X11MA-ID2:DONE|Read||true
 energy=ch.psi.pshell.epics.ChannelDouble|X11PHS-E:GO.A|||true
 energy_opt=ch.psi.pshell.epics.ChannelString|X11PHS-E:OPT|||true
diff --git a/config/settings.properties b/config/settings.properties
index 7d23382..6ff1692 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,4 +1,4 @@
-#Tue Dec 15 15:03:43 CET 2020
+#Wed Dec 16 10:44:12 CET 2020
 HARMONIC_ID_1=1
 RSYNC_USER=
 OUTLIERS_THRESHOLD=1000000000
diff --git a/plugins/Eiger.form b/plugins/Eiger.form
index b9961da..7179917 100644
--- a/plugins/Eiger.form
+++ b/plugins/Eiger.form
@@ -20,7 +20,7 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jTabbedPane1" alignment="0" pref="680" max="32767" attributes="0"/>
+          <Component id="jTabbedPane1" alignment="0" max="32767" attributes="0"/>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
@@ -108,7 +108,7 @@
                           <EmptySpace type="separate" max="-2" attributes="0"/>
                           <Component id="jLabel29" min="-2" max="-2" attributes="0"/>
                           <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
-                          <Component id="textNorm" pref="447" max="32767" attributes="0"/>
+                          <Component id="textNorm" pref="426" max="32767" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
                           <Component id="buttonSetNorm" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
@@ -369,7 +369,7 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" attributes="0">
                       <EmptySpace min="-2" pref="17" max="-2" attributes="0"/>
-                      <Component id="rendererRoi" pref="448" max="32767" attributes="0"/>
+                      <Component id="rendererRoi" pref="427" max="32767" attributes="0"/>
                       <EmptySpace type="separate" max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" max="-2" attributes="0">
                           <Component id="jScrollPane1" alignment="0" pref="200" max="32767" attributes="0"/>
@@ -397,7 +397,7 @@
                               <EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
                               <Component id="jLabel26" min="-2" max="-2" attributes="0"/>
                               <EmptySpace min="-2" max="-2" attributes="0"/>
-                              <Component id="jScrollPane1" pref="250" max="32767" attributes="0"/>
+                              <Component id="jScrollPane1" pref="175" max="32767" attributes="0"/>
                               <EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
                               <Component id="buttonRoiClear" min="-2" pref="25" max="-2" attributes="0"/>
                               <EmptySpace min="-2" max="-2" attributes="0"/>
@@ -554,14 +554,14 @@
                   <Group type="102" alignment="0" attributes="0">
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="panelImgControls" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="separate" pref="31" max="32767" attributes="0"/>
+                      <EmptySpace max="32767" attributes="0"/>
                       <Component id="jPanel9" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="unrelated" pref="32" max="32767" attributes="0"/>
+                      <EmptySpace max="32767" attributes="0"/>
                       <Group type="103" groupAlignment="3" attributes="0">
                           <Component id="buttonImgStart" alignment="3" min="-2" max="-2" attributes="0"/>
                           <Component id="buttonImgAbort" alignment="3" min="-2" max="-2" attributes="0"/>
                       </Group>
-                      <EmptySpace pref="55" max="32767" attributes="0"/>
+                      <EmptySpace max="32767" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
@@ -619,41 +619,35 @@
                     <DimensionLayout dim="0">
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Group type="102" attributes="0">
+                              <EmptySpace max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
-                                  <Group type="102" alignment="0" attributes="0">
-                                      <EmptySpace max="-2" attributes="0"/>
-                                      <Group type="103" groupAlignment="0" attributes="0">
-                                          <Component id="jLabel20" alignment="1" min="-2" max="-2" attributes="0"/>
-                                          <Component id="jLabel21" alignment="1" min="-2" max="-2" attributes="0"/>
-                                          <Component id="labelSwitching" alignment="1" min="-2" max="-2" attributes="0"/>
-                                          <Component id="labelSwitching1" alignment="1" min="-2" max="-2" attributes="0"/>
-                                      </Group>
-                                      <EmptySpace max="-2" attributes="0"/>
-                                      <Group type="103" groupAlignment="0" attributes="0">
-                                          <Component id="comboSwitch" linkSize="10" alignment="0" max="32767" attributes="0"/>
-                                          <Component id="spinnerImgMeasurements" linkSize="10" alignment="0" max="32767" attributes="0"/>
-                                          <Component id="comboImgMethod" linkSize="10" alignment="0" max="32767" attributes="0"/>
-                                          <Component id="comboSeq" linkSize="10" alignment="0" min="-2" max="-2" attributes="0"/>
-                                      </Group>
-                                  </Group>
-                                  <Group type="102" alignment="0" attributes="0">
-                                      <EmptySpace min="118" pref="118" max="-2" attributes="0"/>
-                                      <Component id="checkImgAutosave" linkSize="10" max="32767" attributes="0"/>
-                                  </Group>
-                              </Group>
-                              <EmptySpace type="separate" pref="62" max="32767" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="jLabel9" alignment="1" min="-2" max="-2" attributes="0"/>
-                                  <Component id="jLabel4" alignment="1" min="-2" max="-2" attributes="0"/>
+                                  <Component id="jLabel21" alignment="1" min="-2" max="-2" attributes="0"/>
+                                  <Component id="labelSwitching" alignment="1" min="-2" max="-2" attributes="0"/>
+                                  <Component id="labelSwitching1" alignment="1" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
+                                  <Component id="comboImgMethod" linkSize="34" alignment="0" min="-2" max="-2" attributes="0"/>
+                                  <Component id="comboSwitch" linkSize="34" alignment="0" min="-2" max="-2" attributes="0"/>
+                                  <Component id="comboSeq" linkSize="34" alignment="0" min="-2" max="-2" attributes="0"/>
+                                  <Component id="checkImgAutosave" linkSize="34" alignment="0" min="-2" pref="95" max="-2" attributes="0"/>
+                              </Group>
+                              <EmptySpace type="separate" max="32767" attributes="0"/>
+                              <Group type="103" groupAlignment="0" attributes="0">
+                                  <Component id="jLabel20" alignment="1" min="-2" max="-2" attributes="0"/>
+                                  <Component id="jLabel4" alignment="1" min="-2" max="-2" attributes="0"/>
+                                  <Component id="jLabel9" alignment="1" min="-2" max="-2" attributes="0"/>
+                              </Group>
+                              <EmptySpace max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="0" attributes="0">
+                                  <Component id="spinnerImgAvg" linkSize="6" alignment="0" min="-2" max="-2" attributes="0"/>
+                                  <Component id="checkSwitchPol" alignment="0" min="-2" max="-2" attributes="0"/>
                                   <Group type="102" attributes="0">
                                       <Group type="103" groupAlignment="0" attributes="0">
-                                          <Component id="spinnerImgAvg" linkSize="6" min="-2" max="-2" attributes="0"/>
-                                          <Component id="spinnerImgExp" linkSize="6" min="-2" max="-2" attributes="0"/>
+                                          <Component id="spinnerImgExp" linkSize="6" alignment="0" min="-2" max="-2" attributes="0"/>
+                                          <Component id="spinnerImgMeasurements" linkSize="6" alignment="0" min="-2" max="-2" attributes="0"/>
                                       </Group>
-                                      <EmptySpace type="separate" pref="62" max="32767" attributes="0"/>
+                                      <EmptySpace type="separate" max="32767" attributes="0"/>
                                       <Group type="103" groupAlignment="0" attributes="0">
                                           <Component id="labelImgEng1" alignment="1" min="-2" max="-2" attributes="0"/>
                                           <Component id="labelImgEng2" alignment="1" min="-2" max="-2" attributes="0"/>
@@ -664,12 +658,8 @@
                                           <Component id="spinnerImgEng2" linkSize="6" alignment="0" min="-2" max="-2" attributes="0"/>
                                       </Group>
                                   </Group>
-                                  <Group type="102" attributes="0">
-                                      <Component id="checkSwitchPol" min="-2" max="-2" attributes="0"/>
-                                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                                  </Group>
                               </Group>
-                              <EmptySpace max="-2" attributes="0"/>
+                              <EmptySpace max="32767" attributes="0"/>
                           </Group>
                       </Group>
                     </DimensionLayout>
@@ -677,48 +667,36 @@
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Group type="102" alignment="0" attributes="0">
                               <EmptySpace max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="1" attributes="0">
-                                  <Group type="102" attributes="0">
-                                      <Group type="103" groupAlignment="3" attributes="0">
-                                          <Component id="labelImgEng2" alignment="3" min="-2" max="-2" attributes="0"/>
-                                          <Component id="spinnerImgEng1" alignment="3" min="-2" max="-2" attributes="0"/>
-                                      </Group>
-                                      <EmptySpace max="-2" attributes="0"/>
-                                      <Group type="103" groupAlignment="2" attributes="0">
-                                          <Component id="labelImgEng1" alignment="2" min="-2" max="-2" attributes="0"/>
-                                          <Component id="spinnerImgEng2" alignment="2" min="-2" max="-2" attributes="0"/>
-                                      </Group>
-                                  </Group>
-                                  <Group type="102" attributes="0">
-                                      <Group type="103" groupAlignment="3" attributes="0">
-                                          <Component id="comboImgMethod" alignment="3" min="-2" max="-2" attributes="0"/>
-                                          <Component id="jLabel21" alignment="3" min="-2" max="-2" attributes="0"/>
-                                          <Component id="jLabel4" alignment="3" min="-2" max="-2" attributes="0"/>
-                                          <Component id="spinnerImgExp" alignment="3" min="-2" max="-2" attributes="0"/>
-                                      </Group>
-                                      <EmptySpace max="-2" attributes="0"/>
-                                      <Group type="103" groupAlignment="3" attributes="0">
-                                          <Component id="jLabel20" alignment="3" min="-2" max="-2" attributes="0"/>
-                                          <Component id="spinnerImgMeasurements" alignment="3" min="-2" max="-2" attributes="0"/>
-                                          <Component id="jLabel9" alignment="3" min="-2" max="-2" attributes="0"/>
-                                          <Component id="spinnerImgAvg" alignment="3" min="-2" max="-2" attributes="0"/>
-                                      </Group>
-                                  </Group>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="jLabel21" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="comboImgMethod" linkSize="31" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="jLabel20" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="spinnerImgMeasurements" linkSize="32" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="labelImgEng2" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="spinnerImgEng1" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
-                              <EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="3" attributes="0">
-                                  <Component id="labelSwitching" alignment="3" min="-2" max="-2" attributes="0"/>
-                                  <Component id="comboSwitch" alignment="3" min="-2" max="-2" attributes="0"/>
-                                  <Component id="checkSwitchPol" alignment="3" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="labelSwitching" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="comboSwitch" linkSize="31" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="jLabel4" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="spinnerImgExp" linkSize="32" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="labelImgEng1" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="spinnerImgEng2" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
-                              <EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="3" attributes="0">
-                                  <Component id="labelSwitching1" alignment="3" min="-2" max="-2" attributes="0"/>
-                                  <Component id="comboSeq" alignment="3" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="labelSwitching1" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="comboSeq" linkSize="31" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="jLabel9" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="spinnerImgAvg" linkSize="32" alignment="2" min="-2" max="-2" attributes="0"/>
                               </Group>
                               <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                              <Component id="checkImgAutosave" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace pref="17" max="32767" attributes="0"/>
+                              <Group type="103" groupAlignment="2" attributes="0">
+                                  <Component id="checkImgAutosave" alignment="2" min="-2" max="-2" attributes="0"/>
+                                  <Component id="checkSwitchPol" alignment="2" min="-2" max="-2" attributes="0"/>
+                              </Group>
+                              <EmptySpace max="-2" attributes="0"/>
                           </Group>
                       </Group>
                     </DimensionLayout>
@@ -765,7 +743,7 @@
                     <Component class="javax.swing.JSpinner" name="spinnerImgMeasurements">
                       <Properties>
                         <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
-                          <SpinnerModel initial="1" maximum="10000" minimum="1" numberType="java.lang.Integer" stepSize="1" type="number"/>
+                          <SpinnerModel initial="20" maximum="10000" minimum="1" numberType="java.lang.Integer" stepSize="1" type="number"/>
                         </Property>
                       </Properties>
                     </Component>
@@ -809,7 +787,7 @@
                     <Component class="javax.swing.JSpinner" name="spinnerImgAvg">
                       <Properties>
                         <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
-                          <SpinnerModel initial="1" maximum="1000" minimum="1" numberType="java.lang.Integer" stepSize="1" type="number"/>
+                          <SpinnerModel initial="10" maximum="1000" minimum="1" numberType="java.lang.Integer" stepSize="1" type="number"/>
                         </Property>
                       </Properties>
                     </Component>
@@ -876,31 +854,40 @@
                       <Group type="102" alignment="0" attributes="0">
                           <EmptySpace min="-2" pref="24" max="-2" attributes="0"/>
                           <Group type="103" groupAlignment="0" attributes="0">
+                              <Component id="labelModeID2b" linkSize="30" alignment="1" max="32767" attributes="0"/>
+                              <Component id="labelModeID1b" linkSize="30" alignment="1" min="-2" max="-2" attributes="0"/>
+                              <Component id="labelEnergya4" alignment="1" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Component id="labelID" linkSize="26" max="32767" attributes="0"/>
+                              <Component id="dvpModeID1b" linkSize="26" alignment="0" pref="0" max="32767" attributes="0"/>
+                              <Component id="dvpModeID2b" linkSize="26" alignment="0" pref="0" max="32767" attributes="0"/>
+                          </Group>
+                          <EmptySpace type="separate" max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Component id="labelOffID2a" linkSize="30" alignment="1" min="-2" max="-2" attributes="0"/>
+                              <Component id="labelEnergya3" linkSize="30" alignment="1" min="-2" max="-2" attributes="0"/>
+                              <Component id="labelOffID1a" linkSize="30" alignment="1" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Component id="dvpEnergya3" linkSize="26" pref="92" max="32767" attributes="0"/>
                               <Group type="102" attributes="0">
-                                  <Group type="103" groupAlignment="1" max="-2" attributes="0">
-                                      <Component id="labelModeID2b" linkSize="30" alignment="0" max="32767" attributes="0"/>
-                                      <Component id="labelModeID1b" linkSize="30" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  </Group>
-                                  <EmptySpace max="-2" attributes="0"/>
-                                  <Group type="103" groupAlignment="0" attributes="0">
-                                      <Component id="dvpModeID1b" linkSize="26" alignment="0" pref="0" max="32767" attributes="0"/>
-                                      <Component id="dvpModeID2b" linkSize="26" alignment="0" pref="0" max="32767" attributes="0"/>
-                                  </Group>
-                                  <EmptySpace type="separate" max="-2" attributes="0"/>
-                                  <Group type="103" groupAlignment="0" attributes="0">
-                                      <Component id="labelOffID1a" linkSize="30" alignment="0" min="-2" max="-2" attributes="0"/>
-                                      <Component id="labelOffID2a" linkSize="30" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  </Group>
-                                  <EmptySpace max="-2" attributes="0"/>
                                   <Group type="103" groupAlignment="0" attributes="0">
                                       <Component id="dvpOffID2b" linkSize="26" alignment="0" min="-2" pref="60" max="-2" attributes="0"/>
                                       <Component id="dvpOffID1b" linkSize="26" alignment="0" min="-2" pref="62" max="-2" attributes="0"/>
                                   </Group>
-                              </Group>
-                              <Group type="102" attributes="0">
-                                  <Component id="labelEnergya3" linkSize="30" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace type="separate" max="-2" attributes="0"/>
+                                  <Group type="103" groupAlignment="0" attributes="0">
+                                      <Component id="labelOffID2a1" alignment="1" min="-2" max="-2" attributes="0"/>
+                                      <Component id="labelOffID1a1" alignment="1" min="-2" max="-2" attributes="0"/>
+                                  </Group>
                                   <EmptySpace max="-2" attributes="0"/>
-                                  <Component id="dvpEnergya3" linkSize="26" min="-2" pref="92" max="-2" attributes="0"/>
+                                  <Group type="103" groupAlignment="0" attributes="0">
+                                      <Component id="dvpOffID2b1" linkSize="26" alignment="0" min="-2" pref="60" max="-2" attributes="0"/>
+                                      <Component id="dvpOffID1b1" linkSize="26" alignment="0" min="-2" pref="62" max="-2" attributes="0"/>
+                                  </Group>
                               </Group>
                           </Group>
                           <EmptySpace max="32767" attributes="0"/>
@@ -909,9 +896,11 @@
                 </DimensionLayout>
                 <DimensionLayout dim="1">
                   <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="2" attributes="0">
+                              <Component id="labelEnergya4" alignment="2" min="-2" max="-2" attributes="0"/>
+                              <Component id="labelID" linkSize="27" alignment="2" min="-2" max="-2" attributes="0"/>
                               <Component id="labelEnergya3" alignment="2" min="-2" max="-2" attributes="0"/>
                               <Component id="dvpEnergya3" linkSize="27" alignment="2" min="-2" pref="17" max="-2" attributes="0"/>
                           </Group>
@@ -921,6 +910,8 @@
                               <Component id="dvpModeID1b" linkSize="27" alignment="2" min="-2" max="-2" attributes="0"/>
                               <Component id="labelOffID1a" alignment="2" min="-2" max="-2" attributes="0"/>
                               <Component id="dvpOffID1b" linkSize="27" alignment="2" min="-2" pref="20" max="-2" attributes="0"/>
+                              <Component id="labelOffID1a1" alignment="2" min="-2" max="-2" attributes="0"/>
+                              <Component id="dvpOffID1b1" linkSize="27" alignment="2" min="-2" pref="20" max="-2" attributes="0"/>
                           </Group>
                           <EmptySpace max="-2" attributes="0"/>
                           <Group type="103" groupAlignment="2" attributes="0">
@@ -928,6 +919,8 @@
                               <Component id="dvpModeID2b" linkSize="27" alignment="2" min="-2" max="-2" attributes="0"/>
                               <Component id="labelOffID2a" alignment="2" min="-2" max="-2" attributes="0"/>
                               <Component id="dvpOffID2b" linkSize="27" alignment="2" min="-2" pref="20" max="-2" attributes="0"/>
+                              <Component id="labelOffID2a1" alignment="2" min="-2" max="-2" attributes="0"/>
+                              <Component id="dvpOffID2b1" linkSize="27" alignment="2" min="-2" pref="20" max="-2" attributes="0"/>
                           </Group>
                           <EmptySpace max="-2" attributes="0"/>
                       </Group>
@@ -988,6 +981,42 @@
                     <Property name="text" type="java.lang.String" value="Mode ID2:"/>
                   </Properties>
                 </Component>
+                <Component class="javax.swing.JLabel" name="labelEnergya4">
+                  <Properties>
+                    <Property name="horizontalAlignment" type="int" value="11"/>
+                    <Property name="text" type="java.lang.String" value="ID:"/>
+                  </Properties>
+                </Component>
+                <Component class="javax.swing.JLabel" name="labelID">
+                  <Properties>
+                    <Property name="horizontalAlignment" type="int" value="0"/>
+                    <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+                      <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+                        <TitledBorder/>
+                      </Border>
+                    </Property>
+                  </Properties>
+                </Component>
+                <Component class="javax.swing.JLabel" name="labelOffID1a1">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" value="Gap ID1:"/>
+                  </Properties>
+                </Component>
+                <Component class="ch.psi.pshell.swing.DeviceValuePanel" name="dvpOffID1b1">
+                  <Properties>
+                    <Property name="deviceName" type="java.lang.String" value="id1_gap"/>
+                  </Properties>
+                </Component>
+                <Component class="ch.psi.pshell.swing.DeviceValuePanel" name="dvpOffID2b1">
+                  <Properties>
+                    <Property name="deviceName" type="java.lang.String" value="id2_gap"/>
+                  </Properties>
+                </Component>
+                <Component class="javax.swing.JLabel" name="labelOffID2a1">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" value="Gap ID2:"/>
+                  </Properties>
+                </Component>
               </SubComponents>
             </Container>
           </SubComponents>
@@ -1020,9 +1049,9 @@
                   <Group type="102" alignment="0" attributes="0">
                       <EmptySpace min="-2" max="-2" attributes="0"/>
                       <Component id="panelSpectrum" max="32767" attributes="0"/>
-                      <EmptySpace type="unrelated" max="32767" attributes="0"/>
+                      <EmptySpace max="32767" attributes="0"/>
                       <Component id="jPanel6" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="unrelated" max="32767" attributes="0"/>
+                      <EmptySpace max="32767" attributes="0"/>
                       <Group type="103" groupAlignment="3" attributes="0">
                           <Component id="buttonSpecStart" alignment="3" min="-2" max="-2" attributes="0"/>
                           <Component id="buttonSpecAbort" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -1054,53 +1083,57 @@
                           </Group>
                           <EmptySpace max="-2" attributes="0"/>
                           <Group type="103" groupAlignment="0" attributes="0">
-                              <Component id="checkSpecSwitchPol" min="-2" max="-2" attributes="0"/>
-                              <Component id="checkSpecWithI0" alignment="0" min="-2" max="-2" attributes="0"/>
-                              <Component id="checkSpecSaveImages" alignment="0" min="-2" max="-2" attributes="0"/>
-                              <Component id="checkSpecSaveSpectrum" alignment="0" min="-2" max="-2" attributes="0"/>
+                              <Component id="checkSpecSwitchPol" alignment="0" min="-2" max="-2" attributes="0"/>
                               <Component id="spinnerSpecScans" linkSize="11" alignment="0" min="-2" max="-2" attributes="0"/>
-                              <Component id="spinnerSpecExp" linkSize="11" alignment="0" min="-2" max="-2" attributes="0"/>
                               <Component id="spinnerSpecAvg" linkSize="11" alignment="0" min="-2" max="-2" attributes="0"/>
+                              <Component id="spinnerSpecExp" linkSize="11" alignment="0" min="-2" max="-2" attributes="0"/>
                           </Group>
-                          <EmptySpace pref="21" max="32767" attributes="0"/>
+                          <EmptySpace max="32767" attributes="0"/>
                           <Component id="jPanel4" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace pref="27" max="32767" attributes="0"/>
+                          <EmptySpace max="32767" attributes="0"/>
+                      </Group>
+                      <Group type="102" attributes="0">
+                          <EmptySpace min="99" pref="99" max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Component id="checkSpecSaveSpectrum" alignment="0" min="-2" max="-2" attributes="0"/>
+                              <Component id="checkSpecSaveImages" alignment="0" min="-2" max="-2" attributes="0"/>
+                              <Component id="checkSpecWithI0" alignment="0" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                          <EmptySpace max="32767" attributes="0"/>
                       </Group>
                   </Group>
                 </DimensionLayout>
                 <DimensionLayout dim="1">
                   <Group type="103" groupAlignment="0" attributes="0">
-                      <Group type="102" attributes="0">
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Group type="103" groupAlignment="1" attributes="0">
+                      <Group type="102" alignment="0" attributes="0">
+                          <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="0" attributes="0">
                               <Component id="jPanel4" max="32767" attributes="0"/>
-                              <Group type="102" alignment="1" attributes="0">
+                              <Group type="102" attributes="0">
                                   <Component id="checkSpecSaveSpectrum" min="-2" max="-2" attributes="0"/>
                                   <EmptySpace max="-2" attributes="0"/>
                                   <Component id="checkSpecSaveImages" min="-2" max="-2" attributes="0"/>
                                   <EmptySpace max="-2" attributes="0"/>
                                   <Component id="checkSpecWithI0" min="-2" max="-2" attributes="0"/>
-                                  <EmptySpace max="-2" attributes="0"/>
+                                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
                                   <Group type="103" groupAlignment="3" attributes="0">
                                       <Component id="jLabel23" alignment="3" min="-2" max="-2" attributes="0"/>
                                       <Component id="spinnerSpecExp" alignment="3" min="-2" max="-2" attributes="0"/>
                                   </Group>
-                                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                                  <EmptySpace max="-2" attributes="0"/>
                                   <Group type="103" groupAlignment="3" attributes="0">
                                       <Component id="jLabel24" alignment="3" min="-2" max="-2" attributes="0"/>
                                       <Component id="spinnerSpecAvg" alignment="3" min="-2" max="-2" attributes="0"/>
                                   </Group>
-                                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                                  <EmptySpace max="-2" attributes="0"/>
                                   <Group type="103" groupAlignment="3" attributes="0">
                                       <Component id="jLabel25" alignment="3" min="-2" max="-2" attributes="0"/>
                                       <Component id="spinnerSpecScans" alignment="3" min="-2" max="-2" attributes="0"/>
                                   </Group>
-                                  <EmptySpace min="-2" pref="59" max="-2" attributes="0"/>
+                                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
                                   <Component id="checkSpecSwitchPol" min="-2" max="-2" attributes="0"/>
-                                  <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                               </Group>
                           </Group>
-                          <EmptySpace max="-2" attributes="0"/>
                       </Group>
                   </Group>
                 </DimensionLayout>
@@ -1208,7 +1241,7 @@
                                       <Component id="buttonAdd" min="-2" max="-2" attributes="0"/>
                                       <EmptySpace max="-2" attributes="0"/>
                                       <Component id="buttonRemove" min="-2" max="-2" attributes="0"/>
-                                      <EmptySpace max="32767" attributes="0"/>
+                                      <EmptySpace type="separate" max="32767" attributes="0"/>
                                       <Component id="buttonClear" min="-2" max="-2" attributes="0"/>
                                       <EmptySpace max="-2" attributes="0"/>
                                       <Component id="buttonOpen" min="-2" max="-2" attributes="0"/>
@@ -1238,6 +1271,9 @@
                                 <Column editable="true" title="Step" type="java.lang.Double"/>
                               </Table>
                             </Property>
+                            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                              <Dimension value="[150, 0]"/>
+                            </Property>
                           </Properties>
                         </Component>
                       </SubComponents>
@@ -1310,34 +1346,43 @@
                       <Group type="102" alignment="0" attributes="0">
                           <EmptySpace min="-2" pref="24" max="-2" attributes="0"/>
                           <Group type="103" groupAlignment="0" attributes="0">
+                              <Component id="labelEnergya5" alignment="1" min="-2" max="-2" attributes="0"/>
+                              <Component id="labelModeID1a" linkSize="28" alignment="1" min="-2" max="-2" attributes="0"/>
+                              <Component id="labelModeID2a" linkSize="28" alignment="1" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                              <Component id="labelID1" linkSize="18" max="32767" attributes="0"/>
+                              <Component id="dvpModeID1a" linkSize="18" alignment="0" pref="0" max="32767" attributes="0"/>
+                              <Component id="dvpModeID2a" linkSize="18" alignment="0" pref="0" max="32767" attributes="0"/>
+                          </Group>
+                          <EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Component id="labelOffID2b" linkSize="28" alignment="1" min="-2" max="-2" attributes="0"/>
+                              <Component id="labelOffID1b" linkSize="28" alignment="1" min="-2" max="-2" attributes="0"/>
+                              <Component id="labelEnergya" linkSize="28" alignment="1" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Component id="dvpEnergya" linkSize="18" min="-2" pref="92" max="-2" attributes="0"/>
                               <Group type="102" attributes="0">
-                                  <Group type="103" groupAlignment="1" attributes="0">
-                                      <Component id="labelModeID2a" linkSize="28" alignment="0" min="-2" max="-2" attributes="0"/>
-                                      <Component id="labelModeID1a" linkSize="28" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  </Group>
-                                  <EmptySpace min="-2" max="-2" attributes="0"/>
                                   <Group type="103" groupAlignment="0" attributes="0">
-                                      <Component id="dvpModeID1a" linkSize="18" alignment="0" pref="0" max="32767" attributes="0"/>
-                                      <Component id="dvpModeID2a" linkSize="18" alignment="0" pref="0" max="32767" attributes="0"/>
+                                      <Component id="dvpOffID2a" linkSize="18" alignment="0" min="-2" pref="60" max="-2" attributes="0"/>
+                                      <Component id="dvpOffID1a" linkSize="18" alignment="0" min="-2" pref="62" max="-2" attributes="0"/>
                                   </Group>
-                                  <EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace type="separate" max="-2" attributes="0"/>
                                   <Group type="103" groupAlignment="0" attributes="0">
-                                      <Component id="labelOffID1b" linkSize="28" alignment="0" min="-2" max="-2" attributes="0"/>
-                                      <Component id="labelOffID2b" linkSize="28" alignment="0" min="-2" max="-2" attributes="0"/>
+                                      <Component id="labelOffID2a2" alignment="1" min="-2" max="-2" attributes="0"/>
+                                      <Component id="labelOffID1a2" alignment="1" min="-2" max="-2" attributes="0"/>
                                   </Group>
-                                  <EmptySpace min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace max="-2" attributes="0"/>
                                   <Group type="103" groupAlignment="0" attributes="0">
-                                      <Component id="dvpOffID2a" linkSize="18" min="-2" pref="60" max="-2" attributes="0"/>
-                                      <Component id="dvpOffID1a" linkSize="18" min="-2" pref="62" max="-2" attributes="0"/>
+                                      <Component id="dvpOffID2b2" linkSize="18" alignment="0" min="-2" pref="60" max="-2" attributes="0"/>
+                                      <Component id="dvpOffID1b2" linkSize="18" alignment="0" min="-2" pref="62" max="-2" attributes="0"/>
                                   </Group>
                               </Group>
-                              <Group type="102" attributes="0">
-                                  <Component id="labelEnergya" linkSize="28" min="-2" max="-2" attributes="0"/>
-                                  <EmptySpace min="-2" max="-2" attributes="0"/>
-                                  <Component id="dvpEnergya" linkSize="18" min="-2" pref="92" max="-2" attributes="0"/>
-                              </Group>
                           </Group>
-                          <EmptySpace max="32767" attributes="0"/>
+                          <EmptySpace pref="114" max="32767" attributes="0"/>
                       </Group>
                   </Group>
                 </DimensionLayout>
@@ -1346,15 +1391,19 @@
                       <Group type="102" attributes="0">
                           <EmptySpace max="-2" attributes="0"/>
                           <Group type="103" groupAlignment="2" attributes="0">
+                              <Component id="labelEnergya5" alignment="2" min="-2" max="-2" attributes="0"/>
+                              <Component id="labelID1" linkSize="19" alignment="2" min="-2" max="-2" attributes="0"/>
                               <Component id="labelEnergya" linkSize="29" alignment="2" min="-2" max="-2" attributes="0"/>
                               <Component id="dvpEnergya" linkSize="19" alignment="2" min="-2" pref="17" max="-2" attributes="0"/>
                           </Group>
                           <EmptySpace max="-2" attributes="0"/>
                           <Group type="103" groupAlignment="2" attributes="0">
-                              <Component id="labelModeID1a" linkSize="29" alignment="2" min="-2" max="-2" attributes="0"/>
-                              <Component id="dvpModeID1a" linkSize="19" alignment="2" min="-2" max="-2" attributes="0"/>
-                              <Component id="labelOffID1b" linkSize="29" alignment="2" min="-2" max="-2" attributes="0"/>
+                              <Component id="dvpOffID1b2" linkSize="19" alignment="2" min="-2" pref="20" max="-2" attributes="0"/>
+                              <Component id="labelOffID1a2" alignment="2" min="-2" max="-2" attributes="0"/>
                               <Component id="dvpOffID1a" linkSize="19" alignment="2" min="-2" pref="20" max="-2" attributes="0"/>
+                              <Component id="labelOffID1b" linkSize="29" alignment="2" min="-2" max="-2" attributes="0"/>
+                              <Component id="dvpModeID1a" linkSize="19" alignment="2" min="-2" max="-2" attributes="0"/>
+                              <Component id="labelModeID1a" linkSize="29" alignment="2" min="-2" max="-2" attributes="0"/>
                           </Group>
                           <EmptySpace max="-2" attributes="0"/>
                           <Group type="103" groupAlignment="2" attributes="0">
@@ -1362,6 +1411,8 @@
                               <Component id="dvpModeID2a" linkSize="19" alignment="2" min="-2" max="-2" attributes="0"/>
                               <Component id="labelOffID2b" linkSize="29" alignment="2" min="-2" max="-2" attributes="0"/>
                               <Component id="dvpOffID2a" linkSize="19" alignment="2" min="-2" pref="20" max="-2" attributes="0"/>
+                              <Component id="labelOffID2a2" alignment="2" min="-2" max="-2" attributes="0"/>
+                              <Component id="dvpOffID2b2" linkSize="19" alignment="2" min="-2" pref="20" max="-2" attributes="0"/>
                           </Group>
                           <EmptySpace max="-2" attributes="0"/>
                       </Group>
@@ -1422,6 +1473,42 @@
                     <Property name="text" type="java.lang.String" value="Mode ID2:"/>
                   </Properties>
                 </Component>
+                <Component class="javax.swing.JLabel" name="labelEnergya5">
+                  <Properties>
+                    <Property name="horizontalAlignment" type="int" value="11"/>
+                    <Property name="text" type="java.lang.String" value="ID:"/>
+                  </Properties>
+                </Component>
+                <Component class="javax.swing.JLabel" name="labelID1">
+                  <Properties>
+                    <Property name="horizontalAlignment" type="int" value="0"/>
+                    <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+                      <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+                        <TitledBorder/>
+                      </Border>
+                    </Property>
+                  </Properties>
+                </Component>
+                <Component class="javax.swing.JLabel" name="labelOffID1a2">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" value="Gap ID1:"/>
+                  </Properties>
+                </Component>
+                <Component class="ch.psi.pshell.swing.DeviceValuePanel" name="dvpOffID1b2">
+                  <Properties>
+                    <Property name="deviceName" type="java.lang.String" value="id1_gap"/>
+                  </Properties>
+                </Component>
+                <Component class="ch.psi.pshell.swing.DeviceValuePanel" name="dvpOffID2b2">
+                  <Properties>
+                    <Property name="deviceName" type="java.lang.String" value="id2_gap"/>
+                  </Properties>
+                </Component>
+                <Component class="javax.swing.JLabel" name="labelOffID2a2">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" value="Gap ID2:"/>
+                  </Properties>
+                </Component>
               </SubComponents>
             </Container>
           </SubComponents>
diff --git a/plugins/Eiger.java b/plugins/Eiger.java
index 06de50d..79fe6f9 100644
--- a/plugins/Eiger.java
+++ b/plugins/Eiger.java
@@ -209,6 +209,9 @@ public class Eiger extends Panel {
                     comboSwitch.setSelectedIndex(1);
                 }
             }
+            labelID.setText(id);
+            labelID1.setText(id);
+            /*
             boolean id1 = !id.equals("ID2");
             boolean id2 = !id.equals("ID1");
             dvpModeID1a.setVisible(id1);
@@ -227,6 +230,7 @@ public class Eiger extends Panel {
             labelOffID2a.setVisible(id2);
             dvpOffID2b.setVisible(id2);
             labelOffID2b.setVisible(id2);
+            */
             
         } catch (Exception ex) {
             getLogger().log(Level.WARNING, null, ex);
@@ -478,6 +482,12 @@ public class Eiger extends Panel {
         dvpModeID1b = new ch.psi.pshell.swing.DeviceValuePanel();
         labelModeID1b = new javax.swing.JLabel();
         labelModeID2b = new javax.swing.JLabel();
+        labelEnergya4 = new javax.swing.JLabel();
+        labelID = new javax.swing.JLabel();
+        labelOffID1a1 = new javax.swing.JLabel();
+        dvpOffID1b1 = new ch.psi.pshell.swing.DeviceValuePanel();
+        dvpOffID2b1 = new ch.psi.pshell.swing.DeviceValuePanel();
+        labelOffID2a1 = new javax.swing.JLabel();
         jPanel3 = new javax.swing.JPanel();
         panelSpectrum = new javax.swing.JPanel();
         jLabel23 = new javax.swing.JLabel();
@@ -511,6 +521,12 @@ public class Eiger extends Panel {
         dvpModeID1a = new ch.psi.pshell.swing.DeviceValuePanel();
         labelModeID1a = new javax.swing.JLabel();
         labelModeID2a = new javax.swing.JLabel();
+        labelEnergya5 = new javax.swing.JLabel();
+        labelID1 = new javax.swing.JLabel();
+        labelOffID1a2 = new javax.swing.JLabel();
+        dvpOffID1b2 = new ch.psi.pshell.swing.DeviceValuePanel();
+        dvpOffID2b2 = new ch.psi.pshell.swing.DeviceValuePanel();
+        labelOffID2a2 = new javax.swing.JLabel();
 
         panelNorm.setBorder(javax.swing.BorderFactory.createTitledBorder("Normalization"));
 
@@ -551,7 +567,7 @@ public class Eiger extends Panel {
                 .addGap(18, 18, 18)
                 .addComponent(jLabel29)
                 .addGap(0, 0, 0)
-                .addComponent(textNorm, javax.swing.GroupLayout.DEFAULT_SIZE, 447, Short.MAX_VALUE)
+                .addComponent(textNorm, javax.swing.GroupLayout.DEFAULT_SIZE, 426, Short.MAX_VALUE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(buttonSetNorm)
                 .addContainerGap())
@@ -825,7 +841,7 @@ public class Eiger extends Panel {
             panelRoiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(panelRoiLayout.createSequentialGroup()
                 .addGap(17, 17, 17)
-                .addComponent(rendererRoi, javax.swing.GroupLayout.DEFAULT_SIZE, 448, Short.MAX_VALUE)
+                .addComponent(rendererRoi, javax.swing.GroupLayout.DEFAULT_SIZE, 427, Short.MAX_VALUE)
                 .addGap(18, 18, 18)
                 .addGroup(panelRoiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                     .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 200, Short.MAX_VALUE)
@@ -850,7 +866,7 @@ public class Eiger extends Panel {
                         .addGap(18, 18, 18)
                         .addComponent(jLabel26)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 250, Short.MAX_VALUE)
+                        .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 175, Short.MAX_VALUE)
                         .addGap(18, 18, 18)
                         .addComponent(buttonRoiClear, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -891,7 +907,7 @@ public class Eiger extends Panel {
 
         comboSwitch.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
 
-        spinnerImgMeasurements.setModel(new javax.swing.SpinnerNumberModel(1, 1, 10000, 1));
+        spinnerImgMeasurements.setModel(new javax.swing.SpinnerNumberModel(20, 1, 10000, 1));
 
         comboImgMethod.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
         comboImgMethod.addActionListener(new java.awt.event.ActionListener() {
@@ -908,7 +924,7 @@ public class Eiger extends Panel {
         jLabel9.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
         jLabel9.setText("Average:");
 
-        spinnerImgAvg.setModel(new javax.swing.SpinnerNumberModel(1, 1, 1000, 1));
+        spinnerImgAvg.setModel(new javax.swing.SpinnerNumberModel(10, 1, 1000, 1));
 
         labelImgEng2.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
         labelImgEng2.setText("Energy 1:");
@@ -931,90 +947,81 @@ public class Eiger extends Panel {
         jPanel5Layout.setHorizontalGroup(
             jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel5Layout.createSequentialGroup()
+                .addContainerGap()
                 .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(jPanel5Layout.createSequentialGroup()
-                        .addContainerGap()
-                        .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jLabel20, javax.swing.GroupLayout.Alignment.TRAILING)
-                            .addComponent(jLabel21, javax.swing.GroupLayout.Alignment.TRAILING)
-                            .addComponent(labelSwitching, javax.swing.GroupLayout.Alignment.TRAILING)
-                            .addComponent(labelSwitching1, javax.swing.GroupLayout.Alignment.TRAILING))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(comboSwitch, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                            .addComponent(spinnerImgMeasurements)
-                            .addComponent(comboImgMethod, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                            .addComponent(comboSeq, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                    .addGroup(jPanel5Layout.createSequentialGroup()
-                        .addGap(118, 118, 118)
-                        .addComponent(checkImgAutosave, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
-                .addGap(18, 62, Short.MAX_VALUE)
-                .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(jLabel9, javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addComponent(jLabel4, javax.swing.GroupLayout.Alignment.TRAILING))
+                    .addComponent(jLabel21, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelSwitching, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelSwitching1, javax.swing.GroupLayout.Alignment.TRAILING))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(comboImgMethod, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(comboSwitch, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(comboSeq, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(checkImgAutosave, javax.swing.GroupLayout.PREFERRED_SIZE, 95, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addGap(18, 18, Short.MAX_VALUE)
+                .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jLabel20, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(jLabel4, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(jLabel9, javax.swing.GroupLayout.Alignment.TRAILING))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(spinnerImgAvg, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(checkSwitchPol)
                     .addGroup(jPanel5Layout.createSequentialGroup()
                         .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(spinnerImgAvg, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(spinnerImgExp, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                        .addGap(18, 62, Short.MAX_VALUE)
+                            .addComponent(spinnerImgExp, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(spinnerImgMeasurements, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addGap(18, 18, Short.MAX_VALUE)
                         .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(labelImgEng1, javax.swing.GroupLayout.Alignment.TRAILING)
                             .addComponent(labelImgEng2, javax.swing.GroupLayout.Alignment.TRAILING))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(spinnerImgEng1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(spinnerImgEng2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                    .addGroup(jPanel5Layout.createSequentialGroup()
-                        .addComponent(checkSwitchPol)
-                        .addGap(0, 0, Short.MAX_VALUE)))
-                .addContainerGap())
+                            .addComponent(spinnerImgEng2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
-        jPanel5Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerImgAvg, spinnerImgEng1, spinnerImgEng2, spinnerImgExp});
+        jPanel5Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerImgAvg, spinnerImgEng1, spinnerImgEng2, spinnerImgExp, spinnerImgMeasurements});
 
-        jPanel5Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {checkImgAutosave, comboImgMethod, comboSeq, comboSwitch, spinnerImgMeasurements});
+        jPanel5Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {checkImgAutosave, comboImgMethod, comboSeq, comboSwitch});
 
         jPanel5Layout.setVerticalGroup(
             jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel5Layout.createSequentialGroup()
                 .addContainerGap()
-                .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addGroup(jPanel5Layout.createSequentialGroup()
-                        .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                            .addComponent(labelImgEng2)
-                            .addComponent(spinnerImgEng1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                            .addComponent(labelImgEng1)
-                            .addComponent(spinnerImgEng2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                    .addGroup(jPanel5Layout.createSequentialGroup()
-                        .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                            .addComponent(comboImgMethod, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(jLabel21)
-                            .addComponent(jLabel4)
-                            .addComponent(spinnerImgExp, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                            .addComponent(jLabel20)
-                            .addComponent(spinnerImgMeasurements, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(jLabel9)
-                            .addComponent(spinnerImgAvg, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
-                .addGap(6, 6, 6)
-                .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                    .addComponent(jLabel21)
+                    .addComponent(comboImgMethod, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel20)
+                    .addComponent(spinnerImgMeasurements, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(labelImgEng2)
+                    .addComponent(spinnerImgEng1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(labelSwitching)
                     .addComponent(comboSwitch, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(checkSwitchPol))
-                .addGap(6, 6, 6)
-                .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel4)
+                    .addComponent(spinnerImgExp, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(labelImgEng1)
+                    .addComponent(spinnerImgEng2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(labelSwitching1)
-                    .addComponent(comboSeq, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(comboSeq, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel9)
+                    .addComponent(spinnerImgAvg, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(checkImgAutosave)
-                .addContainerGap(17, Short.MAX_VALUE))
+                .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                    .addComponent(checkImgAutosave)
+                    .addComponent(checkSwitchPol))
+                .addContainerGap())
         );
 
+        jPanel5Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {comboImgMethod, comboSeq, comboSwitch});
+
+        jPanel5Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerImgAvg, spinnerImgExp, spinnerImgMeasurements});
+
         javax.swing.GroupLayout panelImgControlsLayout = new javax.swing.GroupLayout(panelImgControls);
         panelImgControls.setLayout(panelImgControlsLayout);
         panelImgControlsLayout.setHorizontalGroup(
@@ -1055,6 +1062,20 @@ public class Eiger extends Panel {
         labelModeID2b.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
         labelModeID2b.setText("Mode ID2:");
 
+        labelEnergya4.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+        labelEnergya4.setText("ID:");
+
+        labelID.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+        labelID.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
+
+        labelOffID1a1.setText("Gap ID1:");
+
+        dvpOffID1b1.setDeviceName("id1_gap");
+
+        dvpOffID2b1.setDeviceName("id2_gap");
+
+        labelOffID2a1.setText("Gap ID2:");
+
         javax.swing.GroupLayout jPanel9Layout = new javax.swing.GroupLayout(jPanel9);
         jPanel9.setLayout(jPanel9Layout);
         jPanel9Layout.setHorizontalGroup(
@@ -1062,30 +1083,38 @@ public class Eiger extends Panel {
             .addGroup(jPanel9Layout.createSequentialGroup()
                 .addGap(24, 24, 24)
                 .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(labelModeID2b, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(labelModeID1b, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelEnergya4, javax.swing.GroupLayout.Alignment.TRAILING))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(labelID, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(dvpModeID1b, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
+                    .addComponent(dvpModeID2b, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))
+                .addGap(18, 18, 18)
+                .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(labelOffID2a, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelEnergya3, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelOffID1a, javax.swing.GroupLayout.Alignment.TRAILING))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(dvpEnergya3, javax.swing.GroupLayout.DEFAULT_SIZE, 92, Short.MAX_VALUE)
                     .addGroup(jPanel9Layout.createSequentialGroup()
-                        .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
-                            .addComponent(labelModeID2b, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                            .addComponent(labelModeID1b, javax.swing.GroupLayout.Alignment.LEADING))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(dvpModeID1b, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
-                            .addComponent(dvpModeID2b, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))
-                        .addGap(18, 18, 18)
-                        .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(labelOffID1a)
-                            .addComponent(labelOffID2a))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(dvpOffID2b, javax.swing.GroupLayout.PREFERRED_SIZE, 60, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(dvpOffID1b, javax.swing.GroupLayout.PREFERRED_SIZE, 62, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                    .addGroup(jPanel9Layout.createSequentialGroup()
-                        .addComponent(labelEnergya3)
+                            .addComponent(dvpOffID1b, javax.swing.GroupLayout.PREFERRED_SIZE, 62, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addGap(18, 18, 18)
+                        .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(labelOffID2a1, javax.swing.GroupLayout.Alignment.TRAILING)
+                            .addComponent(labelOffID1a1, javax.swing.GroupLayout.Alignment.TRAILING))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(dvpEnergya3, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                        .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(dvpOffID2b1, javax.swing.GroupLayout.PREFERRED_SIZE, 60, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(dvpOffID1b1, javax.swing.GroupLayout.PREFERRED_SIZE, 62, javax.swing.GroupLayout.PREFERRED_SIZE))))
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
-        jPanel9Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {dvpEnergya3, dvpModeID1b, dvpModeID2b, dvpOffID1b, dvpOffID2b});
+        jPanel9Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {dvpEnergya3, dvpModeID1b, dvpModeID2b, dvpOffID1b, dvpOffID1b1, dvpOffID2b, dvpOffID2b1, labelID});
 
         jPanel9Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {labelEnergya3, labelModeID1b, labelModeID2b, labelOffID1a, labelOffID2a});
 
@@ -1094,6 +1123,8 @@ public class Eiger extends Panel {
             .addGroup(jPanel9Layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                    .addComponent(labelEnergya4)
+                    .addComponent(labelID)
                     .addComponent(labelEnergya3)
                     .addComponent(dvpEnergya3, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -1101,17 +1132,21 @@ public class Eiger extends Panel {
                     .addComponent(labelModeID1b)
                     .addComponent(dvpModeID1b, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(labelOffID1a)
-                    .addComponent(dvpOffID1b, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(dvpOffID1b, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(labelOffID1a1)
+                    .addComponent(dvpOffID1b1, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(labelModeID2b)
                     .addComponent(dvpModeID2b, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(labelOffID2a)
-                    .addComponent(dvpOffID2b, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(dvpOffID2b, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(labelOffID2a1)
+                    .addComponent(dvpOffID2b1, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap())
         );
 
-        jPanel9Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {dvpEnergya3, dvpModeID1b, dvpModeID2b, dvpOffID1b, dvpOffID2b});
+        jPanel9Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {dvpEnergya3, dvpModeID1b, dvpModeID2b, dvpOffID1b, dvpOffID1b1, dvpOffID2b, dvpOffID2b1, labelID});
 
         javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
         jPanel2.setLayout(jPanel2Layout);
@@ -1134,13 +1169,13 @@ public class Eiger extends Panel {
             .addGroup(jPanel2Layout.createSequentialGroup()
                 .addContainerGap()
                 .addComponent(panelImgControls, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addGap(18, 31, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addComponent(jPanel9, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, 32, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(buttonImgStart)
                     .addComponent(buttonImgAbort))
-                .addContainerGap(55, Short.MAX_VALUE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
         jTabbedPane1.addTab("2-Images", jPanel2);
@@ -1191,6 +1226,7 @@ public class Eiger extends Panel {
                 return types [columnIndex];
             }
         });
+        tableRegions.setPreferredSize(new java.awt.Dimension(150, 0));
         jScrollPane2.setViewportView(tableRegions);
 
         buttonAdd.setText("Add");
@@ -1259,7 +1295,7 @@ public class Eiger extends Panel {
                         .addComponent(buttonAdd)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(buttonRemove)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addGap(18, 18, Short.MAX_VALUE)
                         .addComponent(buttonClear)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(buttonOpen)
@@ -1281,15 +1317,19 @@ public class Eiger extends Panel {
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(panelSpectrumLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(checkSpecSwitchPol)
-                    .addComponent(checkSpecWithI0)
-                    .addComponent(checkSpecSaveImages)
-                    .addComponent(checkSpecSaveSpectrum)
                     .addComponent(spinnerSpecScans, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(spinnerSpecExp, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(spinnerSpecAvg, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 21, Short.MAX_VALUE)
+                    .addComponent(spinnerSpecAvg, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(spinnerSpecExp, 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)
                 .addComponent(jPanel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(27, Short.MAX_VALUE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+            .addGroup(panelSpectrumLayout.createSequentialGroup()
+                .addGap(99, 99, 99)
+                .addGroup(panelSpectrumLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(checkSpecSaveSpectrum)
+                    .addComponent(checkSpecSaveImages)
+                    .addComponent(checkSpecWithI0))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
         panelSpectrumLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerSpecAvg, spinnerSpecExp, spinnerSpecScans});
@@ -1297,8 +1337,8 @@ public class Eiger extends Panel {
         panelSpectrumLayout.setVerticalGroup(
             panelSpectrumLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(panelSpectrumLayout.createSequentialGroup()
-                .addContainerGap()
-                .addGroup(panelSpectrumLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                .addGap(0, 0, 0)
+                .addGroup(panelSpectrumLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(jPanel4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addGroup(panelSpectrumLayout.createSequentialGroup()
                         .addComponent(checkSpecSaveSpectrum)
@@ -1306,22 +1346,20 @@ public class Eiger extends Panel {
                         .addComponent(checkSpecSaveImages)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(checkSpecWithI0)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                         .addGroup(panelSpectrumLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                             .addComponent(jLabel23)
                             .addComponent(spinnerSpecExp, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(panelSpectrumLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                             .addComponent(jLabel24)
                             .addComponent(spinnerSpecAvg, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(panelSpectrumLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                             .addComponent(jLabel25)
                             .addComponent(spinnerSpecScans, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                        .addGap(59, 59, 59)
-                        .addComponent(checkSpecSwitchPol)
-                        .addGap(0, 0, Short.MAX_VALUE)))
-                .addContainerGap())
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(checkSpecSwitchPol))))
         );
 
         buttonSpecStart.setText("Start");
@@ -1361,6 +1399,20 @@ public class Eiger extends Panel {
         labelModeID2a.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
         labelModeID2a.setText("Mode ID2:");
 
+        labelEnergya5.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+        labelEnergya5.setText("ID:");
+
+        labelID1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+        labelID1.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
+
+        labelOffID1a2.setText("Gap ID1:");
+
+        dvpOffID1b2.setDeviceName("id1_gap");
+
+        dvpOffID2b2.setDeviceName("id2_gap");
+
+        labelOffID2a2.setText("Gap ID2:");
+
         javax.swing.GroupLayout jPanel6Layout = new javax.swing.GroupLayout(jPanel6);
         jPanel6.setLayout(jPanel6Layout);
         jPanel6Layout.setHorizontalGroup(
@@ -1368,30 +1420,38 @@ public class Eiger extends Panel {
             .addGroup(jPanel6Layout.createSequentialGroup()
                 .addGap(24, 24, 24)
                 .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(labelEnergya5, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelModeID1a, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelModeID2a, javax.swing.GroupLayout.Alignment.TRAILING))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                    .addComponent(labelID1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(dvpModeID1a, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
+                    .addComponent(dvpModeID2a, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))
+                .addGap(18, 18, 18)
+                .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(labelOffID2b, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelOffID1b, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelEnergya, javax.swing.GroupLayout.Alignment.TRAILING))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(dvpEnergya, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addGroup(jPanel6Layout.createSequentialGroup()
-                        .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                            .addComponent(labelModeID2a, javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(labelModeID1a, javax.swing.GroupLayout.Alignment.LEADING))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(dvpModeID1a, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
-                            .addComponent(dvpModeID2a, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))
-                        .addGap(18, 18, 18)
-                        .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(labelOffID1b)
-                            .addComponent(labelOffID2b))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(dvpOffID2a, javax.swing.GroupLayout.PREFERRED_SIZE, 60, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(dvpOffID1a, javax.swing.GroupLayout.PREFERRED_SIZE, 62, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                    .addGroup(jPanel6Layout.createSequentialGroup()
-                        .addComponent(labelEnergya)
+                            .addComponent(dvpOffID1a, javax.swing.GroupLayout.PREFERRED_SIZE, 62, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addGap(18, 18, 18)
+                        .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(labelOffID2a2, javax.swing.GroupLayout.Alignment.TRAILING)
+                            .addComponent(labelOffID1a2, javax.swing.GroupLayout.Alignment.TRAILING))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(dvpEnergya, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE)))
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                        .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(dvpOffID2b2, javax.swing.GroupLayout.PREFERRED_SIZE, 60, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(dvpOffID1b2, javax.swing.GroupLayout.PREFERRED_SIZE, 62, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                .addContainerGap(114, Short.MAX_VALUE))
         );
 
-        jPanel6Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {dvpEnergya, dvpModeID1a, dvpModeID2a, dvpOffID1a, dvpOffID2a});
+        jPanel6Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {dvpEnergya, dvpModeID1a, dvpModeID2a, dvpOffID1a, dvpOffID1b2, dvpOffID2a, dvpOffID2b2, labelID1});
 
         jPanel6Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {labelEnergya, labelModeID1a, labelModeID2a, labelOffID1b, labelOffID2b});
 
@@ -1400,24 +1460,30 @@ public class Eiger extends Panel {
             .addGroup(jPanel6Layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                    .addComponent(labelEnergya5)
+                    .addComponent(labelID1)
                     .addComponent(labelEnergya)
                     .addComponent(dvpEnergya, javax.swing.GroupLayout.PREFERRED_SIZE, 17, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                    .addComponent(labelModeID1a)
-                    .addComponent(dvpModeID1a, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(dvpOffID1b2, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(labelOffID1a2)
+                    .addComponent(dvpOffID1a, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(labelOffID1b)
-                    .addComponent(dvpOffID1a, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(dvpModeID1a, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(labelModeID1a))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(labelModeID2a)
                     .addComponent(dvpModeID2a, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(labelOffID2b)
-                    .addComponent(dvpOffID2a, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(dvpOffID2a, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(labelOffID2a2)
+                    .addComponent(dvpOffID2b2, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap())
         );
 
-        jPanel6Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {dvpEnergya, dvpModeID1a, dvpModeID2a, dvpOffID1a, dvpOffID2a});
+        jPanel6Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {dvpEnergya, dvpModeID1a, dvpModeID2a, dvpOffID1a, dvpOffID1b2, dvpOffID2a, dvpOffID2b2, labelID1});
 
         jPanel6Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {labelEnergya, labelModeID1a, labelModeID2a, labelOffID1b, labelOffID2b});
 
@@ -1442,9 +1508,9 @@ public class Eiger extends Panel {
             .addGroup(jPanel3Layout.createSequentialGroup()
                 .addContainerGap()
                 .addComponent(panelSpectrum, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addComponent(jPanel6, 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)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(buttonSpecStart)
                     .addComponent(buttonSpecAbort))
@@ -1457,7 +1523,7 @@ public class Eiger extends Panel {
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 680, Short.MAX_VALUE)
+            .addComponent(jTabbedPane1)
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1769,30 +1835,20 @@ public class Eiger extends Panel {
     private javax.swing.JComboBox<String> comboImgMethod;
     private javax.swing.JComboBox<String> comboSeq;
     private javax.swing.JComboBox<String> comboSwitch;
-    private ch.psi.pshell.swing.DeviceValuePanel deviceValuePanel10;
-    private ch.psi.pshell.swing.DeviceValuePanel deviceValuePanel11;
-    private ch.psi.pshell.swing.DeviceValuePanel deviceValuePanel6;
-    private ch.psi.pshell.swing.DeviceValuePanel deviceValuePanel7;
     private ch.psi.pshell.swing.DeviceValuePanel dvpEnergya;
-    private ch.psi.pshell.swing.DeviceValuePanel dvpEnergya1;
-    private ch.psi.pshell.swing.DeviceValuePanel dvpEnergya2;
     private ch.psi.pshell.swing.DeviceValuePanel dvpEnergya3;
     private ch.psi.pshell.swing.DeviceValuePanel dvpModeID1a;
-    private ch.psi.pshell.swing.DeviceValuePanel dvpModeID1a1;
-    private ch.psi.pshell.swing.DeviceValuePanel dvpModeID1a2;
     private ch.psi.pshell.swing.DeviceValuePanel dvpModeID1b;
     private ch.psi.pshell.swing.DeviceValuePanel dvpModeID2a;
-    private ch.psi.pshell.swing.DeviceValuePanel dvpModeID2a1;
-    private ch.psi.pshell.swing.DeviceValuePanel dvpModeID2a2;
     private ch.psi.pshell.swing.DeviceValuePanel dvpModeID2b;
     private ch.psi.pshell.swing.DeviceValuePanel dvpOffID1a;
     private ch.psi.pshell.swing.DeviceValuePanel dvpOffID1b;
+    private ch.psi.pshell.swing.DeviceValuePanel dvpOffID1b1;
+    private ch.psi.pshell.swing.DeviceValuePanel dvpOffID1b2;
     private ch.psi.pshell.swing.DeviceValuePanel dvpOffID2a;
     private ch.psi.pshell.swing.DeviceValuePanel dvpOffID2b;
-    private javax.swing.JLabel jLabel10;
-    private javax.swing.JLabel jLabel11;
-    private javax.swing.JLabel jLabel18;
-    private javax.swing.JLabel jLabel19;
+    private ch.psi.pshell.swing.DeviceValuePanel dvpOffID2b1;
+    private ch.psi.pshell.swing.DeviceValuePanel dvpOffID2b2;
     private javax.swing.JLabel jLabel20;
     private javax.swing.JLabel jLabel21;
     private javax.swing.JLabel jLabel23;
@@ -1810,29 +1866,29 @@ public class Eiger extends Panel {
     private javax.swing.JPanel jPanel4;
     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.JScrollPane jScrollPane1;
     private javax.swing.JScrollPane jScrollPane2;
     private javax.swing.JTabbedPane jTabbedPane1;
     private javax.swing.JLabel labelEnergya;
-    private javax.swing.JLabel labelEnergya1;
-    private javax.swing.JLabel labelEnergya2;
     private javax.swing.JLabel labelEnergya3;
+    private javax.swing.JLabel labelEnergya4;
+    private javax.swing.JLabel labelEnergya5;
+    private javax.swing.JLabel labelID;
+    private javax.swing.JLabel labelID1;
     private javax.swing.JLabel labelImgEng1;
     private javax.swing.JLabel labelImgEng2;
     private javax.swing.JLabel labelModeID1a;
-    private javax.swing.JLabel labelModeID1a1;
-    private javax.swing.JLabel labelModeID1a2;
     private javax.swing.JLabel labelModeID1b;
     private javax.swing.JLabel labelModeID2a;
-    private javax.swing.JLabel labelModeID2a1;
-    private javax.swing.JLabel labelModeID2a2;
     private javax.swing.JLabel labelModeID2b;
     private javax.swing.JLabel labelOffID1a;
+    private javax.swing.JLabel labelOffID1a1;
+    private javax.swing.JLabel labelOffID1a2;
     private javax.swing.JLabel labelOffID1b;
     private javax.swing.JLabel labelOffID2a;
+    private javax.swing.JLabel labelOffID2a1;
+    private javax.swing.JLabel labelOffID2a2;
     private javax.swing.JLabel labelOffID2b;
     private javax.swing.JLabel labelSwitching;
     private javax.swing.JLabel labelSwitching1;
diff --git a/script/devices/diag.py b/script/devices/diag.py
index d73e551..624ba40 100644
--- a/script/devices/diag.py
+++ b/script/devices/diag.py
@@ -26,14 +26,14 @@ diag_channels_names = { \
      #"id1 offset": "X11MA-ID1:ENERGY-OFFS", \
      #"id1 alpha": "X11MA-ID1:ALPHA", \
      #"id1 harmonic": "X11MA-ID1:HARMONIC", \
-     "id1 gap": "X11MA-ID1-GAP:READ", \
-     "id1 shift": "X11MA-ID1-SHIFT:READ", \
+     #"id1 gap": "X11MA-ID1-GAP:READ", \
+     #"id1 shift": "X11MA-ID1-SHIFT:READ", \
      #"id2 mode": "X11MA-ID2:MODE", \
      #"id2 offset": "X11MA-ID2:ENERGY-OFFS", \
      #"id2 alpha": "X11MA-ID2:ALPHA", \
      #"id2 harmonic": "X11MA-ID2:HARMONIC", \
-     "id2 gap": "X11MA-ID2-GAP:READ", \
-     "id2 shift": "X11MA-ID2-SHIFT:READ", \
+     #"id2 gap": "X11MA-ID2-GAP:READ", \
+     #"id2 shift": "X11MA-ID2-SHIFT:READ", \
      "keithley 10 IO": "X11Keithley1-read", \
      #"ring current": "ARIDI-PCT:CURRENT", \
      #"PEEM high voltage": "X11MA-ES1-PEEM:UMON", \
@@ -77,10 +77,14 @@ diag_devices = {
      "id1 offset": id1_offset, \
      "id1 alpha": id1_alpha, \
      "id1 harmonic": id1_harmonic, \
+     "id1 gap": id1_gap, \
+     "id1 shift": id1_shift, \
      "id2 mode": id2_mode, \
      "id2 offset": id2_offset, \
      "id2 alpha": id2_alpha, \
      "id2 harmonic": id2_harmonic, \
+     "id2 gap": id2_gap, \
+     "id2 shift": id2_shift, \
      "ring current": machine_cur, \
      "PEEM high voltage": microscope.high_voltage,
     }