diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_beamdestinations.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_beamdestinations.bob
new file mode 100644
index 0000000000000000000000000000000000000000..936aee294a913bbf8dfef94b25f6d8744491878f
--- /dev/null
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_beamdestinations.bob
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>em_beamdestinations</name>
+  <class></class>
+  <width>490</width>
+  <height>20</height>
+  <background_color>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+    </color>
+  </background_color>
+  <widget type="group" version="2.0.0">
+    <name>Group</name>
+    <width>490</width>
+    <height>20</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="label" version="2.0.0">
+      <name>Label_2</name>
+      <text>$(type)</text>
+      <x>150</x>
+      <width>120</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>$(name)</text>
+      <x>30</x>
+      <width>120</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_5</name>
+    <text>$(fmax)</text>
+    <x>430</x>
+    <width>60</width>
+    <background_color>
+      <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+      </color>
+    </background_color>
+    <transparent>false</transparent>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <rules>
+      <rule name="readiness" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pv0&gt;$(fmax)">
+          <value>
+            <color name="MAJOR" red="255" green="0" blue="0">
+            </color>
+          </value>
+        </exp>
+        <pv_name>$(PV_beamfrequency)</pv_name>
+      </rule>
+    </rules>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_195</name>
+    <pv_name>=0</pv_name>
+    <on_color>
+      <color name="RED" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+    <rules>
+      <rule name="Imax" prop_id="pv_name" out_exp="false">
+        <exp bool_exp="pv0&gt;$(Imax)">
+          <value>=1</value>
+        </exp>
+        <exp bool_exp="pv1&gt;$(fmax)">
+          <value>=1</value>
+        </exp>
+        <exp bool_exp="pv2&gt;$(Tmax)">
+          <value>=1</value>
+        </exp>
+        <pv_name>$(PV_beamcurrent)</pv_name>
+        <pv_name>$(PV_beamfrequency)</pv_name>
+        <pv_name>$(PV_beampulselength)</pv_name>
+      </rule>
+    </rules>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_7</name>
+    <text>$(Imax)</text>
+    <x>270</x>
+    <width>60</width>
+    <background_color>
+      <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+      </color>
+    </background_color>
+    <transparent>false</transparent>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <rules>
+      <rule name="readiness" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pv0&gt;$(Imax)">
+          <value>
+            <color name="MAJOR" red="255" green="0" blue="0">
+            </color>
+          </value>
+        </exp>
+        <pv_name>$(PV_beamcurrent)</pv_name>
+      </rule>
+    </rules>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_8</name>
+    <text>$(Tmax)</text>
+    <x>350</x>
+    <width>60</width>
+    <background_color>
+      <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+      </color>
+    </background_color>
+    <transparent>false</transparent>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <rules>
+      <rule name="readiness" prop_id="background_color" out_exp="false">
+        <exp bool_exp="pv0&gt;$(Tmax)">
+          <value>
+            <color name="MAJOR" red="255" green="0" blue="0">
+            </color>
+          </value>
+        </exp>
+        <pv_name>$(PV_beampulselength)</pv_name>
+      </rule>
+    </rules>
+  </widget>
+</display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_beammodes.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_beammodes.bob
index 019274c53f70ea7d9b35c394d8369faac0f1a6f3..90eae5d647c9ea0f9f80d4ff37d46149e0d9a6b4 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_beammodes.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_beammodes.bob
@@ -2,7 +2,7 @@
 <display version="2.0.0">
   <name>em_beammodes</name>
   <class></class>
-  <width>390</width>
+  <width>370</width>
   <height>20</height>
   <background_color>
     <color name="Transparent" red="255" green="255" blue="255" alpha="0">
@@ -10,10 +10,34 @@
   </background_color>
   <widget type="group" version="2.0.0">
     <name>Group</name>
-    <width>390</width>
+    <width>370</width>
     <height>20</height>
     <style>3</style>
     <transparent>true</transparent>
+    <widget type="label" version="2.0.0">
+      <name>Label_5</name>
+      <text>$(fmax)</text>
+      <x>310</x>
+      <width>60</width>
+      <background_color>
+        <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+        </color>
+      </background_color>
+      <transparent>false</transparent>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <rules>
+        <rule name="readiness" prop_id="background_color" out_exp="false">
+          <exp bool_exp="pv0&gt;$(fmax)">
+            <value>
+              <color name="MAJOR" red="255" green="0" blue="0">
+              </color>
+            </value>
+          </exp>
+          <pv_name>$(PV_beamfrequency)</pv_name>
+        </rule>
+      </rules>
+    </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
       <text>$(name)</text>
@@ -24,43 +48,75 @@
     </widget>
     <widget type="led" version="2.0.0">
       <name>LED_194</name>
-      <pv_name>vagrant:interlock_01</pv_name>
+      <pv_name>=0</pv_name>
       <on_color>
         <color name="RED" red="252" green="13" blue="27">
         </color>
       </on_color>
+      <rules>
+        <rule name="Imax" prop_id="pv_name" out_exp="false">
+          <exp bool_exp="pv0&gt;$(Imax)">
+            <value>=1</value>
+          </exp>
+          <exp bool_exp="pv1&gt;$(fmax)">
+            <value>=1</value>
+          </exp>
+          <exp bool_exp="pv2&gt;$(Tmax)">
+            <value>=1</value>
+          </exp>
+          <pv_name>$(PV_beamcurrent)</pv_name>
+          <pv_name>$(PV_beamfrequency)</pv_name>
+          <pv_name>$(PV_beampulselength)</pv_name>
+        </rule>
+      </rules>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label_1</name>
       <text>$(Imax)</text>
       <x>150</x>
       <width>60</width>
+      <background_color>
+        <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+        </color>
+      </background_color>
+      <transparent>false</transparent>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
+      <rules>
+        <rule name="readiness" prop_id="background_color" out_exp="false">
+          <exp bool_exp="pv0&gt;$(Imax)">
+            <value>
+              <color name="MAJOR" red="255" green="0" blue="0">
+              </color>
+            </value>
+          </exp>
+          <pv_name>$(PV_beamcurrent)</pv_name>
+        </rule>
+      </rules>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_3</name>
+      <name>Label_2</name>
       <text>$(Tmax)</text>
-      <x>270</x>
-      <width>60</width>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_5</name>
-      <text>$(Iave)</text>
-      <x>210</x>
-      <width>60</width>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_4</name>
-      <text>$(fmax)</text>
-      <x>320</x>
+      <x>230</x>
       <width>60</width>
+      <background_color>
+        <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+        </color>
+      </background_color>
+      <transparent>false</transparent>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
+      <rules>
+        <rule name="readiness" prop_id="background_color" out_exp="false">
+          <exp bool_exp="pv0&gt;$(Tmax)">
+            <value>
+              <color name="MAJOR" red="255" green="0" blue="0">
+              </color>
+            </value>
+          </exp>
+          <pv_name>$(PV_beampulselength)</pv_name>
+        </rule>
+      </rules>
     </widget>
   </widget>
 </display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_beamsettings.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_beamsettings.bob
index 4ae382614a3439b631e19bfbcbfef47dea1797f1..7d968dee1d6c5c3d8429610b00554b94732fe51f 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_beamsettings.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_beamsettings.bob
@@ -9,6 +9,9 @@
     <ISRC_REP_01>ISrc-010:PwrC-RepPS-01</ISRC_REP_01>
     <ISRC_TRON_01>ISrc-010:ISS-Magtr</ISRC_TRON_01>
     <LEBT_REP_01>LEBT-010:PwrC-RepPS-01</LEBT_REP_01>
+    <PV_beamcurrent>loc://PV_beamcurrent</PV_beamcurrent>
+    <PV_beamfrequency>loc://PV_beamfrequency</PV_beamfrequency>
+    <PV_beampulselength>loc://PV_beampulselength</PV_beampulselength>
     <RR_MagsFile>./EmbedddedWindows/em_mag_rr.bob</RR_MagsFile>
     <RR_MagsFileV>./EmbedddedWindows/em_magV_rr.bob</RR_MagsFileV>
     <RW_ChopFile>./EmbedddedWindows/em_chopper_rw.bob</RW_ChopFile>
@@ -380,13 +383,13 @@
     <name>ModeGroup</name>
     <x>1560</x>
     <y>150</y>
-    <width>430</width>
+    <width>410</width>
     <height>450</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>MGGrey03-background_16</name>
-      <width>430</width>
+      <width>410</width>
       <height>450</height>
       <line_width>2</line_width>
       <line_color>
@@ -403,7 +406,7 @@
     <widget type="label" version="2.0.0">
       <name>MGGrey03-title_16</name>
       <text>Beam Modes</text>
-      <width>430</width>
+      <width>410</width>
       <height>50</height>
       <font>
         <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
@@ -426,36 +429,43 @@
     <widget type="label" version="2.0.0">
       <name>Label_1</name>
       <text>Name</text>
-      <x>80</x>
+      <x>70</x>
       <y>50</y>
       <width>80</width>
+      <horizontal_alignment>1</horizontal_alignment>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label_2</name>
       <text>I [mA]</text>
-      <x>180</x>
+      <x>170</x>
       <y>50</y>
       <width>60</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
       <tooltip>Maximum current for the mode</tooltip>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label_3</name>
       <text>T [µs]</text>
-      <x>300</x>
+      <x>250</x>
       <y>50</y>
       <width>60</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
       <tooltip>Maximum current for the mode</tooltip>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label_4</name>
       <text>f [Hz]</text>
-      <x>360</x>
+      <x>330</x>
       <y>50</y>
       <width>60</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
       <tooltip>Maximum current for the mode</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_13</name>
+      <name>beammode11</name>
       <file>EmbedddedWindows/em_beammodes.bob</file>
       <macros>
         <Imax>TBD</Imax>
@@ -466,12 +476,12 @@
       </macros>
       <x>20</x>
       <y>375</y>
-      <width>390</width>
+      <width>370</width>
       <height>20</height>
       <tooltip>Shielding Verification. </tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_12</name>
+      <name>beammode10</name>
       <file>EmbedddedWindows/em_beammodes.bob</file>
       <macros>
         <Imax>2.86</Imax>
@@ -482,14 +492,14 @@
       </macros>
       <x>20</x>
       <y>345</y>
-      <width>390</width>
+      <width>370</width>
       <height>20</height>
       <tooltip>Used when machine reasonably tuned to dump/target.
 Used to tune RF FFwd (1/30 Hz).
 Can be used to monitor stability between long pulses (1 Hz).</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_11</name>
+      <name>beammode09</name>
       <file>EmbedddedWindows/em_beammodes.bob</file>
       <macros>
         <Imax>62.5</Imax>
@@ -500,13 +510,13 @@ Can be used to monitor stability between long pulses (1 Hz).</tooltip>
       </macros>
       <x>20</x>
       <y>315</y>
-      <width>390</width>
+      <width>370</width>
       <height>20</height>
       <tooltip>Largest charge peer puls that allow operation of invasive PBI devices.
 Long pulses. Used to perform more precise single-pulse measurements.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_10</name>
+      <name>beammode05</name>
       <file>EmbedddedWindows/em_beammodes.bob</file>
       <macros>
         <Imax>6</Imax>
@@ -517,12 +527,12 @@ Long pulses. Used to perform more precise single-pulse measurements.</tooltip>
       </macros>
       <x>20</x>
       <y>195</y>
-      <width>390</width>
+      <width>370</width>
       <height>20</height>
       <tooltip>Used to perform an initial RF test with a longer pulse.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_9</name>
+      <name>beammode06</name>
       <file>EmbedddedWindows/em_beammodes.bob</file>
       <macros>
         <Imax>6</Imax>
@@ -533,12 +543,12 @@ Long pulses. Used to perform more precise single-pulse measurements.</tooltip>
       </macros>
       <x>20</x>
       <y>225</y>
-      <width>390</width>
+      <width>370</width>
       <height>20</height>
       <tooltip>Stability Test: Used mostly for beam stability tests.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_8</name>
+      <name>beammode07</name>
       <file>EmbedddedWindows/em_beammodes.bob</file>
       <macros>
         <Imax>62.5</Imax>
@@ -549,13 +559,13 @@ Long pulses. Used to perform more precise single-pulse measurements.</tooltip>
       </macros>
       <x>20</x>
       <y>255</y>
-      <width>390</width>
+      <width>370</width>
       <height>20</height>
       <tooltip>Slow Commissioning: Very long pulse.
 Allows installation of the SCL in parallel to Beam Commissioning of the NCL.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_7</name>
+      <name>beammode08</name>
       <file>EmbedddedWindows/em_beammodes.bob</file>
       <macros>
         <Imax>62.5</Imax>
@@ -566,14 +576,14 @@ Allows installation of the SCL in parallel to Beam Commissioning of the NCL.</to
       </macros>
       <x>20</x>
       <y>285</y>
-      <width>390</width>
+      <width>370</width>
       <height>20</height>
       <tooltip>Limited beam loading.
 Used for scans to rapidly determin/verify RF setpoints
 and measure beam profiles with wire scanners.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_6</name>
+      <name>beammode03</name>
       <file>EmbedddedWindows/em_beammodes.bob</file>
       <macros>
         <Imax>6</Imax>
@@ -584,14 +594,14 @@ and measure beam profiles with wire scanners.</tooltip>
       </macros>
       <x>20</x>
       <y>135</y>
-      <width>390</width>
+      <width>370</width>
       <height>20</height>
       <tooltip>First beam through a particular section.
 Non-damaging even in the case of total beam loss (even repeated).
 Used to verify machine configuration.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_5</name>
+      <name>beammode04</name>
       <file>EmbedddedWindows/em_beammodes.bob</file>
       <macros>
         <Imax>6</Imax>
@@ -602,13 +612,13 @@ Used to verify machine configuration.</tooltip>
       </macros>
       <x>20</x>
       <y>165</y>
-      <width>390</width>
+      <width>370</width>
       <height>20</height>
       <tooltip>Limited beam loading. 
 Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_3</name>
+      <name>beammode02</name>
       <file>EmbedddedWindows/em_beammodes.bob</file>
       <macros>
         <Imax>0</Imax>
@@ -619,12 +629,12 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
       </macros>
       <x>20</x>
       <y>105</y>
-      <width>390</width>
+      <width>370</width>
       <height>20</height>
       <tooltip>Plasma production, magnetron allowed but no extraction HV</tooltip>
     </widget>
     <widget type="embedded" version="2.0.0">
-      <name>beammode1</name>
+      <name>beammode01</name>
       <file>EmbedddedWindows/em_beammodes.bob</file>
       <macros>
         <Imax>0</Imax>
@@ -636,20 +646,12 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
       </macros>
       <x>20</x>
       <y>75</y>
-      <width>390</width>
+      <width>370</width>
       <height>20</height>
       <tooltip>No Beam</tooltip>
     </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_9</name>
-      <text>I_AV</text>
-      <x>240</x>
-      <y>50</y>
-      <width>50</width>
-      <tooltip>Maximum current for the mode</tooltip>
-    </widget>
     <widget type="embedded" version="2.0.0">
-      <name>Embedded Display_14</name>
+      <name>beammode12</name>
       <file>EmbedddedWindows/em_beammodes.bob</file>
       <macros>
         <Imax>62.5</Imax>
@@ -660,23 +662,23 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
       </macros>
       <x>20</x>
       <y>405</y>
-      <width>390</width>
+      <width>370</width>
       <height>20</height>
       <tooltip>Normal mode for NSS experiments during operation.</tooltip>
     </widget>
   </widget>
   <widget type="group" version="2.0.0">
     <name>Destination</name>
-    <x>2010</x>
-    <y>20</y>
-    <width>380</width>
-    <height>210</height>
+    <x>1520</x>
+    <y>620</y>
+    <width>530</width>
+    <height>330</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>MGGrey03-background_15</name>
-      <width>380</width>
-      <height>210</height>
+      <width>530</width>
+      <height>330</height>
       <line_width>2</line_width>
       <line_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -691,8 +693,8 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     </widget>
     <widget type="label" version="2.0.0">
       <name>MGGrey03-title_15</name>
-      <text>Beam Destination</text>
-      <width>380</width>
+      <text>Beam Destination Modes</text>
+      <width>530</width>
       <height>50</height>
       <font>
         <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
@@ -705,18 +707,207 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_8</name>
+      <text>OK?</text>
+      <x>20</x>
+      <y>50</y>
+      <width>40</width>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_9</name>
+      <text>Name</text>
+      <x>70</x>
+      <y>50</y>
+      <width>80</width>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_11</name>
+      <text>I [mA]</text>
+      <x>290</x>
+      <y>50</y>
+      <width>60</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Maximum current for the mode</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_12</name>
+      <text>T [µs]</text>
+      <x>370</x>
+      <y>50</y>
+      <width>60</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Maximum current for the mode</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_13</name>
+      <text>f [Hz]</text>
+      <x>450</x>
+      <y>50</y>
+      <width>60</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Maximum current for the mode</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_14</name>
+      <text>Type</text>
+      <x>190</x>
+      <y>50</y>
+      <width>80</width>
+      <horizontal_alignment>1</horizontal_alignment>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>destinationmode01</name>
+      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <macros>
+        <Imax>0</Imax>
+        <Tmax>0</Tmax>
+        <fmax>0</fmax>
+        <name>ISrc</name>
+        <status>=0</status>
+        <type>Virtual</type>
+      </macros>
+      <x>20</x>
+      <y>80</y>
+      <width>490</width>
+      <height>20</height>
+      <tooltip>Virtual Destination for Plasma Conditioning</tooltip>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>destinationmode02</name>
+      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <macros>
+        <Imax>62.5</Imax>
+        <Tmax>2860</Tmax>
+        <fmax>14</fmax>
+        <name>LEBT</name>
+        <status>=0</status>
+        <type>Faraday Cup</type>
+      </macros>
+      <x>20</x>
+      <y>110</y>
+      <width>490</width>
+      <height>20</height>
+      <tooltip>Virtual Destination for Plasma Conditioning</tooltip>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>destinationmode03a</name>
+      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <macros>
+        <Imax>62.5</Imax>
+        <Tmax>50</Tmax>
+        <fmax>1</fmax>
+        <name>MEBT (slow)</name>
+        <status>=0</status>
+        <type>Faraday Cup</type>
+      </macros>
+      <x>20</x>
+      <y>140</y>
+      <width>490</width>
+      <height>20</height>
+      <tooltip>Virtual Destination for Plasma Conditioning</tooltip>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>destinationmode03b</name>
+      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <macros>
+        <Imax>62.5</Imax>
+        <Tmax>5</Tmax>
+        <fmax>14</fmax>
+        <name>MEBT (fast)</name>
+        <status>=0</status>
+        <type>Faraday Cup</type>
+      </macros>
+      <x>20</x>
+      <y>170</y>
+      <width>490</width>
+      <height>20</height>
+      <tooltip>Virtual Destination for Plasma Conditioning</tooltip>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>destinationmode04a</name>
+      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <macros>
+        <Imax>62.5</Imax>
+        <Tmax>50</Tmax>
+        <fmax>1</fmax>
+        <name>DTL2 (slow)</name>
+        <status>=0</status>
+        <type>Faraday Cup</type>
+      </macros>
+      <x>20</x>
+      <y>200</y>
+      <width>490</width>
+      <height>20</height>
+      <tooltip>Virtual Destination for Plasma Conditioning</tooltip>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>destinationmode04b</name>
+      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <macros>
+        <Imax>62.5</Imax>
+        <Tmax>5</Tmax>
+        <fmax>14</fmax>
+        <name>DTL2 (fast)</name>
+        <status>=0</status>
+        <type>Faraday Cup</type>
+      </macros>
+      <x>20</x>
+      <y>230</y>
+      <width>490</width>
+      <height>20</height>
+      <tooltip>Virtual Destination for Plasma Conditioning</tooltip>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>destinationmode05a</name>
+      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <macros>
+        <Imax>62.5</Imax>
+        <Tmax>50</Tmax>
+        <fmax>1</fmax>
+        <name>DTL4 (slow)</name>
+        <status>=0</status>
+        <type>Faraday Cup</type>
+      </macros>
+      <x>20</x>
+      <y>260</y>
+      <width>490</width>
+      <height>20</height>
+      <tooltip>Virtual Destination for Plasma Conditioning</tooltip>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>destinationmode05b</name>
+      <file>EmbedddedWindows/em_beamdestinations.bob</file>
+      <macros>
+        <Imax>62.5</Imax>
+        <Tmax>5</Tmax>
+        <fmax>14</fmax>
+        <name>DTL4 (fast)</name>
+        <status>=0</status>
+        <type>Faraday Cup</type>
+      </macros>
+      <x>20</x>
+      <y>290</y>
+      <width>490</width>
+      <height>20</height>
+      <tooltip>Virtual Destination for Plasma Conditioning</tooltip>
+    </widget>
   </widget>
   <widget type="group" version="2.0.0">
     <name>MatchingGroup_1</name>
-    <x>2010</x>
-    <y>250</y>
-    <width>380</width>
+    <x>1990</x>
+    <y>20</y>
+    <width>400</width>
     <height>350</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>MGGrey03-background_17</name>
-      <width>380</width>
+      <width>400</width>
       <height>350</height>
       <line_width>2</line_width>
       <line_color>
@@ -733,7 +924,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     <widget type="label" version="2.0.0">
       <name>MGGrey03-title_17</name>
       <text>Matching</text>
-      <width>380</width>
+      <width>400</width>
       <height>50</height>
       <font>
         <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
@@ -833,13 +1024,13 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     <name>BeamInfo</name>
     <x>1560</x>
     <y>20</y>
-    <width>430</width>
+    <width>410</width>
     <height>110</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>MGGrey03-background_20</name>
-      <width>430</width>
+      <width>410</width>
       <height>110</height>
       <line_width>2</line_width>
       <line_color>
@@ -856,7 +1047,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     <widget type="label" version="2.0.0">
       <name>MGGrey03-title_19</name>
       <text>Beam Information</text>
-      <width>430</width>
+      <width>410</width>
       <height>50</height>
       <font>
         <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
@@ -869,65 +1060,26 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_6</name>
-      <text>f [Hz]</text>
-      <x>360</x>
-      <y>50</y>
-      <width>60</width>
-      <tooltip>Maximum current for the mode</tooltip>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_7</name>
-      <text>T [µs]</text>
-      <x>300</x>
-      <y>50</y>
-      <width>60</width>
-      <tooltip>Maximum current for the mode</tooltip>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_8</name>
-      <text>I [mA]</text>
-      <x>180</x>
-      <y>50</y>
-      <width>60</width>
-      <tooltip>Maximum current for the mode</tooltip>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_5</name>
-      <text>I_AV [mA]</text>
-      <x>240</x>
-      <y>50</y>
-      <width>60</width>
-      <tooltip>Maximum current for the mode</tooltip>
-    </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update</name>
-      <pv_name>=0</pv_name>
-      <x>180</x>
+      <pv_name>$(PV_beamcurrent)</pv_name>
+      <x>170</x>
       <y>70</y>
-      <width>50</width>
-    </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>Text Update_1</name>
-      <pv_name>=0</pv_name>
-      <x>240</x>
-      <y>70</y>
-      <width>50</width>
+      <width>60</width>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update_2</name>
-      <pv_name>=5</pv_name>
-      <x>300</x>
+      <pv_name>$(PV_beampulselength)</pv_name>
+      <x>250</x>
       <y>70</y>
-      <width>50</width>
+      <width>60</width>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update_3</name>
-      <pv_name>=14</pv_name>
-      <x>360</x>
+      <pv_name>$(PV_beamfrequency)</pv_name>
+      <x>330</x>
       <y>70</y>
-      <width>50</width>
+      <width>60</width>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label_10</name>
@@ -941,7 +1093,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
       <pv_name>loc://beammode("No Beam")</pv_name>
       <x>20</x>
       <y>70</y>
-      <width>150</width>
+      <width>140</width>
       <height>20</height>
       <items>
         <item>No Beam</item>
@@ -958,6 +1110,36 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
       </items>
       <items_from_pv>false</items_from_pv>
     </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_5</name>
+      <text>f [Hz]</text>
+      <x>330</x>
+      <y>50</y>
+      <width>60</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Maximum current for the mode</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_6</name>
+      <text>T [µs]</text>
+      <x>250</x>
+      <y>50</y>
+      <width>60</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Maximum current for the mode</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_7</name>
+      <text>I [mA]</text>
+      <x>170</x>
+      <y>50</y>
+      <width>60</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Maximum current for the mode</tooltip>
+    </widget>
   </widget>
   <widget type="group" version="2.0.0">
     <name>PhaseGroup</name>
@@ -1000,4 +1182,29 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
       <vertical_alignment>1</vertical_alignment>
     </widget>
   </widget>
+  <widget type="spinner" version="2.0.0">
+    <name>Spinner</name>
+    <pv_name>$(PV_beamcurrent)</pv_name>
+    <x>2010</x>
+    <y>425</y>
+    <width>120</width>
+    <limits_from_pv>false</limits_from_pv>
+  </widget>
+  <widget type="spinner" version="2.0.0">
+    <name>Spinner_1</name>
+    <pv_name>$(PV_beampulselength)</pv_name>
+    <x>2130</x>
+    <y>425</y>
+    <width>120</width>
+    <maximum>5000.0</maximum>
+    <limits_from_pv>false</limits_from_pv>
+  </widget>
+  <widget type="spinner" version="2.0.0">
+    <name>Spinner_2</name>
+    <pv_name>$(PV_beamfrequency)</pv_name>
+    <x>2250</x>
+    <y>425</y>
+    <width>120</width>
+    <limits_from_pv>false</limits_from_pv>
+  </widget>
 </display>