From 7479467dd2dac35e257071cda4b177fbbcf16436 Mon Sep 17 00:00:00 2001
From: benjaminbolling <benjamin.bolling@esss.se>
Date: Tue, 2 Jun 2020 16:07:46 +0200
Subject: [PATCH] Working with ICS graphical designer Dirk Nordt on
 fine-polishing the BCM engineering screens.

---
 10-Top/bcmioc/instance.bob              |  128 +-
 10-Top/bcmioc/top.bob                   |    6 +-
 99-Shared/admisc/NDTrace.bob            |  348 ++-
 99-Shared/adsis8300bcm/acct.bob         | 3537 +++++++++++------------
 99-Shared/adsis8300bcm/bcm.bob          |  996 ++++---
 99-Shared/adsis8300bcm/bcm_instance.bob |   43 +-
 99-Shared/adsis8300bcm/diff_item.bob    |    8 -
 99-Shared/adsis8300bcm/processed.bob    |  522 ++--
 99-Shared/adsis8300bcm/raw.bob          |  166 +-
 99-Shared/adsis8300bcm/trace_item.bob   |   15 +-
 10 files changed, 2999 insertions(+), 2770 deletions(-)

diff --git a/10-Top/bcmioc/instance.bob b/10-Top/bcmioc/instance.bob
index 2f2cd28..f40dab0 100644
--- a/10-Top/bcmioc/instance.bob
+++ b/10-Top/bcmioc/instance.bob
@@ -2,7 +2,7 @@
 <display version="2.0.0">
   <name>BCM IOC systems</name>
   <width>320</width>
-  <height>640</height>
+  <height>680</height>
   <background_color>
     <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
@@ -12,7 +12,7 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-titlebar_3</name>
     <width>320</width>
-    <height>640</height>
+    <height>680</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -21,12 +21,26 @@
     <corner_width>10</corner_width>
     <corner_height>10</corner_height>
   </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_10</name>
+    <x>20</x>
+    <y>140</y>
+    <width>280</width>
+    <height>520</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_9</name>
     <x>20</x>
     <y>50</y>
     <width>280</width>
-    <height>570</height>
+    <height>70</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -67,16 +81,8 @@
     </actions>
     <text>$(SYSTEM10)</text>
     <x>40</x>
-    <y>570</y>
+    <y>610</y>
     <width>240</width>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -94,16 +100,8 @@
     </actions>
     <text>$(SYSTEM9)</text>
     <x>40</x>
-    <y>520</y>
+    <y>560</y>
     <width>240</width>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -121,16 +119,8 @@
     </actions>
     <text>$(SYSTEM8)</text>
     <x>40</x>
-    <y>470</y>
+    <y>510</y>
     <width>240</width>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -148,16 +138,8 @@
     </actions>
     <text>$(SYSTEM7)</text>
     <x>40</x>
-    <y>420</y>
+    <y>460</y>
     <width>240</width>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -175,16 +157,8 @@
     </actions>
     <text>$(SYSTEM6)</text>
     <x>40</x>
-    <y>370</y>
+    <y>410</y>
     <width>240</width>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -202,16 +176,8 @@
     </actions>
     <text>$(SYSTEM5)</text>
     <x>40</x>
-    <y>320</y>
+    <y>360</y>
     <width>240</width>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -229,16 +195,8 @@
     </actions>
     <text>$(SYSTEM4)</text>
     <x>40</x>
-    <y>270</y>
+    <y>310</y>
     <width>240</width>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -256,16 +214,8 @@
     </actions>
     <text>$(SYSTEM3)</text>
     <x>40</x>
-    <y>220</y>
+    <y>260</y>
     <width>240</width>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -283,16 +233,8 @@
     </actions>
     <text>$(SYSTEM2)</text>
     <x>40</x>
-    <y>170</y>
+    <y>210</y>
     <width>240</width>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -310,16 +252,8 @@
     </actions>
     <text>$(SYSTEM1)</text>
     <x>40</x>
-    <y>120</y>
+    <y>160</y>
     <width>240</width>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -338,14 +272,6 @@
     <x>40</x>
     <y>70</y>
     <width>240</width>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
 </display>
diff --git a/10-Top/bcmioc/top.bob b/10-Top/bcmioc/top.bob
index 97bd937..a22f622 100644
--- a/10-Top/bcmioc/top.bob
+++ b/10-Top/bcmioc/top.bob
@@ -5,7 +5,7 @@
     <TITLE>BCM IOC</TITLE>
   </macros>
   <width>1070</width>
-  <height>730</height>
+  <height>770</height>
   <background_color>
     <color name="BACKGROUND" red="220" green="225" blue="221">
     </color>
@@ -103,7 +103,7 @@
     <x>20</x>
     <y>70</y>
     <width>320</width>
-    <height>640</height>
+    <height>680</height>
     <actions>
     </actions>
     <border_color>
@@ -132,7 +132,7 @@
     <x>360</x>
     <y>70</y>
     <width>320</width>
-    <height>640</height>
+    <height>680</height>
     <actions>
     </actions>
     <border_color>
diff --git a/99-Shared/admisc/NDTrace.bob b/99-Shared/admisc/NDTrace.bob
index 5030c8d..00c3d6d 100644
--- a/99-Shared/admisc/NDTrace.bob
+++ b/99-Shared/admisc/NDTrace.bob
@@ -4,34 +4,56 @@
   <x>470</x>
   <y>197</y>
   <width>1550</width>
-  <background_color>
-    <color red="187" green="187" blue="187">
-    </color>
-  </background_color>
   <actions>
   </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <y>5</y>
-    <width>390</width>
-    <height>25</height>
+    <name>BGGrey03-titlebar_6</name>
+    <x>420</x>
+    <y>70</y>
+    <width>1180</width>
+    <height>710</height>
     <line_width>0</line_width>
-    <line_color>
-      <color red="128" green="0" blue="255">
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
-    </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_12</name>
+    <x>440</x>
+    <y>690</y>
+    <width>1140</width>
+    <height>67</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1800</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container</name>
     <file>../adcore/NDPluginBase.opi</file>
-    <x>5</x>
-    <y>40</y>
-    <width>383</width>
-    <height>558</height>
+    <x>20</x>
+    <y>70</y>
+    <width>380</width>
+    <height>555</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -40,128 +62,11 @@ $(pv_value)</tooltip>
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>$(P)$(R)</text>
-    <y>6</y>
-    <width>390</width>
-    <height>25</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="14.851485148514852">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>XY Graph</name>
-    <x>398</x>
-    <y>4</y>
-    <width>1105</width>
-    <height>495</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <title_font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-      </font>
-    </title_font>
-    <show_toolbar>true</show_toolbar>
-    <actions>
-    </actions>
-    <rules>
-      <rule name="buffer_size" prop_id="trace_0_buffer_size" out_exp="true">
-        <exp bool_exp="true">
-          <expression>pv0</expression>
-        </exp>
-        <pv_name>$(P)$(R)ArraySize0_RBV</pv_name>
-      </rule>
-      <rule name="data_y_max" prop_id="axis_1_maximum" out_exp="true">
-        <exp bool_exp="true">
-          <expression>pv0</expression>
-        </exp>
-        <pv_name>$(P)$(R)ArraySize1_RBV</pv_name>
-      </rule>
-      <rule name="data_x0_max" prop_id="axis_0_maximum" out_exp="true">
-        <exp bool_exp="true">
-          <expression>pv0</expression>
-        </exp>
-        <pv_name>$(P)$(R)ArraySize0_RBV</pv_name>
-      </rule>
-    </rules>
-    <x_axis>
-      <title>Samples</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>true</show_grid>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>ADC counts</title>
-        <autoscale>true</autoscale>
-        <log_scale>false</log_scale>
-        <minimum>0.0</minimum>
-        <maximum>100.0</maximum>
-        <show_grid>true</show_grid>
-        <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-          </font>
-        </title_font>
-        <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-          </font>
-        </scale_font>
-        <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>$(traces[0].y_pv)</name>
-        <x_pv>$(P)$(R)ArrayTimeUs</x_pv>
-        <y_pv>$(P)$(R)ArrayData</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="21" green="21" blue="196">
-          </color>
-        </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>4</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
-  </widget>
   <widget type="label" version="2.0.0">
     <name>Label_1</name>
     <text>Time link or time/point</text>
-    <x>412</x>
-    <y>510</y>
+    <x>460</x>
+    <y>700</y>
     <width>228</width>
     <font>
       <font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -179,8 +84,8 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)TimePerPointLink.DOL</pv_name>
-    <x>650</x>
-    <y>510</y>
+    <x>698</x>
+    <y>700</y>
     <width>429</width>
     <font>
       <font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -203,8 +108,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_2</name>
     <text>Time/point</text>
-    <x>414</x>
-    <y>537</y>
+    <x>462</x>
+    <y>727</y>
     <width>138</width>
     <font>
       <font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -222,8 +127,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)TimePerPointR</pv_name>
-    <x>651</x>
-    <y>538</y>
+    <x>699</x>
+    <y>728</y>
     <height>18</height>
     <font>
       <font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -250,8 +155,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_1</name>
     <pv_name>$(P)$(R)TimePerPointUsR</pv_name>
-    <x>941</x>
-    <y>538</y>
+    <x>989</x>
+    <y>728</y>
     <height>18</height>
     <font>
       <font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -278,8 +183,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_2</name>
     <pv_name>$(P)$(R)TimePerPointMsR</pv_name>
-    <x>793</x>
-    <y>538</y>
+    <x>841</x>
+    <y>728</y>
     <height>18</height>
     <font>
       <font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -303,4 +208,151 @@ $(pv_value)</tooltip>
       </color>
     </border_color>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>$(P)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1760</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_20</name>
+    <text>ArrayData</text>
+    <x>420</x>
+    <y>70</y>
+    <width>520</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_11</name>
+    <x>440</x>
+    <y>120</y>
+    <width>1140</width>
+    <height>540</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="xyplot" version="2.0.0">
+    <name>XY Graph</name>
+    <x>460</x>
+    <y>140</y>
+    <width>1100</width>
+    <height>500</height>
+    <background_color>
+      <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+      </color>
+    </background_color>
+    <title_font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </title_font>
+    <show_toolbar>true</show_toolbar>
+    <actions>
+    </actions>
+    <rules>
+      <rule name="buffer_size" prop_id="trace_0_buffer_size" out_exp="true">
+        <exp bool_exp="true">
+          <expression>pv0</expression>
+        </exp>
+        <pv_name>$(P)$(R)ArraySize0_RBV</pv_name>
+      </rule>
+      <rule name="data_y_max" prop_id="axis_1_maximum" out_exp="true">
+        <exp bool_exp="true">
+          <expression>pv0</expression>
+        </exp>
+        <pv_name>$(P)$(R)ArraySize1_RBV</pv_name>
+      </rule>
+      <rule name="data_x0_max" prop_id="axis_0_maximum" out_exp="true">
+        <exp bool_exp="true">
+          <expression>pv0</expression>
+        </exp>
+        <pv_name>$(P)$(R)ArraySize0_RBV</pv_name>
+      </rule>
+    </rules>
+    <x_axis>
+      <title>Samples</title>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+      <minimum>0.0</minimum>
+      <maximum>100.0</maximum>
+      <show_grid>true</show_grid>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+        </font>
+      </scale_font>
+      <visible>true</visible>
+    </x_axis>
+    <y_axes>
+      <y_axis>
+        <title>ADC counts</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </y_axis>
+    </y_axes>
+    <traces>
+      <trace>
+        <name>$(traces[0].y_pv)</name>
+        <x_pv>$(P)$(R)ArrayTimeUs</x_pv>
+        <y_pv>$(P)$(R)ArrayData</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="21" green="21" blue="196">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>4</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
+  </widget>
 </display>
diff --git a/99-Shared/adsis8300bcm/acct.bob b/99-Shared/adsis8300bcm/acct.bob
index 021121a..d3e7188 100644
--- a/99-Shared/adsis8300bcm/acct.bob
+++ b/99-Shared/adsis8300bcm/acct.bob
@@ -3,44 +3,16 @@
   <name>$(P) ACCT</name>
   <x>470</x>
   <y>197</y>
-  <width>1240</width>
-  <height>1230</height>
+  <width>1730</width>
+  <height>790</height>
   <actions>
   </actions>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-titlebar_5</name>
-    <x>550</x>
-    <y>70</y>
-    <width>670</width>
-    <height>700</height>
-    <line_width>0</line_width>
-    <background_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
-      </color>
-    </background_color>
-    <corner_width>10</corner_width>
-    <corner_height>10</corner_height>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-background_11</name>
-    <x>570</x>
-    <y>120</y>
-    <width>630</width>
-    <height>630</height>
-    <line_width>0</line_width>
-    <background_color>
-      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-      </color>
-    </background_color>
-    <corner_width>5</corner_width>
-    <corner_height>5</corner_height>
-  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>titleBar</name>
     <class>TITLE-BAR</class>
     <x use_class="true">0</x>
     <y use_class="true">0</y>
-    <width>1240</width>
+    <width>1730</width>
     <height use_class="true">50</height>
     <line_width use_class="true">0</line_width>
     <background_color use_class="true">
@@ -54,7 +26,7 @@
     <text>$(P)</text>
     <x use_class="true">20</x>
     <y use_class="true">0</y>
-    <width>1200</width>
+    <width>1690</width>
     <height use_class="true">50</height>
     <font use_class="true">
       <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -69,1307 +41,18 @@
     <vertical_alignment use_class="true">1</vertical_alignment>
     <wrap_words use_class="true">false</wrap_words>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_326</name>
-    <text>Status</text>
-    <x>760</x>
-    <y>140</y>
-    <width>120</width>
-    <height>30</height>
-    <background_color>
-      <color name="Read_Background" red="230" green="235" blue="232">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_327</name>
-    <text>Upper</text>
-    <x>590</x>
-    <y>180</y>
-    <width>150</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_104</name>
-    <pv_name>$(P)AlarmUpperControlR</pv_name>
-    <x>760</x>
-    <y>180</y>
-    <width>120</width>
-    <height>30</height>
-    <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Menu Button_4</name>
-    <pv_name>$(P)AlarmUpperControl</pv_name>
-    <x>900</x>
-    <y>180</y>
-    <width>120</width>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_328</name>
-    <text>Lower</text>
-    <x>590</x>
-    <y>220</y>
-    <width>150</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_105</name>
-    <pv_name>$(P)AlarmLowerControlR</pv_name>
-    <x>760</x>
-    <y>220</y>
-    <width>120</width>
-    <height>30</height>
-    <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Menu Button_5</name>
-    <pv_name>$(P)AlarmLowerControl</pv_name>
-    <x>900</x>
-    <y>220</y>
-    <width>120</width>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_329</name>
-    <text>Errant beam</text>
-    <x>590</x>
-    <y>260</y>
-    <width>150</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_106</name>
-    <pv_name>$(P)AlarmErrantControlR</pv_name>
-    <x>760</x>
-    <y>260</y>
-    <width>120</width>
-    <height>30</height>
-    <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Menu Button_6</name>
-    <pv_name>$(P)AlarmErrantControl</pv_name>
-    <x>900</x>
-    <y>260</y>
-    <width>120</width>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_330</name>
-    <text>Beam &gt; trigger</text>
-    <x>590</x>
-    <y>300</y>
-    <width>150</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_107</name>
-    <pv_name>$(P)AlarmTriggerControlR</pv_name>
-    <x>760</x>
-    <y>300</y>
-    <width>120</width>
-    <height>30</height>
-    <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Menu Button_7</name>
-    <pv_name>$(P)AlarmTriggerControl</pv_name>
-    <x>900</x>
-    <y>300</y>
-    <width>120</width>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_331</name>
-    <text>Beam &gt; Max pulse length</text>
-    <x>590</x>
-    <y>340</y>
-    <width>150</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_108</name>
-    <pv_name>$(P)AlarmLimitControlR</pv_name>
-    <x>760</x>
-    <y>340</y>
-    <width>120</width>
-    <height>30</height>
-    <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Menu Button_8</name>
-    <pv_name>$(P)AlarmLimitControl</pv_name>
-    <x>900</x>
-    <y>340</y>
-    <width>120</width>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_332</name>
-    <text>Control</text>
-    <x>900</x>
-    <y>140</y>
-    <width>120</width>
-    <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED</name>
-    <pv_name>$(P)AlarmUpperFirstR</pv_name>
-    <x>1045</x>
-    <y>185</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_333</name>
-    <text>First</text>
-    <x>1030</x>
-    <y>140</y>
-    <width>50</width>
-    <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_1</name>
-    <pv_name>$(P)AlarmLowerFirstR</pv_name>
-    <x>1045</x>
-    <y>225</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_2</name>
-    <pv_name>$(P)AlarmErrantFirstR</pv_name>
-    <x>1045</x>
-    <y>265</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_3</name>
-    <pv_name>$(P)AlarmTriggerFirstR</pv_name>
-    <x>1045</x>
-    <y>305</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_4</name>
-    <pv_name>$(P)AlarmLimitFirstR</pv_name>
-    <x>1045</x>
-    <y>345</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_5</name>
-    <pv_name>$(P)AlarmUpperHoldR</pv_name>
-    <x>1095</x>
-    <y>185</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_334</name>
-    <text>Hold</text>
-    <x>1080</x>
-    <y>140</y>
-    <width>50</width>
-    <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_6</name>
-    <pv_name>$(P)AlarmLowerHoldR</pv_name>
-    <x>1095</x>
-    <y>225</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_7</name>
-    <pv_name>$(P)AlarmErrantHoldR</pv_name>
-    <x>1095</x>
-    <y>265</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_8</name>
-    <pv_name>$(P)AlarmTriggerHoldR</pv_name>
-    <x>1095</x>
-    <y>305</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_9</name>
-    <pv_name>$(P)AlarmLimitHoldR</pv_name>
-    <x>1095</x>
-    <y>345</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_10</name>
-    <pv_name>$(P)AlarmUpperDirectR</pv_name>
-    <x>1145</x>
-    <y>185</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_335</name>
-    <text>Direct</text>
-    <x>1130</x>
-    <y>140</y>
-    <width>50</width>
-    <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_11</name>
-    <pv_name>$(P)AlarmLowerDirectR</pv_name>
-    <x>1145</x>
-    <y>225</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_12</name>
-    <pv_name>$(P)AlarmErrantDirectR</pv_name>
-    <x>1145</x>
-    <y>265</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_13</name>
-    <pv_name>$(P)AlarmTriggerDirectR</pv_name>
-    <x>1145</x>
-    <y>305</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_14</name>
-    <pv_name>$(P)AlarmLimitDirectR</pv_name>
-    <x>1145</x>
-    <y>345</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_337</name>
-    <text>ADC overflow</text>
-    <x>590</x>
-    <y>380</y>
-    <width>150</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_109</name>
-    <pv_name>$(P)AlarmAdcOverflowControlR</pv_name>
-    <x>760</x>
-    <y>380</y>
-    <width>120</width>
-    <height>30</height>
-    <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Menu Button_9</name>
-    <pv_name>$(P)AlarmAdcOverflowControl</pv_name>
-    <x>900</x>
-    <y>380</y>
-    <width>120</width>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_15</name>
-    <pv_name>$(P)AlarmAdcOverflowFirstR</pv_name>
-    <x>1045</x>
-    <y>385</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_16</name>
-    <pv_name>$(P)AlarmAdcOverflowHoldR</pv_name>
-    <x>1095</x>
-    <y>385</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_17</name>
-    <pv_name>$(P)AlarmAdcOverflowDirectR</pv_name>
-    <x>1145</x>
-    <y>385</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_338</name>
-    <text>ADC underflow</text>
-    <x>590</x>
-    <y>420</y>
-    <width>150</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_110</name>
-    <pv_name>$(P)AlarmAdcUnderflowControlR</pv_name>
-    <x>760</x>
-    <y>420</y>
-    <width>120</width>
-    <height>30</height>
-    <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Menu Button_10</name>
-    <pv_name>$(P)AlarmAdcUnderflowControl</pv_name>
-    <x>900</x>
-    <y>420</y>
-    <width>120</width>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_18</name>
-    <pv_name>$(P)AlarmAdcUnderflowFirstR</pv_name>
-    <x>1045</x>
-    <y>425</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_19</name>
-    <pv_name>$(P)AlarmAdcUnderflowHoldR</pv_name>
-    <x>1095</x>
-    <y>425</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_20</name>
-    <pv_name>$(P)AlarmAdcUnderflowDirectR</pv_name>
-    <x>1145</x>
-    <y>425</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_339</name>
-    <text>ADC stuck</text>
-    <x>590</x>
-    <y>460</y>
-    <width>150</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_111</name>
-    <pv_name>$(P)AlarmAdcStuckControlR</pv_name>
-    <x>760</x>
-    <y>460</y>
-    <width>120</width>
-    <height>30</height>
-    <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Menu Button_11</name>
-    <pv_name>$(P)AlarmAdcStuckControl</pv_name>
-    <x>900</x>
-    <y>460</y>
-    <width>120</width>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_21</name>
-    <pv_name>$(P)AlarmAdcStuckFirstR</pv_name>
-    <x>1045</x>
-    <y>465</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_22</name>
-    <pv_name>$(P)AlarmAdcStuckHoldR</pv_name>
-    <x>1095</x>
-    <y>465</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_23</name>
-    <pv_name>$(P)AlarmAdcStuckDirectR</pv_name>
-    <x>1145</x>
-    <y>465</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_349</name>
-    <text>-50 mV check</text>
-    <x>590</x>
-    <y>500</y>
-    <width>150</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_118</name>
-    <pv_name>$(P)AlarmAiuFaultControlR</pv_name>
-    <x>760</x>
-    <y>500</y>
-    <width>120</width>
-    <height>30</height>
-    <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Menu Button_14</name>
-    <pv_name>$(P)AlarmAiuFaultControl</pv_name>
-    <x>900</x>
-    <y>500</y>
-    <width>120</width>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_24</name>
-    <pv_name>$(P)AlarmAiuFaultFirstR</pv_name>
-    <x>1045</x>
-    <y>505</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_25</name>
-    <pv_name>$(P)AlarmAiuFaultHoldR</pv_name>
-    <x>1095</x>
-    <y>505</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_26</name>
-    <pv_name>$(P)AlarmAiuFaultDirectR</pv_name>
-    <x>1145</x>
-    <y>505</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_350</name>
-    <text>LI output &gt; threshold</text>
-    <x>590</x>
-    <y>540</y>
-    <width>150</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_119</name>
-    <pv_name>$(P)AlarmChargeTooHighControlR</pv_name>
-    <x>760</x>
-    <y>540</y>
-    <width>120</width>
-    <height>30</height>
-    <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Menu Button_15</name>
-    <pv_name>$(P)AlarmChargeTooHighControl</pv_name>
-    <x>900</x>
-    <y>540</y>
-    <width>120</width>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_27</name>
-    <pv_name>$(P)AlarmChargeTooHighFirstR</pv_name>
-    <x>1045</x>
-    <y>545</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_28</name>
-    <pv_name>$(P)AlarmChargeTooHighHoldR</pv_name>
-    <x>1095</x>
-    <y>545</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_29</name>
-    <pv_name>$(P)AlarmChargeTooHighDirectR</pv_name>
-    <x>1145</x>
-    <y>545</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_351</name>
-    <text>LUT upper threshold</text>
-    <x>590</x>
-    <y>580</y>
-    <width>150</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_30</name>
-    <pv_name>$(P)AlarmLUTUpperThresholdFirstR</pv_name>
-    <x>1045</x>
-    <y>585</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_31</name>
-    <pv_name>$(P)AlarmLUTUpperThresholdHoldR</pv_name>
-    <x>1095</x>
-    <y>585</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_32</name>
-    <pv_name>$(P)AlarmLUTUpperThresholdDirectR</pv_name>
-    <x>1145</x>
-    <y>585</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_352</name>
-    <text>LUT lower threshold</text>
-    <x>590</x>
-    <y>620</y>
-    <width>150</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_33</name>
-    <pv_name>$(P)AlarmLUTLowerThresholdFirstR</pv_name>
-    <x>1045</x>
-    <y>625</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_34</name>
-    <pv_name>$(P)AlarmLUTLowerThresholdHoldR</pv_name>
-    <x>1095</x>
-    <y>625</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_35</name>
-    <pv_name>$(P)AlarmLUTLowerThresholdDirectR</pv_name>
-    <x>1145</x>
-    <y>625</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_353</name>
-    <text>LUT pulse length</text>
-    <x>590</x>
-    <y>660</y>
-    <width>150</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_36</name>
-    <pv_name>$(P)AlarmLUTPulseLengthFirstR</pv_name>
-    <x>1045</x>
-    <y>665</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_37</name>
-    <pv_name>$(P)AlarmLUTPulseLengthHoldR</pv_name>
-    <x>1095</x>
-    <y>665</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_38</name>
-    <pv_name>$(P)AlarmLUTPulseLengthDirectR</pv_name>
-    <x>1145</x>
-    <y>665</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_354</name>
-    <text>LUT beam destination</text>
-    <x>590</x>
-    <y>700</y>
-    <width>150</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_39</name>
-    <pv_name>$(P)AlarmLUTDestinationModeFirstR</pv_name>
-    <x>1045</x>
-    <y>705</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_40</name>
-    <pv_name>$(P)AlarmLUTDestinationModeHoldR</pv_name>
-    <x>1095</x>
-    <y>705</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_41</name>
-    <pv_name>$(P)AlarmLUTDestinationModeDirectR</pv_name>
-    <x>1145</x>
-    <y>705</y>
-    <off_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <actions>
-    </actions>
-  </widget>
   <widget type="group" version="2.0.0">
     <name>ACCTparametersGroup</name>
     <x>20</x>
     <y>70</y>
-    <width>510</width>
-    <height>1140</height>
+    <width>1000</width>
+    <height>700</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>BGGrey03-titlebar_4</name>
-      <width>510</width>
-      <height>1140</height>
+      <width>1000</width>
+      <height>700</height>
       <line_width>0</line_width>
       <background_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -1379,27 +62,548 @@
       <corner_height>10</corner_height>
     </widget>
     <widget type="rectangle" version="2.0.0">
-      <name>BGGrey03-background_10</name>
-      <x>20</x>
+      <name>BGGrey03-background_12</name>
+      <x>510</x>
       <y>50</y>
       <width>470</width>
-      <height>1070</height>
+      <height>580</height>
       <line_width>0</line_width>
       <background_color>
         <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
         </color>
-      </background_color>
-      <corner_width>5</corner_width>
-      <corner_height>5</corner_height>
+      </background_color>
+      <corner_width>5</corner_width>
+      <corner_height>5</corner_height>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey03-background_10</name>
+      <x>20</x>
+      <y>50</y>
+      <width>470</width>
+      <height>630</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_width>5</corner_width>
+      <corner_height>5</corner_height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_340</name>
+      <text>Errant Threshold</text>
+      <x>529</x>
+      <y>570</y>
+      <width>150</width>
+      <height>30</height>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_341</name>
+      <text>Max. pulse length</text>
+      <x>40</x>
+      <y>310</y>
+      <width>150</width>
+      <height>30</height>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_112</name>
+      <pv_name>$(P)MaxPulseLengthR</pv_name>
+      <x>210</x>
+      <y>310</y>
+      <width>120</width>
+      <height>30</height>
+      <format>1</format>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_342</name>
+      <text>Lower win. start</text>
+      <x>40</x>
+      <y>500</y>
+      <width>150</width>
+      <height>30</height>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_113</name>
+      <pv_name>$(P)LowerWindowStartR</pv_name>
+      <x>210</x>
+      <y>500</y>
+      <width>120</width>
+      <height>30</height>
+      <format>1</format>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input_20</name>
+      <pv_name>$(P)LowerWindowStart</pv_name>
+      <x>351</x>
+      <y>500</y>
+      <width>120</width>
+      <height>30</height>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_343</name>
+      <text>Lower win. end</text>
+      <x>40</x>
+      <y>540</y>
+      <width>150</width>
+      <height>30</height>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_114</name>
+      <pv_name>$(P)LowerWindowEndR</pv_name>
+      <x>210</x>
+      <y>540</y>
+      <width>120</width>
+      <height>30</height>
+      <format>1</format>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input_21</name>
+      <pv_name>$(P)LowerWindowEnd</pv_name>
+      <x>351</x>
+      <y>540</y>
+      <width>120</width>
+      <height>30</height>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_344</name>
+      <text>Errant win. start</text>
+      <x>40</x>
+      <y>580</y>
+      <width>150</width>
+      <height>30</height>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_115</name>
+      <pv_name>$(P)ErrantWindowStartR</pv_name>
+      <x>210</x>
+      <y>580</y>
+      <width>120</width>
+      <height>30</height>
+      <format>1</format>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input_22</name>
+      <pv_name>$(P)ErrantWindowStart</pv_name>
+      <x>351</x>
+      <y>580</y>
+      <width>120</width>
+      <height>30</height>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_345</name>
+      <text>Errant win. end</text>
+      <x>40</x>
+      <y>620</y>
+      <width>150</width>
+      <height>30</height>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_116</name>
+      <pv_name>$(P)ErrantWindowEndR</pv_name>
+      <x>210</x>
+      <y>620</y>
+      <width>120</width>
+      <height>30</height>
+      <format>1</format>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input_23</name>
+      <pv_name>$(P)ErrantWindowEnd</pv_name>
+      <x>351</x>
+      <y>620</y>
+      <width>120</width>
+      <height>30</height>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_346</name>
+      <text>DC blocker</text>
+      <x>530</x>
+      <y>310</y>
+      <width>150</width>
+      <height>30</height>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_117</name>
+      <pv_name>$(P)DcBlockingR</pv_name>
+      <x>700</x>
+      <y>310</y>
+      <width>120</width>
+      <height>30</height>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button_12</name>
+      <pv_name>$(P)DcBlocking</pv_name>
+      <x>841</x>
+      <y>310</y>
+      <width>120</width>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input_28</name>
+      <pv_name>$(P)MaxPulseLength</pv_name>
+      <x>351</x>
+      <y>310</y>
+      <width>120</width>
+      <height>30</height>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button</name>
+      <actions>
+        <action type="open_display">
+          <file>lut_mode_acct.opi</file>
+          <target>tab</target>
+        </action>
+      </actions>
+      <text>Beam Mode Configuration</text>
+      <x>510</x>
+      <y>650</y>
+      <width>210</width>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_1</name>
+      <actions>
+        <action type="open_display">
+          <file>lut_dest_acct.opi</file>
+          <target>tab</target>
+        </action>
+      </actions>
+      <text>Beam Destination Configuration</text>
+      <x>740</x>
+      <y>650</y>
+      <width>240</width>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button_13</name>
+      <pv_name>$(P)TriggerSource</pv_name>
+      <x>351</x>
+      <y>80</y>
+      <width>120</width>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_321</name>
+      <text>Baseline correction</text>
+      <x>530</x>
+      <y>270</y>
+      <width>150</width>
+      <height>30</height>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_100</name>
+      <pv_name>$(P)BaseliningAfterR</pv_name>
+      <x>700</x>
+      <y>270</y>
+      <width>120</width>
+      <height>30</height>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button_3</name>
+      <pv_name>$(P)BaseliningAfter</pv_name>
+      <x>841</x>
+      <y>270</y>
+      <width>120</width>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_324</name>
+      <text>Upper Threshold</text>
+      <x>529</x>
+      <y>490</y>
+      <width>150</width>
+      <height>30</height>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_101</name>
+      <pv_name>$(P)UpperThresholdR</pv_name>
+      <x>699</x>
+      <y>490</y>
+      <width>120</width>
+      <height>30</height>
+      <format>1</format>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input_17</name>
+      <pv_name>$(P)UpperThreshold</pv_name>
+      <x>840</x>
+      <y>490</y>
+      <width>120</width>
+      <height>30</height>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_325</name>
+      <text>Lower Threshold</text>
+      <x>529</x>
+      <y>530</y>
+      <width>150</width>
+      <height>30</height>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_102</name>
+      <pv_name>$(P)LowerThresholdR</pv_name>
+      <x>699</x>
+      <y>530</y>
+      <width>120</width>
+      <height>30</height>
+      <format>1</format>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input_18</name>
+      <pv_name>$(P)LowerThreshold</pv_name>
+      <x>840</x>
+      <y>530</y>
+      <width>120</width>
+      <height>30</height>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
     </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_340</name>
-      <text>Errant Threshold</text>
-      <x>40</x>
-      <y>790</y>
-      <width>150</width>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_103</name>
+      <pv_name>$(P)ErrantThresholdR</pv_name>
+      <x>699</x>
+      <y>570</y>
+      <width>120</width>
       <height>30</height>
-      <horizontal_alignment>2</horizontal_alignment>
+      <format>1</format>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -1409,11 +613,44 @@
         </color>
       </border_color>
     </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input_19</name>
+      <pv_name>$(P)ErrantThreshold</pv_name>
+      <x>840</x>
+      <y>570</y>
+      <width>120</width>
+      <height>30</height>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_341</name>
-      <text>Max. pulse length</text>
+      <name>BGGrey02-title_19</name>
+      <text>ACCT parameters</text>
+      <width>1000</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="WHITE" red="255" green="255" blue="255">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_299</name>
+      <text>Trigger source</text>
       <x>40</x>
-      <y>830</y>
+      <y>80</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -1427,13 +664,14 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_112</name>
-      <pv_name>$(P)MaxPulseLengthR</pv_name>
+      <name>Text Update_83</name>
+      <pv_name>$(P)TriggerSourceR</pv_name>
       <x>210</x>
-      <y>830</y>
+      <y>80</y>
       <width>120</width>
       <height>30</height>
-      <format>1</format>
+      <format>6</format>
+      <show_units>false</show_units>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -1444,10 +682,10 @@
       </border_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_342</name>
-      <text>Lower win. start</text>
+      <name>Label_301</name>
+      <text>Pulse Charge</text>
       <x>40</x>
-      <y>870</y>
+      <y>120</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -1461,10 +699,10 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_113</name>
-      <pv_name>$(P)LowerWindowStartR</pv_name>
+      <name>Text Update_85</name>
+      <pv_name>$(P)PulseChargeR</pv_name>
       <x>210</x>
-      <y>870</y>
+      <y>120</y>
       <width>120</width>
       <height>30</height>
       <format>1</format>
@@ -1477,27 +715,45 @@
         </color>
       </border_color>
     </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>Text Input_20</name>
-      <pv_name>$(P)LowerWindowStart</pv_name>
-      <x>351</x>
-      <y>870</y>
+    <widget type="label" version="2.0.0">
+      <name>Label_302</name>
+      <text>FlatTop Charge</text>
+      <x>40</x>
+      <y>160</y>
+      <width>150</width>
+      <height>30</height>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_86</name>
+      <pv_name>$(P)FlatTopChargeR</pv_name>
+      <x>210</x>
+      <y>160</y>
       <width>120</width>
       <height>30</height>
-      <show_units>false</show_units>
+      <format>1</format>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
       <actions>
       </actions>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
       <border_color>
         <color red="0" green="128" blue="255">
         </color>
       </border_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_343</name>
-      <text>Lower win. end</text>
+      <name>Label_303</name>
+      <text>Pulse Width</text>
       <x>40</x>
-      <y>910</y>
+      <y>200</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -1511,10 +767,10 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_114</name>
-      <pv_name>$(P)LowerWindowEndR</pv_name>
+      <name>Text Update_87</name>
+      <pv_name>$(P)PulseWidthR</pv_name>
       <x>210</x>
-      <y>910</y>
+      <y>200</y>
       <width>120</width>
       <height>30</height>
       <format>1</format>
@@ -1527,30 +783,32 @@
         </color>
       </border_color>
     </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>Text Input_21</name>
-      <pv_name>$(P)LowerWindowEnd</pv_name>
-      <x>351</x>
-      <y>910</y>
-      <width>120</width>
+    <widget type="label" version="2.0.0">
+      <name>Label_304</name>
+      <text>ADC Scale</text>
+      <x>530</x>
+      <y>80</y>
+      <width>150</width>
       <height>30</height>
-      <show_units>false</show_units>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
       <actions>
       </actions>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
       <border_color>
         <color red="0" green="128" blue="255">
         </color>
       </border_color>
     </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_344</name>
-      <text>Errant win. start</text>
-      <x>40</x>
-      <y>950</y>
-      <width>150</width>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_89</name>
+      <pv_name>$(P)AdcOffsetR</pv_name>
+      <x>700</x>
+      <y>120</y>
+      <width>120</width>
       <height>30</height>
-      <horizontal_alignment>2</horizontal_alignment>
+      <precision>0</precision>
+      <show_units>false</show_units>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -1561,13 +819,13 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_115</name>
-      <pv_name>$(P)ErrantWindowStartR</pv_name>
-      <x>210</x>
-      <y>950</y>
+      <name>Text Update_88</name>
+      <pv_name>$(P)AdcScaleR</pv_name>
+      <x>700</x>
+      <y>80</y>
       <width>120</width>
       <height>30</height>
-      <format>1</format>
+      <show_units>false</show_units>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -1578,10 +836,10 @@
       </border_color>
     </widget>
     <widget type="textentry" version="3.0.0">
-      <name>Text Input_22</name>
-      <pv_name>$(P)ErrantWindowStart</pv_name>
-      <x>351</x>
-      <y>950</y>
+      <name>Text Input_11</name>
+      <pv_name>$(P)AdcScale</pv_name>
+      <x>841</x>
+      <y>80</y>
       <width>120</width>
       <height>30</height>
       <show_units>false</show_units>
@@ -1594,10 +852,10 @@
       </border_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_345</name>
-      <text>Errant win. end</text>
-      <x>40</x>
-      <y>990</y>
+      <name>Label_305</name>
+      <text>ADC Offset</text>
+      <x>530</x>
+      <y>120</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -1610,44 +868,44 @@
         </color>
       </border_color>
     </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>Text Update_116</name>
-      <pv_name>$(P)ErrantWindowEndR</pv_name>
-      <x>210</x>
-      <y>990</y>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input_12</name>
+      <pv_name>$(P)AdcOffset</pv_name>
+      <x>841</x>
+      <y>120</y>
       <width>120</width>
       <height>30</height>
-      <format>1</format>
-      <vertical_alignment>1</vertical_alignment>
-      <wrap_words>false</wrap_words>
+      <show_units>false</show_units>
       <actions>
       </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
       <border_color>
         <color red="0" green="128" blue="255">
         </color>
       </border_color>
     </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>Text Input_23</name>
-      <pv_name>$(P)ErrantWindowEnd</pv_name>
-      <x>351</x>
-      <y>990</y>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_91</name>
+      <pv_name>$(P)FlatTopStartR</pv_name>
+      <x>210</x>
+      <y>380</y>
       <width>120</width>
       <height>30</height>
-      <show_units>false</show_units>
+      <format>1</format>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
       <actions>
       </actions>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
       <border_color>
         <color red="0" green="128" blue="255">
         </color>
       </border_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_346</name>
-      <text>DC blocker</text>
+      <name>Label_306</name>
+      <text>Flattop start</text>
       <x>40</x>
-      <y>670</y>
+      <y>380</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -1660,56 +918,45 @@
         </color>
       </border_color>
     </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>Text Update_117</name>
-      <pv_name>$(P)DcBlockingR</pv_name>
-      <x>210</x>
-      <y>670</y>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input_13</name>
+      <pv_name>$(P)FlatTopStart</pv_name>
+      <x>351</x>
+      <y>380</y>
       <width>120</width>
       <height>30</height>
+      <format>1</format>
       <show_units>false</show_units>
-      <vertical_alignment>1</vertical_alignment>
-      <wrap_words>false</wrap_words>
       <actions>
       </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
       <border_color>
         <color red="0" green="128" blue="255">
         </color>
       </border_color>
     </widget>
-    <widget type="combo" version="2.0.0">
-      <name>Menu Button_12</name>
-      <pv_name>$(P)DcBlocking</pv_name>
-      <x>351</x>
-      <y>670</y>
-      <width>120</width>
-      <background_color>
-        <color red="240" green="240" blue="240">
-        </color>
-      </background_color>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-    </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>Text Input_28</name>
-      <pv_name>$(P)MaxPulseLength</pv_name>
-      <x>351</x>
-      <y>830</y>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_92</name>
+      <pv_name>$(P)FlatTopEndR</pv_name>
+      <x>210</x>
+      <y>420</y>
       <width>120</width>
       <height>30</height>
-      <show_units>false</show_units>
+      <format>1</format>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
       <actions>
       </actions>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
       <border_color>
         <color red="0" green="128" blue="255">
         </color>
       </border_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_347</name>
-      <text>Beam mode config</text>
+      <name>Label_307</name>
+      <text>Flattop end</text>
       <x>40</x>
-      <y>1030</y>
+      <y>420</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -1722,47 +969,28 @@
         </color>
       </border_color>
     </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Action Button</name>
-      <actions>
-        <action type="open_display">
-          <file>lut_mode_acct.opi</file>
-          <target>tab</target>
-        </action>
-      </actions>
-      <text>More..</text>
-      <x>350</x>
-      <y>1030</y>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input_14</name>
+      <pv_name>$(P)FlatTopEnd</pv_name>
+      <x>351</x>
+      <y>420</y>
       <width>120</width>
-      <background_color>
-        <color red="240" green="240" blue="240">
-        </color>
-      </background_color>
-      <tooltip>$(actions)</tooltip>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Action Button_1</name>
+      <height>30</height>
+      <format>1</format>
+      <show_units>false</show_units>
       <actions>
-        <action type="open_display">
-          <file>lut_dest_acct.opi</file>
-          <target>tab</target>
-        </action>
       </actions>
-      <text>More..</text>
-      <x>350</x>
-      <y>1070</y>
-      <width>120</width>
-      <background_color>
-        <color red="240" green="240" blue="240">
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
         </color>
-      </background_color>
-      <tooltip>$(actions)</tooltip>
+      </border_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_348</name>
-      <text>Beam destination config</text>
+      <name>Label_308</name>
+      <text>Av. FlatTop Current</text>
       <x>40</x>
-      <y>1070</y>
+      <y>240</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -1775,23 +1003,28 @@
         </color>
       </border_color>
     </widget>
-    <widget type="combo" version="2.0.0">
-      <name>Menu Button_13</name>
-      <pv_name>$(P)TriggerSource</pv_name>
-      <x>351</x>
-      <y>110</y>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_93</name>
+      <pv_name>$(P)FlatTopCurrentR</pv_name>
+      <x>210</x>
+      <y>240</y>
       <width>120</width>
-      <background_color>
-        <color red="240" green="240" blue="240">
+      <height>30</height>
+      <format>1</format>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
         </color>
-      </background_color>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
+      </border_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_321</name>
-      <text>Baseline correction</text>
-      <x>40</x>
-      <y>630</y>
+      <name>Label_309</name>
+      <text>ADC Fine Delay</text>
+      <x>530</x>
+      <y>160</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -1805,13 +1038,12 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_100</name>
-      <pv_name>$(P)BaseliningAfterR</pv_name>
-      <x>210</x>
-      <y>630</y>
+      <name>Text Update_94</name>
+      <pv_name>$(P)FineDelayR</pv_name>
+      <x>700</x>
+      <y>160</y>
       <width>120</width>
       <height>30</height>
-      <show_units>false</show_units>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -1821,23 +1053,27 @@
         </color>
       </border_color>
     </widget>
-    <widget type="combo" version="2.0.0">
-      <name>Menu Button_3</name>
-      <pv_name>$(P)BaseliningAfter</pv_name>
-      <x>351</x>
-      <y>630</y>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input_15</name>
+      <pv_name>$(P)FineDelay</pv_name>
+      <x>841</x>
+      <y>160</y>
       <width>120</width>
-      <background_color>
-        <color red="240" green="240" blue="240">
-        </color>
-      </background_color>
+      <height>30</height>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
       <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_324</name>
-      <text>Upper Threshold</text>
-      <x>40</x>
-      <y>710</y>
+      <name>Label_317</name>
+      <text>Droop Rate</text>
+      <x>530</x>
+      <y>380</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -1851,13 +1087,12 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_101</name>
-      <pv_name>$(P)UpperThresholdR</pv_name>
-      <x>210</x>
-      <y>710</y>
+      <name>Text Update_96</name>
+      <pv_name>$(P)DroopRateR</pv_name>
+      <x>700</x>
+      <y>380</y>
       <width>120</width>
       <height>30</height>
-      <format>1</format>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -1868,10 +1103,10 @@
       </border_color>
     </widget>
     <widget type="textentry" version="3.0.0">
-      <name>Text Input_17</name>
-      <pv_name>$(P)UpperThreshold</pv_name>
-      <x>351</x>
-      <y>710</y>
+      <name>Text Input_16</name>
+      <pv_name>$(P)DroopRate</pv_name>
+      <x>841</x>
+      <y>380</y>
       <width>120</width>
       <height>30</height>
       <show_units>false</show_units>
@@ -1884,10 +1119,10 @@
       </border_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_325</name>
-      <text>Lower Threshold</text>
-      <x>40</x>
-      <y>750</y>
+      <name>Label_9</name>
+      <text>Droop compensation</text>
+      <x>530</x>
+      <y>420</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -1901,13 +1136,13 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_102</name>
-      <pv_name>$(P)LowerThresholdR</pv_name>
-      <x>210</x>
-      <y>750</y>
+      <name>Text Update_97</name>
+      <pv_name>$(P)DroopCompensatingR</pv_name>
+      <x>700</x>
+      <y>420</y>
       <width>120</width>
       <height>30</height>
-      <format>1</format>
+      <show_units>false</show_units>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -1917,30 +1152,43 @@
         </color>
       </border_color>
     </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>Text Input_18</name>
-      <pv_name>$(P)LowerThreshold</pv_name>
-      <x>351</x>
-      <y>750</y>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button_2</name>
+      <pv_name>$(P)DroopCompensating</pv_name>
+      <x>841</x>
+      <y>420</y>
       <width>120</width>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_319</name>
+      <text>Noise filtering</text>
+      <x>530</x>
+      <y>230</y>
+      <width>150</width>
       <height>30</height>
-      <show_units>false</show_units>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
       <actions>
       </actions>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
       <border_color>
         <color red="0" green="128" blue="255">
         </color>
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_103</name>
-      <pv_name>$(P)ErrantThresholdR</pv_name>
-      <x>210</x>
-      <y>790</y>
+      <name>Text Update_98</name>
+      <pv_name>$(P)NoiseFilteringR</pv_name>
+      <x>700</x>
+      <y>230</y>
       <width>120</width>
       <height>30</height>
-      <format>1</format>
+      <show_units>false</show_units>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -1950,44 +1198,106 @@
         </color>
       </border_color>
     </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>Text Input_19</name>
-      <pv_name>$(P)ErrantThreshold</pv_name>
-      <x>351</x>
-      <y>790</y>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button_1</name>
+      <pv_name>$(P)NoiseFiltering</pv_name>
+      <x>841</x>
+      <y>230</y>
       <width>120</width>
-      <height>30</height>
-      <show_units>false</show_units>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Group</name>
+    <x>1040</x>
+    <y>70</y>
+    <width>670</width>
+    <height>700</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey03-titlebar_5</name>
+      <width>670</width>
+      <height>700</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey03-background_11</name>
+      <x>20</x>
+      <y>50</y>
+      <width>630</width>
+      <height>630</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_width>5</corner_width>
+      <corner_height>5</corner_height>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_15</name>
+      <pv_name>$(P)AlarmAdcOverflowFirstR</pv_name>
+      <x>495</x>
+      <y>315</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
       <actions>
       </actions>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-      <border_color>
-        <color red="0" green="128" blue="255">
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_16</name>
+      <pv_name>$(P)AlarmAdcOverflowHoldR</pv_name>
+      <x>545</x>
+      <y>315</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
         </color>
-      </border_color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
     </widget>
-    <widget type="label" version="2.0.0">
-      <name>BGGrey02-title_19</name>
-      <text>ACCT parameters</text>
-      <width>510</width>
-      <height>50</height>
-      <font>
-        <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color name="WHITE" red="255" green="255" blue="255">
+    <widget type="led" version="2.0.0">
+      <name>LED_17</name>
+      <pv_name>$(P)AlarmAdcOverflowDirectR</pv_name>
+      <x>595</x>
+      <y>315</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
         </color>
-      </foreground_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-      <wrap_words>false</wrap_words>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_299</name>
-      <text>Trigger source</text>
+      <name>Label_338</name>
+      <text>ADC underflow</text>
       <x>40</x>
-      <y>110</y>
+      <y>350</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -2001,13 +1311,12 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_83</name>
-      <pv_name>$(P)TriggerSourceR</pv_name>
+      <name>Text Update_110</name>
+      <pv_name>$(P)AlarmAdcUnderflowControlR</pv_name>
       <x>210</x>
-      <y>110</y>
+      <y>350</y>
       <width>120</width>
       <height>30</height>
-      <format>6</format>
       <show_units>false</show_units>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
@@ -2018,11 +1327,71 @@
         </color>
       </border_color>
     </widget>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button_10</name>
+      <pv_name>$(P)AlarmAdcUnderflowControl</pv_name>
+      <x>350</x>
+      <y>350</y>
+      <width>120</width>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_18</name>
+      <pv_name>$(P)AlarmAdcUnderflowFirstR</pv_name>
+      <x>495</x>
+      <y>355</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_19</name>
+      <pv_name>$(P)AlarmAdcUnderflowHoldR</pv_name>
+      <x>545</x>
+      <y>355</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_20</name>
+      <pv_name>$(P)AlarmAdcUnderflowDirectR</pv_name>
+      <x>595</x>
+      <y>355</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_301</name>
-      <text>Pulse Charge</text>
+      <name>Label_339</name>
+      <text>ADC stuck</text>
       <x>40</x>
-      <y>150</y>
+      <y>390</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -2036,13 +1405,13 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_85</name>
-      <pv_name>$(P)PulseChargeR</pv_name>
+      <name>Text Update_111</name>
+      <pv_name>$(P)AlarmAdcStuckControlR</pv_name>
       <x>210</x>
-      <y>150</y>
+      <y>390</y>
       <width>120</width>
       <height>30</height>
-      <format>1</format>
+      <show_units>false</show_units>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -2052,11 +1421,71 @@
         </color>
       </border_color>
     </widget>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button_11</name>
+      <pv_name>$(P)AlarmAdcStuckControl</pv_name>
+      <x>350</x>
+      <y>390</y>
+      <width>120</width>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_21</name>
+      <pv_name>$(P)AlarmAdcStuckFirstR</pv_name>
+      <x>495</x>
+      <y>395</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_22</name>
+      <pv_name>$(P)AlarmAdcStuckHoldR</pv_name>
+      <x>545</x>
+      <y>395</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_23</name>
+      <pv_name>$(P)AlarmAdcStuckDirectR</pv_name>
+      <x>595</x>
+      <y>395</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_302</name>
-      <text>FlatTop Charge</text>
+      <name>Label_349</name>
+      <text>-50 mV check</text>
       <x>40</x>
-      <y>190</y>
+      <y>430</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -2070,13 +1499,13 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_86</name>
-      <pv_name>$(P)FlatTopChargeR</pv_name>
+      <name>Text Update_118</name>
+      <pv_name>$(P)AlarmAiuFaultControlR</pv_name>
       <x>210</x>
-      <y>190</y>
+      <y>430</y>
       <width>120</width>
       <height>30</height>
-      <format>1</format>
+      <show_units>false</show_units>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -2086,45 +1515,71 @@
         </color>
       </border_color>
     </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_303</name>
-      <text>Pulse Width</text>
-      <x>40</x>
-      <y>230</y>
-      <width>150</width>
-      <height>30</height>
-      <horizontal_alignment>2</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-      <wrap_words>false</wrap_words>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button_14</name>
+      <pv_name>$(P)AlarmAiuFaultControl</pv_name>
+      <x>350</x>
+      <y>430</y>
+      <width>120</width>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_24</name>
+      <pv_name>$(P)AlarmAiuFaultFirstR</pv_name>
+      <x>495</x>
+      <y>435</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
       <actions>
       </actions>
-      <border_color>
-        <color red="0" green="128" blue="255">
-        </color>
-      </border_color>
     </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>Text Update_87</name>
-      <pv_name>$(P)PulseWidthR</pv_name>
-      <x>210</x>
-      <y>230</y>
-      <width>120</width>
-      <height>30</height>
-      <format>1</format>
-      <vertical_alignment>1</vertical_alignment>
-      <wrap_words>false</wrap_words>
+    <widget type="led" version="2.0.0">
+      <name>LED_25</name>
+      <pv_name>$(P)AlarmAiuFaultHoldR</pv_name>
+      <x>545</x>
+      <y>435</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
       <actions>
       </actions>
-      <border_color>
-        <color red="0" green="128" blue="255">
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_26</name>
+      <pv_name>$(P)AlarmAiuFaultDirectR</pv_name>
+      <x>595</x>
+      <y>435</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
         </color>
-      </border_color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_304</name>
-      <text>ADC Scale</text>
+      <name>Label_350</name>
+      <text>LI output &gt; threshold</text>
       <x>40</x>
-      <y>270</y>
+      <y>470</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -2138,13 +1593,12 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_89</name>
-      <pv_name>$(P)AdcOffsetR</pv_name>
+      <name>Text Update_119</name>
+      <pv_name>$(P)AlarmChargeTooHighControlR</pv_name>
       <x>210</x>
-      <y>310</y>
+      <y>470</y>
       <width>120</width>
       <height>30</height>
-      <precision>0</precision>
       <show_units>false</show_units>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
@@ -2155,44 +1609,71 @@
         </color>
       </border_color>
     </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>Text Update_88</name>
-      <pv_name>$(P)AdcScaleR</pv_name>
-      <x>210</x>
-      <y>270</y>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button_15</name>
+      <pv_name>$(P)AlarmChargeTooHighControl</pv_name>
+      <x>350</x>
+      <y>470</y>
       <width>120</width>
-      <height>30</height>
-      <show_units>false</show_units>
-      <vertical_alignment>1</vertical_alignment>
-      <wrap_words>false</wrap_words>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_27</name>
+      <pv_name>$(P)AlarmChargeTooHighFirstR</pv_name>
+      <x>495</x>
+      <y>475</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
       <actions>
       </actions>
-      <border_color>
-        <color red="0" green="128" blue="255">
-        </color>
-      </border_color>
     </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>Text Input_11</name>
-      <pv_name>$(P)AdcScale</pv_name>
-      <x>351</x>
-      <y>270</y>
-      <width>120</width>
-      <height>30</height>
-      <show_units>false</show_units>
+    <widget type="led" version="2.0.0">
+      <name>LED_28</name>
+      <pv_name>$(P)AlarmChargeTooHighHoldR</pv_name>
+      <x>545</x>
+      <y>475</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
       <actions>
       </actions>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-      <border_color>
-        <color red="0" green="128" blue="255">
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_29</name>
+      <pv_name>$(P)AlarmChargeTooHighDirectR</pv_name>
+      <x>595</x>
+      <y>475</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
         </color>
-      </border_color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_305</name>
-      <text>ADC Offset</text>
+      <name>Label_351</name>
+      <text>LUT upper threshold</text>
       <x>40</x>
-      <y>310</y>
+      <y>510</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -2205,44 +1686,59 @@
         </color>
       </border_color>
     </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>Text Input_12</name>
-      <pv_name>$(P)AdcOffset</pv_name>
-      <x>351</x>
-      <y>310</y>
-      <width>120</width>
-      <height>30</height>
-      <show_units>false</show_units>
+    <widget type="led" version="2.0.0">
+      <name>LED_30</name>
+      <pv_name>$(P)AlarmLUTUpperThresholdFirstR</pv_name>
+      <x>495</x>
+      <y>515</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
       <actions>
       </actions>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-      <border_color>
-        <color red="0" green="128" blue="255">
-        </color>
-      </border_color>
     </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>Text Update_91</name>
-      <pv_name>$(P)FlatTopStartR</pv_name>
-      <x>210</x>
-      <y>350</y>
-      <width>120</width>
-      <height>30</height>
-      <format>1</format>
-      <vertical_alignment>1</vertical_alignment>
-      <wrap_words>false</wrap_words>
+    <widget type="led" version="2.0.0">
+      <name>LED_31</name>
+      <pv_name>$(P)AlarmLUTUpperThresholdHoldR</pv_name>
+      <x>545</x>
+      <y>515</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
       <actions>
       </actions>
-      <border_color>
-        <color red="0" green="128" blue="255">
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_32</name>
+      <pv_name>$(P)AlarmLUTUpperThresholdDirectR</pv_name>
+      <x>595</x>
+      <y>515</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
         </color>
-      </border_color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_306</name>
-      <text>Flattop start</text>
+      <name>Label_352</name>
+      <text>LUT lower threshold</text>
       <x>40</x>
-      <y>350</y>
+      <y>550</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -2255,31 +1751,62 @@
         </color>
       </border_color>
     </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>Text Input_13</name>
-      <pv_name>$(P)FlatTopStart</pv_name>
-      <x>351</x>
-      <y>350</y>
-      <width>120</width>
-      <height>30</height>
-      <format>1</format>
-      <show_units>false</show_units>
+    <widget type="led" version="2.0.0">
+      <name>LED_33</name>
+      <pv_name>$(P)AlarmLUTLowerThresholdFirstR</pv_name>
+      <x>495</x>
+      <y>555</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
       <actions>
       </actions>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-      <border_color>
-        <color red="0" green="128" blue="255">
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_34</name>
+      <pv_name>$(P)AlarmLUTLowerThresholdHoldR</pv_name>
+      <x>545</x>
+      <y>555</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
         </color>
-      </border_color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
     </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>Text Update_92</name>
-      <pv_name>$(P)FlatTopEndR</pv_name>
-      <x>210</x>
-      <y>390</y>
-      <width>120</width>
+    <widget type="led" version="2.0.0">
+      <name>LED_35</name>
+      <pv_name>$(P)AlarmLUTLowerThresholdDirectR</pv_name>
+      <x>595</x>
+      <y>555</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_353</name>
+      <text>LUT pulse length</text>
+      <x>40</x>
+      <y>590</y>
+      <width>150</width>
       <height>30</height>
-      <format>1</format>
+      <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -2289,11 +1816,59 @@
         </color>
       </border_color>
     </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_36</name>
+      <pv_name>$(P)AlarmLUTPulseLengthFirstR</pv_name>
+      <x>495</x>
+      <y>595</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_37</name>
+      <pv_name>$(P)AlarmLUTPulseLengthHoldR</pv_name>
+      <x>545</x>
+      <y>595</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_38</name>
+      <pv_name>$(P)AlarmLUTPulseLengthDirectR</pv_name>
+      <x>595</x>
+      <y>595</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_307</name>
-      <text>Flattop end</text>
+      <name>Label_354</name>
+      <text>LUT beam destination</text>
       <x>40</x>
-      <y>390</y>
+      <y>630</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -2306,28 +1881,97 @@
         </color>
       </border_color>
     </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>Text Input_14</name>
-      <pv_name>$(P)FlatTopEnd</pv_name>
-      <x>351</x>
-      <y>390</y>
+    <widget type="led" version="2.0.0">
+      <name>LED_39</name>
+      <pv_name>$(P)AlarmLUTDestinationModeFirstR</pv_name>
+      <x>495</x>
+      <y>635</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_40</name>
+      <pv_name>$(P)AlarmLUTDestinationModeHoldR</pv_name>
+      <x>545</x>
+      <y>635</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_41</name>
+      <pv_name>$(P)AlarmLUTDestinationModeDirectR</pv_name>
+      <x>595</x>
+      <y>635</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>BGGrey02-title_20</name>
+      <text>ACCT alarms</text>
+      <width>670</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="WHITE" red="255" green="255" blue="255">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_326</name>
+      <text>Status</text>
+      <x>210</x>
+      <y>70</y>
       <width>120</width>
       <height>30</height>
-      <format>1</format>
-      <show_units>false</show_units>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
       <actions>
       </actions>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
       <border_color>
         <color red="0" green="128" blue="255">
         </color>
       </border_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_308</name>
-      <text>Average FlatTop Current</text>
+      <name>Label_327</name>
+      <text>Upper</text>
       <x>40</x>
-      <y>430</y>
+      <y>110</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -2341,13 +1985,13 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_93</name>
-      <pv_name>$(P)FlatTopCurrentR</pv_name>
+      <name>Text Update_104</name>
+      <pv_name>$(P)AlarmUpperControlR</pv_name>
       <x>210</x>
-      <y>430</y>
+      <y>110</y>
       <width>120</width>
       <height>30</height>
-      <format>1</format>
+      <show_units>false</show_units>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -2357,11 +2001,23 @@
         </color>
       </border_color>
     </widget>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button_4</name>
+      <pv_name>$(P)AlarmUpperControl</pv_name>
+      <x>350</x>
+      <y>110</y>
+      <width>120</width>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_309</name>
-      <text>ADC Fine Delay</text>
+      <name>Label_328</name>
+      <text>Lower</text>
       <x>40</x>
-      <y>470</y>
+      <y>150</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -2375,12 +2031,13 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_94</name>
-      <pv_name>$(P)FineDelayR</pv_name>
+      <name>Text Update_105</name>
+      <pv_name>$(P)AlarmLowerControlR</pv_name>
       <x>210</x>
-      <y>470</y>
+      <y>150</y>
       <width>120</width>
       <height>30</height>
+      <show_units>false</show_units>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -2390,27 +2047,23 @@
         </color>
       </border_color>
     </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>Text Input_15</name>
-      <pv_name>$(P)FineDelay</pv_name>
-      <x>351</x>
-      <y>470</y>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button_5</name>
+      <pv_name>$(P)AlarmLowerControl</pv_name>
+      <x>350</x>
+      <y>150</y>
       <width>120</width>
-      <height>30</height>
-      <show_units>false</show_units>
-      <actions>
-      </actions>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-      <border_color>
-        <color red="0" green="128" blue="255">
+      <background_color>
+        <color red="240" green="240" blue="240">
         </color>
-      </border_color>
+      </background_color>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_317</name>
-      <text>Droop Rate</text>
+      <name>Label_329</name>
+      <text>Errant beam</text>
       <x>40</x>
-      <y>510</y>
+      <y>190</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -2424,12 +2077,13 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_96</name>
-      <pv_name>$(P)DroopRateR</pv_name>
+      <name>Text Update_106</name>
+      <pv_name>$(P)AlarmErrantControlR</pv_name>
       <x>210</x>
-      <y>510</y>
+      <y>190</y>
       <width>120</width>
       <height>30</height>
+      <show_units>false</show_units>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -2439,27 +2093,23 @@
         </color>
       </border_color>
     </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>Text Input_16</name>
-      <pv_name>$(P)DroopRate</pv_name>
-      <x>351</x>
-      <y>510</y>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button_6</name>
+      <pv_name>$(P)AlarmErrantControl</pv_name>
+      <x>350</x>
+      <y>190</y>
       <width>120</width>
-      <height>30</height>
-      <show_units>false</show_units>
-      <actions>
-      </actions>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-      <border_color>
-        <color red="0" green="128" blue="255">
+      <background_color>
+        <color red="240" green="240" blue="240">
         </color>
-      </border_color>
+      </background_color>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_9</name>
-      <text>Droop compensation</text>
+      <name>Label_330</name>
+      <text>Beam &gt; trigger</text>
       <x>40</x>
-      <y>550</y>
+      <y>230</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -2473,10 +2123,10 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_97</name>
-      <pv_name>$(P)DroopCompensatingR</pv_name>
+      <name>Text Update_107</name>
+      <pv_name>$(P)AlarmTriggerControlR</pv_name>
       <x>210</x>
-      <y>550</y>
+      <y>230</y>
       <width>120</width>
       <height>30</height>
       <show_units>false</show_units>
@@ -2490,10 +2140,10 @@
       </border_color>
     </widget>
     <widget type="combo" version="2.0.0">
-      <name>Menu Button_2</name>
-      <pv_name>$(P)DroopCompensating</pv_name>
-      <x>351</x>
-      <y>550</y>
+      <name>Menu Button_7</name>
+      <pv_name>$(P)AlarmTriggerControl</pv_name>
+      <x>350</x>
+      <y>230</y>
       <width>120</width>
       <background_color>
         <color red="240" green="240" blue="240">
@@ -2502,10 +2152,10 @@
       <border_alarm_sensitive>false</border_alarm_sensitive>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_319</name>
-      <text>Noise filtering</text>
+      <name>Label_331</name>
+      <text>Beam &gt; Max pulse length</text>
       <x>40</x>
-      <y>590</y>
+      <y>270</y>
       <width>150</width>
       <height>30</height>
       <horizontal_alignment>2</horizontal_alignment>
@@ -2519,10 +2169,10 @@
       </border_color>
     </widget>
     <widget type="textupdate" version="2.0.0">
-      <name>Text Update_98</name>
-      <pv_name>$(P)NoiseFilteringR</pv_name>
+      <name>Text Update_108</name>
+      <pv_name>$(P)AlarmLimitControlR</pv_name>
       <x>210</x>
-      <y>590</y>
+      <y>270</y>
       <width>120</width>
       <height>30</height>
       <show_units>false</show_units>
@@ -2536,10 +2186,10 @@
       </border_color>
     </widget>
     <widget type="combo" version="2.0.0">
-      <name>Menu Button_1</name>
-      <pv_name>$(P)NoiseFiltering</pv_name>
-      <x>351</x>
-      <y>590</y>
+      <name>Menu Button_8</name>
+      <pv_name>$(P)AlarmLimitControl</pv_name>
+      <x>350</x>
+      <y>270</y>
       <width>120</width>
       <background_color>
         <color red="240" green="240" blue="240">
@@ -2548,7 +2198,7 @@
       <border_alarm_sensitive>false</border_alarm_sensitive>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_355</name>
+      <name>Label_332</name>
       <text>Control</text>
       <x>350</x>
       <y>70</y>
@@ -2564,17 +2214,126 @@
         </color>
       </border_color>
     </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED</name>
+      <pv_name>$(P)AlarmUpperFirstR</pv_name>
+      <x>495</x>
+      <y>115</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_356</name>
-      <text>Status</text>
-      <x>210</x>
+      <name>Label_333</name>
+      <text>First</text>
+      <x>480</x>
       <y>70</y>
-      <width>120</width>
+      <width>50</width>
       <height>30</height>
-      <background_color>
-        <color name="Read_Background" red="230" green="235" blue="232">
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
         </color>
-      </background_color>
+      </border_color>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_1</name>
+      <pv_name>$(P)AlarmLowerFirstR</pv_name>
+      <x>495</x>
+      <y>155</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_2</name>
+      <pv_name>$(P)AlarmErrantFirstR</pv_name>
+      <x>495</x>
+      <y>195</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_3</name>
+      <pv_name>$(P)AlarmTriggerFirstR</pv_name>
+      <x>495</x>
+      <y>235</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_4</name>
+      <pv_name>$(P)AlarmLimitFirstR</pv_name>
+      <x>495</x>
+      <y>275</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_5</name>
+      <pv_name>$(P)AlarmUpperHoldR</pv_name>
+      <x>545</x>
+      <y>115</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_334</name>
+      <text>Hold</text>
+      <x>530</x>
+      <y>70</y>
+      <width>50</width>
+      <height>30</height>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
@@ -2585,24 +2344,212 @@
         </color>
       </border_color>
     </widget>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>BGGrey02-title_20</name>
-    <text>ACCT alarms</text>
-    <x>550</x>
-    <y>70</y>
-    <width>670</width>
-    <height>50</height>
-    <font>
-      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="WHITE" red="255" green="255" blue="255">
-      </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+    <widget type="led" version="2.0.0">
+      <name>LED_6</name>
+      <pv_name>$(P)AlarmLowerHoldR</pv_name>
+      <x>545</x>
+      <y>155</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_7</name>
+      <pv_name>$(P)AlarmErrantHoldR</pv_name>
+      <x>545</x>
+      <y>195</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_8</name>
+      <pv_name>$(P)AlarmTriggerHoldR</pv_name>
+      <x>545</x>
+      <y>235</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_9</name>
+      <pv_name>$(P)AlarmLimitHoldR</pv_name>
+      <x>545</x>
+      <y>275</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_10</name>
+      <pv_name>$(P)AlarmUpperDirectR</pv_name>
+      <x>595</x>
+      <y>115</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_335</name>
+      <text>Direct</text>
+      <x>580</x>
+      <y>70</y>
+      <width>50</width>
+      <height>30</height>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_11</name>
+      <pv_name>$(P)AlarmLowerDirectR</pv_name>
+      <x>595</x>
+      <y>155</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_12</name>
+      <pv_name>$(P)AlarmErrantDirectR</pv_name>
+      <x>595</x>
+      <y>195</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_13</name>
+      <pv_name>$(P)AlarmTriggerDirectR</pv_name>
+      <x>595</x>
+      <y>235</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_14</name>
+      <pv_name>$(P)AlarmLimitDirectR</pv_name>
+      <x>595</x>
+      <y>275</y>
+      <off_color>
+        <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color name="Major" red="250" green="12" blue="14">
+        </color>
+      </on_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_337</name>
+      <text>ADC overflow</text>
+      <x>40</x>
+      <y>310</y>
+      <width>150</width>
+      <height>30</height>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_109</name>
+      <pv_name>$(P)AlarmAdcOverflowControlR</pv_name>
+      <x>210</x>
+      <y>310</y>
+      <width>120</width>
+      <height>30</height>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button_9</name>
+      <pv_name>$(P)AlarmAdcOverflowControl</pv_name>
+      <x>350</x>
+      <y>310</y>
+      <width>120</width>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
   </widget>
 </display>
diff --git a/99-Shared/adsis8300bcm/bcm.bob b/99-Shared/adsis8300bcm/bcm.bob
index 3b9b515..bca0935 100644
--- a/99-Shared/adsis8300bcm/bcm.bob
+++ b/99-Shared/adsis8300bcm/bcm.bob
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>$(P) control group</name>
-  <width>798</width>
-  <height>1030</height>
+  <width>1800</width>
+  <height>1200</height>
   <actions>
   </actions>
   <widget type="rectangle" version="2.0.0">
@@ -10,7 +10,77 @@
     <x>1100</x>
     <y>70</y>
     <width>680</width>
-    <height>420</height>
+    <height>540</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <x>1120</x>
+    <y>210</y>
+    <width>640</width>
+    <height>380</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_6</name>
+    <x>560</x>
+    <y>510</y>
+    <width>520</width>
+    <height>670</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_21</name>
+    <x>580</x>
+    <y>1040</y>
+    <width>480</width>
+    <height>120</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_20</name>
+    <x>580</x>
+    <y>840</y>
+    <width>480</width>
+    <height>150</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_7</name>
+    <x>1100</x>
+    <y>630</y>
+    <width>680</width>
+    <height>550</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -19,12 +89,26 @@
     <corner_width>10</corner_width>
     <corner_height>10</corner_height>
   </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_17</name>
+    <x>1120</x>
+    <y>990</y>
+    <width>640</width>
+    <height>170</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_15</name>
     <x>1120</x>
     <y>120</y>
     <width>640</width>
-    <height>350</height>
+    <height>70</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -52,26 +136,12 @@
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-titlebar_7</name>
-    <x>1100</x>
-    <y>510</y>
-    <width>650</width>
-    <height>410</height>
-    <line_width>0</line_width>
-    <background_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
-      </color>
-    </background_color>
-    <corner_width>10</corner_width>
-    <corner_height>10</corner_height>
-  </widget>
   <widget type="label" version="2.0.0">
     <name>BGGrey02-title_22</name>
-    <text>From EVR</text>
+    <text>Event Receiver</text>
     <x>1100</x>
-    <y>510</y>
-    <width>650</width>
+    <y>630</y>
+    <width>680</width>
     <height>50</height>
     <font>
       <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -85,26 +155,12 @@
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-titlebar_6</name>
-    <x>560</x>
-    <y>520</y>
-    <width>520</width>
-    <height>540</height>
-    <line_width>0</line_width>
-    <background_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
-      </color>
-    </background_color>
-    <corner_width>10</corner_width>
-    <corner_height>10</corner_height>
-  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_14</name>
     <x>580</x>
-    <y>570</y>
+    <y>560</y>
     <width>480</width>
-    <height>470</height>
+    <height>230</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -117,7 +173,7 @@
     <name>BGGrey02-title_21</name>
     <text>Beam Mode</text>
     <x>560</x>
-    <y>520</y>
+    <y>510</y>
     <width>520</width>
     <height>50</height>
     <font>
@@ -137,7 +193,7 @@
     <x>560</x>
     <y>70</y>
     <width>520</width>
-    <height>430</height>
+    <height>420</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -151,7 +207,7 @@
     <x>580</x>
     <y>120</y>
     <width>480</width>
-    <height>360</height>
+    <height>350</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -184,7 +240,7 @@
     <class>TITLE-BAR</class>
     <x use_class="true">0</x>
     <y use_class="true">0</y>
-    <width>2320</width>
+    <width>1800</width>
     <height use_class="true">50</height>
     <line_width use_class="true">0</line_width>
     <background_color use_class="true">
@@ -198,7 +254,7 @@
     <text>$(P)</text>
     <x use_class="true">20</x>
     <y use_class="true">0</y>
-    <width>2280</width>
+    <width>1760</width>
     <height use_class="true">50</height>
     <font use_class="true">
       <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -218,7 +274,7 @@
     <x>20</x>
     <y>70</y>
     <width>520</width>
-    <height>1080</height>
+    <height>1110</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -230,23 +286,9 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_12</name>
     <x>40</x>
-    <y>580</y>
-    <width>480</width>
-    <height>550</height>
-    <line_width>0</line_width>
-    <background_color>
-      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-      </color>
-    </background_color>
-    <corner_width>5</corner_width>
-    <corner_height>5</corner_height>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-background_11</name>
-    <x>40</x>
-    <y>490</y>
+    <y>500</y>
     <width>480</width>
-    <height>70</height>
+    <height>610</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -260,7 +302,7 @@
     <x>40</x>
     <y>120</y>
     <width>480</width>
-    <height>350</height>
+    <height>360</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -299,7 +341,7 @@
     <pv_name>$(P)$(R)Acquire</pv_name>
     <text>Start</text>
     <x>240</x>
-    <y>420</y>
+    <y>430</y>
     <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -317,7 +359,7 @@
     <pv_name>$(P)$(R)Acquire</pv_name>
     <text>Stop</text>
     <x>380</x>
-    <y>420</y>
+    <y>430</y>
     <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -327,8 +369,8 @@
   <widget type="led" version="2.0.0">
     <name>LED_2</name>
     <pv_name>$(P)$(R)Acquire</pv_name>
-    <x>470</x>
-    <y>260</y>
+    <x>430</x>
+    <y>265</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -382,10 +424,6 @@
     <width>120</width>
     <height>30</height>
     <format>0</format>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <actions>
     </actions>
     <minimum>-1.7976931348623157E308</minimum>
@@ -486,23 +524,6 @@ $(pv_value)</tooltip>
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_271</name>
-    <text>Control</text>
-    <x>60</x>
-    <y>420</y>
-    <width>160</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_25</name>
     <actions>
@@ -512,8 +533,8 @@ $(pv_value)</tooltip>
       </action>
     </actions>
     <text>Diff. channels</text>
-    <x>60</x>
-    <y>510</y>
+    <x>40</x>
+    <y>1130</y>
     <width>110</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -530,9 +551,9 @@ $(pv_value)</tooltip>
       </action>
     </actions>
     <text>System</text>
-    <x>190</x>
-    <y>510</y>
-    <width>90</width>
+    <x>160</x>
+    <y>1130</y>
+    <width>115</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -581,6 +602,10 @@ $(pv_value)</tooltip>
     <y>140</y>
     <width>120</width>
     <height>30</height>
+    <background_color>
+      <color name="Write_Background" red="224" green="217" blue="202">
+      </color>
+    </background_color>
     <format>4</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -769,15 +794,10 @@ $(pv_value)</tooltip>
     <x>600</x>
     <y>410</y>
     <width>440</width>
-    <height>50</height>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
+    <height>40</height>
     <format>6</format>
     <actions>
     </actions>
-    <border_width>1</border_width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_273</name>
@@ -837,10 +857,6 @@ $(pv_value)</tooltip>
     <width>120</width>
     <height>30</height>
     <format>0</format>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <actions>
     </actions>
     <minimum>-1.0</minimum>
@@ -850,7 +866,7 @@ $(pv_value)</tooltip>
     <name>Text Update_106</name>
     <pv_name>$(P)$(R)ClockFrequencyMeasR</pv_name>
     <x>240</x>
-    <y>880</y>
+    <y>860</y>
     <width>120</width>
     <height>30</height>
     <format>1</format>
@@ -868,7 +884,7 @@ $(pv_value)</tooltip>
     <name>Label_316</name>
     <text>Measured frequency</text>
     <x>60</x>
-    <y>880</y>
+    <y>860</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -954,7 +970,7 @@ $(pv_value)</tooltip>
     <name>Text Update_110</name>
     <pv_name>$(P)$(R)TriggerPeriodMeasR</pv_name>
     <x>240</x>
-    <y>920</y>
+    <y>900</y>
     <width>120</width>
     <height>30</height>
     <format>1</format>
@@ -970,9 +986,9 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_321</name>
-    <text>Measured trigger period</text>
+    <text>Meas. trigger period</text>
     <x>60</x>
-    <y>920</y>
+    <y>900</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -989,7 +1005,7 @@ $(pv_value)</tooltip>
     <name>Text Update_111</name>
     <pv_name>$(P)$(R)TriggerWidthMeasR</pv_name>
     <x>240</x>
-    <y>960</y>
+    <y>940</y>
     <width>120</width>
     <height>30</height>
     <format>1</format>
@@ -1007,7 +1023,7 @@ $(pv_value)</tooltip>
     <name>Label_322</name>
     <text>Measured trigger width</text>
     <x>60</x>
-    <y>960</y>
+    <y>940</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1058,7 +1074,7 @@ $(pv_value)</tooltip>
     <name>Text Update_116</name>
     <pv_name>$(P)$(R)MinTriggerPeriodR</pv_name>
     <x>240</x>
-    <y>1000</y>
+    <y>980</y>
     <width>120</width>
     <height>30</height>
     <precision>0</precision>
@@ -1076,17 +1092,9 @@ $(pv_value)</tooltip>
     <name>Text Input_11</name>
     <pv_name>$(P)$(R)MinTriggerPeriod</pv_name>
     <x>380</x>
-    <y>1000</y>
+    <y>980</y>
     <width>120</width>
     <height>30</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -1100,7 +1108,7 @@ $(pv_value)</tooltip>
     <name>Label_328</name>
     <text>Min. trigger period</text>
     <x>60</x>
-    <y>1000</y>
+    <y>980</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1117,17 +1125,9 @@ $(pv_value)</tooltip>
     <name>Text Input_1</name>
     <pv_name>$(P)$(R)MaxPulseWidth</pv_name>
     <x>380</x>
-    <y>1040</y>
+    <y>1020</y>
     <width>120</width>
     <height>30</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -1141,7 +1141,7 @@ $(pv_value)</tooltip>
     <name>Text Update_117</name>
     <pv_name>$(P)$(R)MaxPulseWidthR</pv_name>
     <x>240</x>
-    <y>1040</y>
+    <y>1020</y>
     <width>120</width>
     <height>30</height>
     <precision>0</precision>
@@ -1159,7 +1159,7 @@ $(pv_value)</tooltip>
     <name>Label_329</name>
     <text>Max trigger width</text>
     <x>60</x>
-    <y>1040</y>
+    <y>1020</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1208,23 +1208,6 @@ $(pv_value)</tooltip>
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_331</name>
-    <text>Clear</text>
-    <x>1140</x>
-    <y>180</y>
-    <width>160</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_47</name>
     <actions>
@@ -1235,13 +1218,9 @@ $(pv_value)</tooltip>
     </actions>
     <pv_name>$(P)$(R)AlarmsClear</pv_name>
     <text>Clear</text>
-    <x>1484</x>
-    <y>180</y>
-    <width>66</width>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
+    <x>1600</x>
+    <y>540</y>
+    <width>140</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -1251,7 +1230,7 @@ $(pv_value)</tooltip>
     <name>Label_326</name>
     <text>Status</text>
     <x>1320</x>
-    <y>220</y>
+    <y>230</y>
     <width>120</width>
     <height>30</height>
     <background_color>
@@ -1272,7 +1251,7 @@ $(pv_value)</tooltip>
     <name>Label_327</name>
     <text>Auxiliary clock</text>
     <x>1140</x>
-    <y>260</y>
+    <y>270</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1289,7 +1268,7 @@ $(pv_value)</tooltip>
     <name>Text Update_104</name>
     <pv_name>$(P)$(R)AlarmAuxClockControlR</pv_name>
     <x>1320</x>
-    <y>260</y>
+    <y>270</y>
     <width>120</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -1307,7 +1286,7 @@ $(pv_value)</tooltip>
     <name>Menu Button_4</name>
     <pv_name>$(P)$(R)AlarmAuxClockControl</pv_name>
     <x>1460</x>
-    <y>260</y>
+    <y>270</y>
     <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -1319,7 +1298,7 @@ $(pv_value)</tooltip>
     <name>Label_335</name>
     <text>Control</text>
     <x>1460</x>
-    <y>220</y>
+    <y>230</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -1336,7 +1315,7 @@ $(pv_value)</tooltip>
     <name>LED</name>
     <pv_name>$(P)$(R)AlarmAuxClockFirstR</pv_name>
     <x>1605</x>
-    <y>260</y>
+    <y>275</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1352,7 +1331,7 @@ $(pv_value)</tooltip>
     <name>LED_5</name>
     <pv_name>$(P)$(R)AlarmAuxClockHoldR</pv_name>
     <x>1655</x>
-    <y>260</y>
+    <y>275</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1368,7 +1347,7 @@ $(pv_value)</tooltip>
     <name>LED_10</name>
     <pv_name>$(P)$(R)AlarmAuxClockDirectR</pv_name>
     <x>1705</x>
-    <y>260</y>
+    <y>275</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1396,7 +1375,7 @@ $(pv_value)</tooltip>
     <name>Label_339</name>
     <text>Processing clock</text>
     <x>1140</x>
-    <y>300</y>
+    <y>320</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1413,7 +1392,7 @@ $(pv_value)</tooltip>
     <name>Text Update_120</name>
     <pv_name>$(P)$(R)AlarmProcClockControlR</pv_name>
     <x>1320</x>
-    <y>300</y>
+    <y>320</y>
     <width>120</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -1431,7 +1410,7 @@ $(pv_value)</tooltip>
     <name>Menu Button_2</name>
     <pv_name>$(P)$(R)AlarmProcClockControl</pv_name>
     <x>1460</x>
-    <y>300</y>
+    <y>320</y>
     <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -1443,7 +1422,7 @@ $(pv_value)</tooltip>
     <name>LED_11</name>
     <pv_name>$(P)$(R)AlarmProcClockFirstR</pv_name>
     <x>1605</x>
-    <y>300</y>
+    <y>325</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1459,7 +1438,7 @@ $(pv_value)</tooltip>
     <name>LED_12</name>
     <pv_name>$(P)$(R)AlarmProcClockHoldR</pv_name>
     <x>1655</x>
-    <y>300</y>
+    <y>325</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1475,7 +1454,7 @@ $(pv_value)</tooltip>
     <name>LED_13</name>
     <pv_name>$(P)$(R)AlarmProcClockDirectR</pv_name>
     <x>1705</x>
-    <y>300</y>
+    <y>325</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1491,7 +1470,7 @@ $(pv_value)</tooltip>
     <name>Label_340</name>
     <text>Trigger &gt; Max trigger width</text>
     <x>1140</x>
-    <y>340</y>
+    <y>370</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1508,7 +1487,7 @@ $(pv_value)</tooltip>
     <name>Text Update_121</name>
     <pv_name>$(P)$(R)AlarmTriggerTooWideControlR</pv_name>
     <x>1320</x>
-    <y>340</y>
+    <y>370</y>
     <width>120</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -1526,7 +1505,7 @@ $(pv_value)</tooltip>
     <name>Menu Button_3</name>
     <pv_name>$(P)$(R)AlarmTriggerTooWideControl</pv_name>
     <x>1460</x>
-    <y>340</y>
+    <y>370</y>
     <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -1538,7 +1517,7 @@ $(pv_value)</tooltip>
     <name>LED_14</name>
     <pv_name>$(P)$(R)AlarmTriggerTooWideFirstR</pv_name>
     <x>1605</x>
-    <y>340</y>
+    <y>375</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1554,7 +1533,7 @@ $(pv_value)</tooltip>
     <name>LED_15</name>
     <pv_name>$(P)$(R)AlarmTriggerTooWideHoldR</pv_name>
     <x>1655</x>
-    <y>340</y>
+    <y>375</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1570,7 +1549,7 @@ $(pv_value)</tooltip>
     <name>LED_16</name>
     <pv_name>$(P)$(R)AlarmTriggerTooWideDirectR</pv_name>
     <x>1705</x>
-    <y>340</y>
+    <y>375</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1586,7 +1565,7 @@ $(pv_value)</tooltip>
     <name>Label_341</name>
     <text>Trigger &lt; 5 us</text>
     <x>1140</x>
-    <y>380</y>
+    <y>420</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1603,7 +1582,7 @@ $(pv_value)</tooltip>
     <name>Text Update_122</name>
     <pv_name>$(P)$(R)AlarmTriggerTooNarrowControlR</pv_name>
     <x>1320</x>
-    <y>380</y>
+    <y>420</y>
     <width>120</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -1621,7 +1600,7 @@ $(pv_value)</tooltip>
     <name>Menu Button_4</name>
     <pv_name>$(P)$(R)AlarmTriggerTooNarrowControl</pv_name>
     <x>1460</x>
-    <y>380</y>
+    <y>420</y>
     <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -1633,7 +1612,7 @@ $(pv_value)</tooltip>
     <name>LED_17</name>
     <pv_name>$(P)$(R)AlarmTriggerTooNarrowFirstR</pv_name>
     <x>1605</x>
-    <y>380</y>
+    <y>425</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1649,7 +1628,7 @@ $(pv_value)</tooltip>
     <name>LED_18</name>
     <pv_name>$(P)$(R)AlarmTriggerTooNarrowHoldR</pv_name>
     <x>1655</x>
-    <y>380</y>
+    <y>425</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1665,7 +1644,7 @@ $(pv_value)</tooltip>
     <name>LED_19</name>
     <pv_name>$(P)$(R)AlarmTriggerTooNarrowDirectR</pv_name>
     <x>1705</x>
-    <y>380</y>
+    <y>425</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1681,7 +1660,7 @@ $(pv_value)</tooltip>
     <name>Label_342</name>
     <text>Trigger &lt; Min trigger period</text>
     <x>1140</x>
-    <y>420</y>
+    <y>470</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1698,7 +1677,7 @@ $(pv_value)</tooltip>
     <name>Text Update_123</name>
     <pv_name>$(P)$(R)AlarmTriggerPeriodTooShortControlR</pv_name>
     <x>1320</x>
-    <y>420</y>
+    <y>470</y>
     <width>120</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -1716,7 +1695,7 @@ $(pv_value)</tooltip>
     <name>Menu Button_5</name>
     <pv_name>$(P)$(R)AlarmTriggerPeriodTooShortControl</pv_name>
     <x>1460</x>
-    <y>420</y>
+    <y>470</y>
     <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -1728,7 +1707,7 @@ $(pv_value)</tooltip>
     <name>LED_20</name>
     <pv_name>$(P)$(R)AlarmTriggerPeriodTooShortFirstR</pv_name>
     <x>1605</x>
-    <y>420</y>
+    <y>475</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1744,7 +1723,7 @@ $(pv_value)</tooltip>
     <name>LED_21</name>
     <pv_name>$(P)$(R)AlarmTriggerPeriodTooShortHoldR</pv_name>
     <x>1655</x>
-    <y>420</y>
+    <y>475</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1760,7 +1739,7 @@ $(pv_value)</tooltip>
     <name>LED_22</name>
     <pv_name>$(P)$(R)AlarmTriggerPeriodTooShortDirectR</pv_name>
     <x>1705</x>
-    <y>420</y>
+    <y>475</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1776,7 +1755,7 @@ $(pv_value)</tooltip>
     <name>Text Update_124</name>
     <pv_name>$(P)$(R)ReadyR</pv_name>
     <x>240</x>
-    <y>680</y>
+    <y>600</y>
     <width>120</width>
     <height>30</height>
     <precision>0</precision>
@@ -1794,7 +1773,7 @@ $(pv_value)</tooltip>
     <name>Label_344</name>
     <text>BCM check</text>
     <x>60</x>
-    <y>680</y>
+    <y>600</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1811,7 +1790,7 @@ $(pv_value)</tooltip>
     <name>Menu Button_6</name>
     <pv_name>$(P)$(R)Ready</pv_name>
     <x>380</x>
-    <y>680</y>
+    <y>600</y>
     <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -1823,7 +1802,7 @@ $(pv_value)</tooltip>
     <name>Text Update_125</name>
     <pv_name>$(P)$(R)ClockFrequencyMeasR</pv_name>
     <x>240</x>
-    <y>720</y>
+    <y>660</y>
     <width>120</width>
     <height>30</height>
     <format>1</format>
@@ -1841,7 +1820,7 @@ $(pv_value)</tooltip>
     <name>Label_345</name>
     <text>Main clock missing</text>
     <x>60</x>
-    <y>720</y>
+    <y>660</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1858,7 +1837,7 @@ $(pv_value)</tooltip>
     <name>Text Update_126</name>
     <pv_name>$(P)$(R)AuxiliaryClockMissingR</pv_name>
     <x>240</x>
-    <y>760</y>
+    <y>700</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -1875,7 +1854,7 @@ $(pv_value)</tooltip>
     <name>Label_346</name>
     <text>Auxiliary clock missing</text>
     <x>60</x>
-    <y>760</y>
+    <y>700</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1892,7 +1871,7 @@ $(pv_value)</tooltip>
     <name>Text Update_127</name>
     <pv_name>$(P)$(R)MainClockMissingR</pv_name>
     <x>240</x>
-    <y>720</y>
+    <y>660</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -1908,8 +1887,8 @@ $(pv_value)</tooltip>
   <widget type="led" version="2.0.0">
     <name>LED_23</name>
     <pv_name>$(P)$(R)MainClockMissingR</pv_name>
-    <x>470</x>
-    <y>720</y>
+    <x>430</x>
+    <y>665</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1924,8 +1903,8 @@ $(pv_value)</tooltip>
   <widget type="led" version="2.0.0">
     <name>LED_24</name>
     <pv_name>$(P)$(R)AuxiliaryClockMissingR</pv_name>
-    <x>470</x>
-    <y>760</y>
+    <x>430</x>
+    <y>705</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -1941,16 +1920,9 @@ $(pv_value)</tooltip>
     <name>Text Input_3</name>
     <pv_name>$(P)$(R)BeamModeUser</pv_name>
     <x>920</x>
-    <y>590</y>
+    <y>580</y>
+    <width>120</width>
     <height>30</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -1964,7 +1936,7 @@ $(pv_value)</tooltip>
     <name>Text Update_129</name>
     <pv_name>$(P)$(R)BeamModeUser</pv_name>
     <x>780</x>
-    <y>591</y>
+    <y>581</y>
     <width>120</width>
     <height>30</height>
     <precision>0</precision>
@@ -1982,7 +1954,7 @@ $(pv_value)</tooltip>
     <name>Label_353</name>
     <text>User beam mode</text>
     <x>600</x>
-    <y>590</y>
+    <y>580</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1999,7 +1971,7 @@ $(pv_value)</tooltip>
     <name>Text Update_131</name>
     <pv_name>$(P)$(R)LutControlR</pv_name>
     <x>780</x>
-    <y>910</y>
+    <y>1060</y>
     <width>120</width>
     <height>30</height>
     <precision>0</precision>
@@ -2016,9 +1988,9 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_355</name>
-    <text>LUT control</text>
+    <text>Control</text>
     <x>600</x>
-    <y>910</y>
+    <y>1060</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -2035,7 +2007,8 @@ $(pv_value)</tooltip>
     <name>Menu Button_7</name>
     <pv_name>$(P)$(R)LutControl</pv_name>
     <x>920</x>
-    <y>910</y>
+    <y>1060</y>
+    <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -2051,9 +2024,9 @@ $(pv_value)</tooltip>
       </action>
     </actions>
     <text>Autosave</text>
-    <x>300</x>
-    <y>510</y>
-    <width>90</width>
+    <x>285</x>
+    <y>1130</y>
+    <width>115</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -2073,8 +2046,8 @@ $(pv_value)</tooltip>
     </actions>
     <text>Asyn</text>
     <x>410</x>
-    <y>510</y>
-    <width>90</width>
+    <y>1130</y>
+    <width>110</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -2085,7 +2058,7 @@ $(pv_value)</tooltip>
     <name>Text Update_132</name>
     <pv_name>$(P)$(R)AcquisitionTriggerSourceR</pv_name>
     <x>240</x>
-    <y>600</y>
+    <y>520</y>
     <width>120</width>
     <height>30</height>
     <precision>0</precision>
@@ -2102,9 +2075,9 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_356</name>
-    <text>Acquisition trigger source</text>
+    <text>Acquisition trig. source:</text>
     <x>60</x>
-    <y>600</y>
+    <y>520</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -2121,7 +2094,7 @@ $(pv_value)</tooltip>
     <name>Menu Button_8</name>
     <pv_name>$(P)$(R)AcquisitionTriggerSource</pv_name>
     <x>380</x>
-    <y>600</y>
+    <y>520</y>
     <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -2133,7 +2106,7 @@ $(pv_value)</tooltip>
     <name>Text Update_133</name>
     <pv_name>$(P)$(R)BeamTriggerSourceR</pv_name>
     <x>240</x>
-    <y>640</y>
+    <y>560</y>
     <width>120</width>
     <height>30</height>
     <precision>0</precision>
@@ -2152,7 +2125,7 @@ $(pv_value)</tooltip>
     <name>Label_357</name>
     <text>Beam trigger source</text>
     <x>60</x>
-    <y>640</y>
+    <y>560</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -2169,7 +2142,7 @@ $(pv_value)</tooltip>
     <name>Menu Button_9</name>
     <pv_name>$(P)$(R)BeamTriggerSource</pv_name>
     <x>380</x>
-    <y>640</y>
+    <y>560</y>
     <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -2185,9 +2158,10 @@ $(pv_value)</tooltip>
         <target>tab</target>
       </action>
     </actions>
-    <text>More..</text>
-    <x>920</x>
-    <y>950</y>
+    <text>Mode LUT setup</text>
+    <x>780</x>
+    <y>1110</y>
+    <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -2202,54 +2176,21 @@ $(pv_value)</tooltip>
         <target>tab</target>
       </action>
     </actions>
-    <text>More..</text>
+    <text>Dest. LUT setup</text>
     <x>920</x>
-    <y>990</y>
+    <y>1110</y>
+    <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_360</name>
-    <text>Beam mode LUT setup</text>
-    <x>600</x>
-    <y>950</y>
-    <width>160</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_361</name>
-    <text>Beam dest. LUT setup</text>
-    <x>600</x>
-    <y>990</y>
-    <width>160</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_134</name>
     <pv_name>$(P)$(R)ReadyFPGAR</pv_name>
     <x>240</x>
-    <y>800</y>
+    <y>760</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -2266,7 +2207,7 @@ $(pv_value)</tooltip>
     <name>Label_362</name>
     <text>BCM ready FPGA</text>
     <x>60</x>
-    <y>800</y>
+    <y>760</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -2282,8 +2223,8 @@ $(pv_value)</tooltip>
   <widget type="led" version="2.0.0">
     <name>LED_25</name>
     <pv_name>$(P)$(R)ReadyFPGAR</pv_name>
-    <x>470</x>
-    <y>800</y>
+    <x>430</x>
+    <y>765</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -2299,7 +2240,7 @@ $(pv_value)</tooltip>
     <name>Text Update_135</name>
     <pv_name>$(P)$(R)BeamPermitFPGAR</pv_name>
     <x>240</x>
-    <y>840</y>
+    <y>800</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -2316,7 +2257,7 @@ $(pv_value)</tooltip>
     <name>Label_363</name>
     <text>BCM beam permit FPGA</text>
     <x>60</x>
-    <y>840</y>
+    <y>800</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -2332,8 +2273,8 @@ $(pv_value)</tooltip>
   <widget type="led" version="2.0.0">
     <name>LED_26</name>
     <pv_name>$(P)$(R)BeamPermitFPGAR</pv_name>
-    <x>470</x>
-    <y>840</y>
+    <x>430</x>
+    <y>805</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -2345,26 +2286,11 @@ $(pv_value)</tooltip>
     <actions>
     </actions>
   </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>Linking Container</name>
-    <file>../adsis8300/sis8300-evr.opi</file>
-    <x>1120</x>
-    <y>560</y>
-    <width>610</width>
-    <height>340</height>
-    <resize>2</resize>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
   <widget type="label" version="2.0.0">
     <name>Label_365</name>
     <text>Beam mode source</text>
     <x>600</x>
-    <y>630</y>
+    <y>620</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -2381,7 +2307,7 @@ $(pv_value)</tooltip>
     <name>Text Update_137</name>
     <pv_name>$(P)$(R)BeamModeVal</pv_name>
     <x>780</x>
-    <y>670</y>
+    <y>660</y>
     <width>120</width>
     <height>30</height>
     <precision>0</precision>
@@ -2399,7 +2325,7 @@ $(pv_value)</tooltip>
     <name>Label_366</name>
     <text>Beam mode</text>
     <x>600</x>
-    <y>670</y>
+    <y>660</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -2416,7 +2342,8 @@ $(pv_value)</tooltip>
     <name>Menu Button</name>
     <pv_name>$(P)$(R)BeamModeSource</pv_name>
     <x>920</x>
-    <y>630</y>
+    <y>620</y>
+    <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -2427,16 +2354,9 @@ $(pv_value)</tooltip>
     <name>Text Input_5</name>
     <pv_name>$(P)$(R)BeamDestUser</pv_name>
     <x>920</x>
-    <y>750</y>
+    <y>740</y>
+    <width>120</width>
     <height>30</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -2450,7 +2370,7 @@ $(pv_value)</tooltip>
     <name>Text Update_138</name>
     <pv_name>$(P)$(R)BeamDestUser</pv_name>
     <x>780</x>
-    <y>750</y>
+    <y>740</y>
     <width>120</width>
     <height>30</height>
     <precision>0</precision>
@@ -2468,7 +2388,7 @@ $(pv_value)</tooltip>
     <name>Label_367</name>
     <text>User beam destination</text>
     <x>600</x>
-    <y>750</y>
+    <y>740</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -2483,9 +2403,9 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_368</name>
-    <text>Beam destination source</text>
+    <text>Beam dest. source</text>
     <x>600</x>
-    <y>790</y>
+    <y>860</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -2502,7 +2422,8 @@ $(pv_value)</tooltip>
     <name>Menu Button_11</name>
     <pv_name>$(P)$(R)BeamDestSource</pv_name>
     <x>920</x>
-    <y>790</y>
+    <y>860</y>
+    <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -2513,7 +2434,7 @@ $(pv_value)</tooltip>
     <name>Text Update_139</name>
     <pv_name>$(P)$(R)BeamDestVal</pv_name>
     <x>780</x>
-    <y>830</y>
+    <y>900</y>
     <width>120</width>
     <height>30</height>
     <precision>0</precision>
@@ -2531,7 +2452,7 @@ $(pv_value)</tooltip>
     <name>Label_369</name>
     <text>Beam destination</text>
     <x>600</x>
-    <y>830</y>
+    <y>900</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -2548,7 +2469,7 @@ $(pv_value)</tooltip>
     <name>Text Update_140</name>
     <pv_name>$(P)$(R)BeamModeValR</pv_name>
     <x>780</x>
-    <y>710</y>
+    <y>700</y>
     <width>120</width>
     <height>30</height>
     <precision>0</precision>
@@ -2566,7 +2487,7 @@ $(pv_value)</tooltip>
     <name>Label_370</name>
     <text>Beam mode read-back</text>
     <x>600</x>
-    <y>710</y>
+    <y>700</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -2583,7 +2504,7 @@ $(pv_value)</tooltip>
     <name>Text Update_141</name>
     <pv_name>$(P)$(R)BeamDestValR</pv_name>
     <x>780</x>
-    <y>870</y>
+    <y>940</y>
     <width>120</width>
     <height>30</height>
     <precision>0</precision>
@@ -2599,9 +2520,9 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_371</name>
-    <text>Beam destination read-back</text>
+    <text>Beam dest. read-back</text>
     <x>600</x>
-    <y>870</y>
+    <y>940</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -2618,7 +2539,7 @@ $(pv_value)</tooltip>
     <name>Text Update_142</name>
     <pv_name>$(P)$(R)BeamModeSourceR</pv_name>
     <x>780</x>
-    <y>630</y>
+    <y>620</y>
     <width>120</width>
     <height>30</height>
     <precision>0</precision>
@@ -2636,7 +2557,7 @@ $(pv_value)</tooltip>
     <name>Text Update_143</name>
     <pv_name>$(P)$(R)BeamDestSourceR</pv_name>
     <x>780</x>
-    <y>790</y>
+    <y>860</y>
     <width>120</width>
     <height>30</height>
     <precision>0</precision>
@@ -2654,17 +2575,9 @@ $(pv_value)</tooltip>
     <name>Text Input_6</name>
     <pv_name>$(P)$(R)BeamOverThreshold</pv_name>
     <x>380</x>
-    <y>1080</y>
+    <y>1060</y>
     <width>120</width>
     <height>30</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -2678,7 +2591,7 @@ $(pv_value)</tooltip>
     <name>Text Update_144</name>
     <pv_name>$(P)$(R)BeamOverThresholdR</pv_name>
     <x>240</x>
-    <y>1080</y>
+    <y>1060</y>
     <width>120</width>
     <height>30</height>
     <precision>0</precision>
@@ -2696,7 +2609,7 @@ $(pv_value)</tooltip>
     <name>Label_430</name>
     <text>Beam over threshold</text>
     <x>60</x>
-    <y>1080</y>
+    <y>1060</y>
     <width>160</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -2713,7 +2626,7 @@ $(pv_value)</tooltip>
     <name>Label_336</name>
     <text>First</text>
     <x>1590</x>
-    <y>220</y>
+    <y>230</y>
     <width>50</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -2730,7 +2643,7 @@ $(pv_value)</tooltip>
     <name>Label_337</name>
     <text>Hold</text>
     <x>1640</x>
-    <y>220</y>
+    <y>230</y>
     <width>50</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -2747,7 +2660,7 @@ $(pv_value)</tooltip>
     <name>Label_343</name>
     <text>Direct</text>
     <x>1690</x>
-    <y>220</y>
+    <y>230</y>
     <width>50</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -2760,4 +2673,433 @@ $(pv_value)</tooltip>
       </color>
     </border_color>
   </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_16</name>
+    <x>1120</x>
+    <y>720</y>
+    <width>640</width>
+    <height>220</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_237</name>
+    <text>Timestamp</text>
+    <x>1150</x>
+    <y>740</y>
+    <width>140</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_128</name>
+    <pv_name>$(P)$(R)EvrTimestamp</pv_name>
+    <x>1310</x>
+    <y>740</y>
+    <width>200</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_4</name>
+    <pv_name>$(P)$(R)EvrTimestampIn.TSEL</pv_name>
+    <x>1530</x>
+    <y>740</y>
+    <width>200</width>
+    <height>30</height>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_239</name>
+    <text>Mode</text>
+    <x>1150</x>
+    <y>790</y>
+    <width>140</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_130</name>
+    <pv_name>$(P)$(R)BeamModeEvr</pv_name>
+    <x>1310</x>
+    <y>790</y>
+    <width>200</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_7</name>
+    <pv_name>$(P)$(R)BeamModeEvr.DOL</pv_name>
+    <x>1530</x>
+    <y>790</y>
+    <width>200</width>
+    <height>30</height>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_136</name>
+    <pv_name>$(P)$(R)BeamDestEvr</pv_name>
+    <x>1310</x>
+    <y>840</y>
+    <width>200</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_241</name>
+    <text>Destination</text>
+    <x>1150</x>
+    <y>840</y>
+    <width>140</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_8</name>
+    <pv_name>$(P)$(R)BeamDestEvr.DOL</pv_name>
+    <x>1530</x>
+    <y>840</y>
+    <width>200</width>
+    <height>30</height>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_145</name>
+    <pv_name>$(P)$(R)EvrBeamState</pv_name>
+    <x>1310</x>
+    <y>890</y>
+    <width>200</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_243</name>
+    <text>State</text>
+    <x>1150</x>
+    <y>890</y>
+    <width>140</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_9</name>
+    <pv_name>$(P)$(R)EvrBeamStateIn.INP</pv_name>
+    <x>1530</x>
+    <y>890</y>
+    <width>200</width>
+    <height>30</height>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_146</name>
+    <pv_name>$(P)$(R)EvrLink</pv_name>
+    <x>1310</x>
+    <y>1010</y>
+    <width>200</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_245</name>
+    <text>Link</text>
+    <x>1150</x>
+    <y>1010</y>
+    <width>140</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_10</name>
+    <pv_name>$(P)$(R)EvrLinkIn.INP</pv_name>
+    <x>1530</x>
+    <y>1010</y>
+    <width>200</width>
+    <height>30</height>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_147</name>
+    <pv_name>$(P)$(R)EvrLinkStat</pv_name>
+    <x>1310</x>
+    <y>1060</y>
+    <width>200</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_247</name>
+    <text>Link STAT</text>
+    <x>1150</x>
+    <y>1060</y>
+    <width>140</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_12</name>
+    <pv_name>$(P)$(R)EvrLinkStatIn.INP</pv_name>
+    <x>1530</x>
+    <y>1060</y>
+    <width>200</width>
+    <height>30</height>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_148</name>
+    <pv_name>$(P)$(R)EvrLinkSevr</pv_name>
+    <x>1310</x>
+    <y>1110</y>
+    <width>200</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_249</name>
+    <text>Link SEVR</text>
+    <x>1150</x>
+    <y>1110</y>
+    <width>140</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_13</name>
+    <pv_name>$(P)$(R)EvrLinkSevrIn.INP</pv_name>
+    <x>1530</x>
+    <y>1110</y>
+    <width>200</width>
+    <height>30</height>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_16</name>
+    <text>Link Status</text>
+    <x>1100</x>
+    <y>950</y>
+    <width>680</width>
+    <height>40</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="20.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_17</name>
+    <text>Beam</text>
+    <x>1100</x>
+    <y>680</y>
+    <width>680</width>
+    <height>40</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="20.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_18</name>
+    <text>LUT</text>
+    <x>560</x>
+    <y>1000</y>
+    <width>520</width>
+    <height>40</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="20.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_19</name>
+    <text>Beam Destination</text>
+    <x>560</x>
+    <y>800</y>
+    <width>520</width>
+    <height>40</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="20.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
 </display>
diff --git a/99-Shared/adsis8300bcm/bcm_instance.bob b/99-Shared/adsis8300bcm/bcm_instance.bob
index cf88ab0..46cf304 100644
--- a/99-Shared/adsis8300bcm/bcm_instance.bob
+++ b/99-Shared/adsis8300bcm/bcm_instance.bob
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>$(P) top</name>
-  <width>500</width>
+  <width>460</width>
   <height>390</height>
   <background_color>
     <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -14,7 +14,7 @@
     <class>TITLE-BAR</class>
     <x use_class="true">0</x>
     <y use_class="true">0</y>
-    <width>500</width>
+    <width>460</width>
     <height use_class="true">50</height>
     <line_width use_class="true">0</line_width>
     <background_color use_class="true">
@@ -28,7 +28,7 @@
     <text>$(P)</text>
     <x use_class="true">20</x>
     <y use_class="true">0</y>
-    <width>460</width>
+    <width>420</width>
     <height use_class="true">50</height>
     <font use_class="true">
       <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -47,7 +47,7 @@
     <name>BGGrey03-titlebar_5</name>
     <x>20</x>
     <y>70</y>
-    <width>460</width>
+    <width>420</width>
     <height>300</height>
     <line_width>0</line_width>
     <background_color>
@@ -62,7 +62,7 @@
     <text>Panels</text>
     <x>20</x>
     <y>70</y>
-    <width>460</width>
+    <width>420</width>
     <height>50</height>
     <font>
       <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -80,7 +80,7 @@
     <name>BGGrey03-background_11</name>
     <x>40</x>
     <y>121</y>
-    <width>420</width>
+    <width>380</width>
     <height>230</height>
     <line_width>0</line_width>
     <background_color>
@@ -103,7 +103,7 @@
       </action>
     </actions>
     <text>Launch</text>
-    <x>340</x>
+    <x>300</x>
     <y>300</y>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -116,12 +116,13 @@
     <text>differential channels</text>
     <x>60</x>
     <y>300</y>
-    <width>260</width>
+    <width>220</width>
     <height>30</height>
     <font>
       <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
       </font>
     </font>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -146,7 +147,7 @@ $(pv_value)</tooltip>
       </action>
     </actions>
     <text>Launch</text>
-    <x>340</x>
+    <x>300</x>
     <y>260</y>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -159,12 +160,13 @@ $(pv_value)</tooltip>
     <text>control group</text>
     <x>60</x>
     <y>260</y>
-    <width>260</width>
+    <width>220</width>
     <height>30</height>
     <font>
       <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
       </font>
     </font>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -181,7 +183,7 @@ $(pv_value)</tooltip>
     <pv_name>$(P)PRC-Name</pv_name>
     <x>60</x>
     <y>180</y>
-    <width>260</width>
+    <width>220</width>
     <height>30</height>
     <font>
       <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
@@ -192,6 +194,7 @@ $(pv_value)</tooltip>
       </color>
     </background_color>
     <transparent>true</transparent>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -206,11 +209,11 @@ $(pv_value)</tooltip>
     <actions>
       <action type="open_display">
         <file>acct.opi</file>
-        <target>tab</target>
+        <target>window</target>
       </action>
     </actions>
     <text>Launch</text>
-    <x>340</x>
+    <x>300</x>
     <y>220</y>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -223,11 +226,11 @@ $(pv_value)</tooltip>
     <actions>
       <action type="open_display">
         <file>processed.opi</file>
-        <target>tab</target>
+        <target>window</target>
       </action>
     </actions>
     <text>Launch</text>
-    <x>340</x>
+    <x>300</x>
     <y>180</y>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -240,7 +243,7 @@ $(pv_value)</tooltip>
     <pv_name>$(P)Name</pv_name>
     <x>60</x>
     <y>220</y>
-    <width>260</width>
+    <width>220</width>
     <height>30</height>
     <font>
       <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
@@ -251,6 +254,7 @@ $(pv_value)</tooltip>
       </color>
     </background_color>
     <transparent>true</transparent>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -265,11 +269,11 @@ $(pv_value)</tooltip>
     <actions>
       <action type="open_display">
         <file>raw.opi</file>
-        <target>tab</target>
+        <target>window</target>
       </action>
     </actions>
     <text>Launch</text>
-    <x>340</x>
+    <x>300</x>
     <y>140</y>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -282,7 +286,7 @@ $(pv_value)</tooltip>
     <pv_name>$(P)RAW-Name</pv_name>
     <x>60</x>
     <y>140</y>
-    <width>260</width>
+    <width>220</width>
     <height>30</height>
     <font>
       <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
@@ -293,6 +297,7 @@ $(pv_value)</tooltip>
       </color>
     </background_color>
     <transparent>true</transparent>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
diff --git a/99-Shared/adsis8300bcm/diff_item.bob b/99-Shared/adsis8300bcm/diff_item.bob
index adf87d4..3b9f438 100644
--- a/99-Shared/adsis8300bcm/diff_item.bob
+++ b/99-Shared/adsis8300bcm/diff_item.bob
@@ -13,10 +13,6 @@
     <pv_name>$(P)DF$(IDX)-Name</pv_name>
     <width>230</width>
     <height>30</height>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
     <background_color>
       <color name="Background" red="220" green="225" blue="221">
       </color>
@@ -62,10 +58,6 @@
     <x>250</x>
     <width>30</width>
     <height>30</height>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
     <transparent>false</transparent>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
diff --git a/99-Shared/adsis8300bcm/processed.bob b/99-Shared/adsis8300bcm/processed.bob
index e9aea11..0b41ba6 100644
--- a/99-Shared/adsis8300bcm/processed.bob
+++ b/99-Shared/adsis8300bcm/processed.bob
@@ -3,16 +3,16 @@
   <name>$(P) PRC</name>
   <x>470</x>
   <y>197</y>
-  <width>2320</width>
-  <height>1120</height>
+  <width>1900</width>
+  <height>1400</height>
   <actions>
   </actions>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-titlebar_6</name>
-    <x>1300</x>
+    <x>20</x>
     <y>70</y>
-    <width>1000</width>
-    <height>1030</height>
+    <width>1860</width>
+    <height>700</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -23,10 +23,10 @@
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_14</name>
-    <x>1320</x>
+    <x>40</x>
     <y>120</y>
-    <width>960</width>
-    <height>830</height>
+    <width>1460</width>
+    <height>630</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -37,10 +37,10 @@
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-titlebar_5</name>
-    <x>20</x>
-    <y>70</y>
-    <width>620</width>
-    <height>1030</height>
+    <x>660</x>
+    <y>790</y>
+    <width>1220</width>
+    <height>590</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -51,10 +51,10 @@
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_13</name>
-    <x>40</x>
-    <y>650</y>
+    <x>1280</x>
+    <y>840</y>
     <width>580</width>
-    <height>430</height>
+    <height>520</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -65,10 +65,10 @@
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_12</name>
-    <x>40</x>
-    <y>120</y>
+    <x>680</x>
+    <y>840</y>
     <width>580</width>
-    <height>510</height>
+    <height>520</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -80,9 +80,9 @@
   <widget type="label" version="2.0.0">
     <name>BGGrey02-title_20</name>
     <text>$(CG)PRB1-Name</text>
-    <x>20</x>
-    <y>70</y>
-    <width>620</width>
+    <x>660</x>
+    <y>790</y>
+    <width>1220</width>
     <height>50</height>
     <font>
       <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -98,8 +98,8 @@
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-titlebar_4</name>
-    <x>660</x>
-    <y>70</y>
+    <x>20</x>
+    <y>790</y>
     <width>620</width>
     <height>590</height>
     <line_width>0</line_width>
@@ -112,10 +112,10 @@
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_11</name>
-    <x>680</x>
-    <y>570</y>
+    <x>40</x>
+    <y>1300</y>
     <width>580</width>
-    <height>70</height>
+    <height>60</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -129,7 +129,7 @@
     <class>TITLE-BAR</class>
     <x use_class="true">0</x>
     <y use_class="true">0</y>
-    <width>2320</width>
+    <width>1900</width>
     <height use_class="true">50</height>
     <line_width use_class="true">0</line_width>
     <background_color use_class="true">
@@ -143,7 +143,7 @@
     <text>$(P)</text>
     <x use_class="true">20</x>
     <y use_class="true">0</y>
-    <width>2280</width>
+    <width>1860</width>
     <height use_class="true">50</height>
     <font use_class="true">
       <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -160,10 +160,10 @@
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_10</name>
-    <x>680</x>
-    <y>120</y>
+    <x>40</x>
+    <y>840</y>
     <width>580</width>
-    <height>430</height>
+    <height>440</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -175,8 +175,8 @@
   <widget type="label" version="2.0.0">
     <name>BGGrey02-title_19</name>
     <text>$(P)PRC-Name</text>
-    <x>660</x>
-    <y>70</y>
+    <x>20</x>
+    <y>790</y>
     <width>620</width>
     <height>50</height>
     <font>
@@ -194,8 +194,8 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_1</name>
     <pv_name>$(P)PRC-Factor</pv_name>
-    <x>1060</x>
-    <y>384</y>
+    <x>420</x>
+    <y>1114</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -210,8 +210,8 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_2</name>
     <pv_name>$(P)PRC-Offset</pv_name>
-    <x>1060</x>
-    <y>424</y>
+    <x>420</x>
+    <y>1154</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -226,8 +226,8 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_8</name>
     <pv_name>$(P)PRC-MemoryAddress</pv_name>
-    <x>1060</x>
-    <y>224</y>
+    <x>420</x>
+    <y>954</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -242,8 +242,8 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_9</name>
     <pv_name>$(P)PRC-FractionBits</pv_name>
-    <x>1060</x>
-    <y>264</y>
+    <x>420</x>
+    <y>994</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -258,8 +258,8 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_10</name>
     <pv_name>$(P)PRC-Decimation</pv_name>
-    <x>1060</x>
-    <y>464</y>
+    <x>420</x>
+    <y>1194</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -281,8 +281,8 @@
     </actions>
     <pv_name>$(P)PRC-Recording</pv_name>
     <text>Enable</text>
-    <x>1060</x>
-    <y>140</y>
+    <x>420</x>
+    <y>860</y>
     <width>80</width>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -295,15 +295,15 @@
     </actions>
     <pv_name>$(P)PRC-Recording</pv_name>
     <text>Disable</text>
-    <x>1160</x>
-    <y>140</y>
+    <x>520</x>
+    <y>860</y>
     <width>80</width>
   </widget>
   <widget type="combo" version="2.0.0">
     <name>Menu Button_2</name>
     <pv_name>$(P)PRC-Scaling</pv_name>
-    <x>1060</x>
-    <y>304</y>
+    <x>420</x>
+    <y>1034</y>
     <width>180</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -314,8 +314,8 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_3</name>
     <pv_name>$(P)PRC-Converting</pv_name>
-    <x>1060</x>
-    <y>344</y>
+    <x>420</x>
+    <y>1074</y>
     <width>180</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -330,8 +330,8 @@
       <P>$(CG)</P>
       <R>PRB1-TR1-</R>
     </macros>
-    <x>60</x>
-    <y>710</y>
+    <x>1300</x>
+    <y>910</y>
     <width>540</width>
     <height>30</height>
     <resize>2</resize>
@@ -349,8 +349,8 @@
       <P>$(CG)</P>
       <R>PRB1-TR2-</R>
     </macros>
-    <x>60</x>
-    <y>750</y>
+    <x>1300</x>
+    <y>960</y>
     <width>540</width>
     <height>30</height>
     <resize>2</resize>
@@ -368,8 +368,8 @@
       <P>$(CG)</P>
       <R>PRB1-TR3-</R>
     </macros>
-    <x>60</x>
-    <y>790</y>
+    <x>1300</x>
+    <y>1010</y>
     <width>540</width>
     <height>30</height>
     <resize>2</resize>
@@ -387,8 +387,8 @@
       <P>$(CG)</P>
       <R>PRB1-TR4-</R>
     </macros>
-    <x>60</x>
-    <y>830</y>
+    <x>1300</x>
+    <y>1060</y>
     <width>540</width>
     <height>30</height>
     <resize>2</resize>
@@ -406,8 +406,8 @@
       <P>$(CG)</P>
       <R>PRB1-TR5-</R>
     </macros>
-    <x>60</x>
-    <y>867</y>
+    <x>1300</x>
+    <y>1110</y>
     <width>540</width>
     <height>30</height>
     <resize>2</resize>
@@ -425,8 +425,8 @@
       <P>$(CG)</P>
       <R>PRB1-TR6-</R>
     </macros>
-    <x>60</x>
-    <y>910</y>
+    <x>1300</x>
+    <y>1160</y>
     <width>540</width>
     <height>30</height>
     <resize>2</resize>
@@ -444,8 +444,8 @@
       <P>$(CG)</P>
       <R>PRB1-TR7-</R>
     </macros>
-    <x>60</x>
-    <y>950</y>
+    <x>1300</x>
+    <y>1210</y>
     <width>540</width>
     <height>30</height>
     <resize>2</resize>
@@ -463,8 +463,8 @@
       <P>$(CG)</P>
       <R>PRB1-TR8-</R>
     </macros>
-    <x>60</x>
-    <y>990</y>
+    <x>1300</x>
+    <y>1260</y>
     <width>540</width>
     <height>30</height>
     <resize>2</resize>
@@ -482,8 +482,8 @@
       <P>$(CG)</P>
       <R>PRB1-TR9-</R>
     </macros>
-    <x>60</x>
-    <y>1030</y>
+    <x>1300</x>
+    <y>1310</y>
     <width>540</width>
     <height>30</height>
     <resize>2</resize>
@@ -501,8 +501,8 @@
       <P>$(CG)</P>
       <R>PRB1-TR0-</R>
     </macros>
-    <x>60</x>
-    <y>670</y>
+    <x>1300</x>
+    <y>860</y>
     <width>540</width>
     <height>30</height>
     <resize>2</resize>
@@ -519,8 +519,8 @@
     <macros>
       <R>PRC-TR1-</R>
     </macros>
-    <x>700</x>
-    <y>590</y>
+    <x>60</x>
+    <y>1315</y>
     <width>540</width>
     <height>30</height>
     <resize>2</resize>
@@ -534,8 +534,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_347</name>
     <text>Source</text>
-    <x>60</x>
-    <y>540</y>
+    <x>700</x>
+    <y>1270</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -551,11 +551,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_117</name>
     <pv_name>$(CG)PRB1-SourceR</pv_name>
-    <x>200</x>
-    <y>540</y>
+    <x>860</x>
+    <y>1270</y>
     <width>150</width>
     <height>30</height>
-    <transparent>true</transparent>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -569,8 +568,8 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_12</name>
     <pv_name>$(CG)PRB1-Source</pv_name>
-    <x>420</x>
-    <y>540</y>
+    <x>1060</x>
+    <y>1270</y>
     <width>180</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -581,8 +580,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_350</name>
     <text>Num samples</text>
-    <x>60</x>
-    <y>180</y>
+    <x>700</x>
+    <y>910</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -598,11 +597,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_119</name>
     <pv_name>$(CG)PRB1-NumSamplesR</pv_name>
-    <x>200</x>
-    <y>180</y>
+    <x>860</x>
+    <y>910</y>
     <width>150</width>
     <height>30</height>
-    <transparent>true</transparent>
     <precision>0</precision>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -617,8 +615,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_351</name>
     <text>Factor</text>
-    <x>60</x>
-    <y>380</y>
+    <x>700</x>
+    <y>1110</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -634,11 +632,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_120</name>
     <pv_name>$(CG)PRB1-FactorR</pv_name>
-    <x>200</x>
-    <y>380</y>
+    <x>860</x>
+    <y>1110</y>
     <width>150</width>
     <height>30</height>
-    <transparent>true</transparent>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -652,8 +649,8 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_12</name>
     <pv_name>$(CG)PRB1-Factor</pv_name>
-    <x>420</x>
-    <y>380</y>
+    <x>1060</x>
+    <y>1110</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -668,8 +665,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_352</name>
     <text>Offset</text>
-    <x>60</x>
-    <y>420</y>
+    <x>700</x>
+    <y>1150</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -685,11 +682,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_121</name>
     <pv_name>$(CG)PRB1-OffsetR</pv_name>
-    <x>200</x>
-    <y>420</y>
+    <x>860</x>
+    <y>1150</y>
     <width>150</width>
     <height>30</height>
-    <transparent>true</transparent>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -703,8 +699,8 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_13</name>
     <pv_name>$(CG)PRB1-Offset</pv_name>
-    <x>420</x>
-    <y>420</y>
+    <x>1060</x>
+    <y>1150</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -719,8 +715,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_353</name>
     <text>Scaling</text>
-    <x>60</x>
-    <y>300</y>
+    <x>700</x>
+    <y>1030</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -736,8 +732,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_354</name>
     <text>Memory Address</text>
-    <x>60</x>
-    <y>220</y>
+    <x>700</x>
+    <y>950</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -753,11 +749,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_122</name>
     <pv_name>$(CG)PRB1-MemoryAddressR</pv_name>
-    <x>200</x>
-    <y>220</y>
+    <x>860</x>
+    <y>950</y>
     <width>150</width>
     <height>30</height>
-    <transparent>true</transparent>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -772,8 +767,8 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_14</name>
     <pv_name>$(CG)PRB1-MemoryAddress</pv_name>
-    <x>420</x>
-    <y>220</y>
+    <x>1060</x>
+    <y>950</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -788,8 +783,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_355</name>
     <text>Fraction bits</text>
-    <x>60</x>
-    <y>260</y>
+    <x>700</x>
+    <y>990</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -805,11 +800,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_123</name>
     <pv_name>$(CG)PRB1-FractionBitsR</pv_name>
-    <x>200</x>
-    <y>260</y>
+    <x>860</x>
+    <y>990</y>
     <width>150</width>
     <height>30</height>
-    <transparent>true</transparent>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -824,8 +818,8 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_15</name>
     <pv_name>$(CG)PRB1-FractionBits</pv_name>
-    <x>420</x>
-    <y>260</y>
+    <x>1060</x>
+    <y>990</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -840,8 +834,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_356</name>
     <text>Decimation</text>
-    <x>60</x>
-    <y>460</y>
+    <x>700</x>
+    <y>1190</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -857,11 +851,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_124</name>
     <pv_name>$(CG)PRB1-DecimationR</pv_name>
-    <x>200</x>
-    <y>460</y>
+    <x>860</x>
+    <y>1190</y>
     <width>150</width>
     <height>30</height>
-    <transparent>true</transparent>
     <precision>0</precision>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -876,8 +869,8 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_16</name>
     <pv_name>$(CG)PRB1-Decimation</pv_name>
-    <x>420</x>
-    <y>460</y>
+    <x>1060</x>
+    <y>1190</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -892,8 +885,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_357</name>
     <text>Converting</text>
-    <x>60</x>
-    <y>340</y>
+    <x>700</x>
+    <y>1070</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -909,11 +902,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_125</name>
     <pv_name>$(CG)PRB1-ScalingR</pv_name>
-    <x>200</x>
-    <y>300</y>
+    <x>860</x>
+    <y>1030</y>
     <width>150</width>
     <height>30</height>
-    <transparent>true</transparent>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -927,11 +919,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_126</name>
     <pv_name>$(CG)PRB1-ConvertingR</pv_name>
-    <x>200</x>
-    <y>340</y>
+    <x>860</x>
+    <y>1070</y>
     <width>150</width>
     <height>30</height>
-    <transparent>true</transparent>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -952,23 +943,20 @@
     </actions>
     <pv_name>$(CG)PRB1-Recording</pv_name>
     <text>Enable</text>
-    <x>420</x>
-    <y>140</y>
+    <x>1060</x>
+    <y>860</y>
     <width>80</width>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_1</name>
     <pv_name>$(CG)PRB1-RecordingR</pv_name>
-    <x>289</x>
-    <y>140</y>
-    <off_color>
-      <color name="IO Background" red="235" green="235" blue="235">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </on_color>
+    <x>860</x>
+    <y>860</y>
+    <width>150</width>
+    <height>30</height>
+    <off_label>Not recording</off_label>
+    <on_label>Recording</on_label>
+    <square>true</square>
     <actions>
     </actions>
   </widget>
@@ -982,32 +970,15 @@
     </actions>
     <pv_name>$(CG)PRB1-Recording</pv_name>
     <text>Disable</text>
-    <x>520</x>
-    <y>140</y>
+    <x>1160</x>
+    <y>860</y>
     <width>80</width>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_358</name>
-    <text>Recording</text>
-    <x>60</x>
-    <y>140</y>
-    <width>120</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
   <widget type="combo" version="2.0.0">
     <name>Menu Button_13</name>
     <pv_name>$(CG)PRB1-Scaling</pv_name>
-    <x>420</x>
-    <y>300</y>
+    <x>1060</x>
+    <y>1030</y>
     <width>180</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -1018,8 +989,8 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_14</name>
     <pv_name>$(CG)PRB1-Converting</pv_name>
-    <x>420</x>
-    <y>340</y>
+    <x>1060</x>
+    <y>1070</y>
     <width>180</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -1030,8 +1001,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_359</name>
     <text>Tick</text>
-    <x>60</x>
-    <y>500</y>
+    <x>700</x>
+    <y>1230</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1047,11 +1018,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_127</name>
     <pv_name>$(CG)PRB1-TickValueR</pv_name>
-    <x>200</x>
-    <y>500</y>
+    <x>860</x>
+    <y>1230</y>
     <width>150</width>
     <height>30</height>
-    <transparent>true</transparent>
     <format>2</format>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1065,8 +1035,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_360</name>
     <text>Channel</text>
-    <x>60</x>
-    <y>580</y>
+    <x>700</x>
+    <y>1310</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1082,8 +1052,8 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_15</name>
     <pv_name>$(CG)PRB1-Channel</pv_name>
-    <x>420</x>
-    <y>580</y>
+    <x>1060</x>
+    <y>1310</y>
     <width>180</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -1094,11 +1064,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_128</name>
     <pv_name>$(CG)PRB1-ChannelR</pv_name>
-    <x>200</x>
-    <y>580</y>
+    <x>860</x>
+    <y>1310</y>
     <width>150</width>
     <height>30</height>
-    <transparent>true</transparent>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1112,11 +1081,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_106</name>
     <pv_name>$(P)PRC-TickValueR</pv_name>
-    <x>840</x>
-    <y>500</y>
-    <width>150</width>
+    <x>200</x>
+    <y>1230</y>
+    <width>200</width>
     <height>30</height>
-    <transparent>true</transparent>
     <format>2</format>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1130,27 +1098,31 @@
   <widget type="led" version="2.0.0">
     <name>LED_5</name>
     <pv_name>$(P)PRC-RecordingR</pv_name>
-    <x>910</x>
-    <y>140</y>
+    <x>200</x>
+    <y>860</y>
+    <width>200</width>
+    <height>30</height>
+    <off_label>Not recording</off_label>
     <off_color>
-      <color name="IO Background" red="235" green="235" blue="235">
+      <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
       </color>
     </off_color>
+    <on_label>Recording</on_label>
     <on_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
       </color>
     </on_color>
+    <square>true</square>
     <actions>
     </actions>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_97</name>
     <pv_name>$(P)PRC-ConvertingR</pv_name>
-    <x>840</x>
-    <y>340</y>
-    <width>150</width>
+    <x>200</x>
+    <y>1070</y>
+    <width>200</width>
     <height>30</height>
-    <transparent>true</transparent>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1164,11 +1136,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_96</name>
     <pv_name>$(P)PRC-ScalingR</pv_name>
-    <x>840</x>
-    <y>300</y>
-    <width>150</width>
+    <x>200</x>
+    <y>1030</y>
+    <width>200</width>
     <height>30</height>
-    <transparent>true</transparent>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1182,11 +1153,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_82</name>
     <pv_name>$(P)PRC-DecimationR</pv_name>
-    <x>840</x>
-    <y>460</y>
-    <width>150</width>
+    <x>200</x>
+    <y>1190</y>
+    <width>200</width>
     <height>30</height>
-    <transparent>true</transparent>
     <precision>0</precision>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -1201,11 +1171,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_81</name>
     <pv_name>$(P)PRC-FractionBitsR</pv_name>
-    <x>840</x>
-    <y>260</y>
-    <width>150</width>
+    <x>200</x>
+    <y>990</y>
+    <width>200</width>
     <height>30</height>
-    <transparent>true</transparent>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -1220,11 +1189,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_80</name>
     <pv_name>$(P)PRC-MemoryAddressR</pv_name>
-    <x>840</x>
-    <y>220</y>
-    <width>150</width>
+    <x>200</x>
+    <y>950</y>
+    <width>200</width>
     <height>30</height>
-    <transparent>true</transparent>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -1239,11 +1207,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_3</name>
     <pv_name>$(P)PRC-OffsetR</pv_name>
-    <x>840</x>
-    <y>420</y>
-    <width>150</width>
+    <x>200</x>
+    <y>1150</y>
+    <width>200</width>
     <height>30</height>
-    <transparent>true</transparent>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1257,11 +1224,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_2</name>
     <pv_name>$(P)PRC-FactorR</pv_name>
-    <x>840</x>
-    <y>380</y>
-    <width>150</width>
+    <x>200</x>
+    <y>1110</y>
+    <width>200</width>
     <height>30</height>
-    <transparent>true</transparent>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1275,11 +1241,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_1</name>
     <pv_name>$(P)PRC-NumSamplesR</pv_name>
-    <x>840</x>
-    <y>180</y>
-    <width>150</width>
+    <x>200</x>
+    <y>910</y>
+    <width>200</width>
     <height>30</height>
-    <transparent>true</transparent>
     <precision>0</precision>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -1294,8 +1259,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_3</name>
     <text>Num samples</text>
-    <x>700</x>
-    <y>180</y>
+    <x>60</x>
+    <y>910</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1311,8 +1276,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_7</name>
     <text>Factor</text>
-    <x>700</x>
-    <y>380</y>
+    <x>60</x>
+    <y>1110</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1328,8 +1293,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_8</name>
     <text>Offset</text>
-    <x>700</x>
-    <y>420</y>
+    <x>60</x>
+    <y>1150</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1345,8 +1310,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_9</name>
     <text>Scaling</text>
-    <x>700</x>
-    <y>300</y>
+    <x>60</x>
+    <y>1030</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1362,8 +1327,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_296</name>
     <text>Memory Address</text>
-    <x>700</x>
-    <y>220</y>
+    <x>60</x>
+    <y>950</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1379,8 +1344,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_297</name>
     <text>Fraction bits</text>
-    <x>700</x>
-    <y>260</y>
+    <x>60</x>
+    <y>990</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1396,8 +1361,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_298</name>
     <text>Decimation</text>
-    <x>700</x>
-    <y>460</y>
+    <x>60</x>
+    <y>1190</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1413,25 +1378,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_311</name>
     <text>Converting</text>
-    <x>700</x>
-    <y>340</y>
-    <width>120</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_314</name>
-    <text>Recording</text>
-    <x>700</x>
-    <y>140</y>
+    <x>60</x>
+    <y>1070</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1447,8 +1395,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_331</name>
     <text>Tick</text>
-    <x>700</x>
-    <y>500</y>
+    <x>60</x>
+    <y>1230</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1463,10 +1411,10 @@
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_15</name>
-    <x>1320</x>
-    <y>970</y>
-    <width>960</width>
-    <height>110</height>
+    <x>1520</x>
+    <y>120</y>
+    <width>340</width>
+    <height>630</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -1478,8 +1426,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_310</name>
     <text>Name</text>
-    <x>1340</x>
-    <y>990</y>
+    <x>1540</x>
+    <y>250</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1495,8 +1443,8 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_95</name>
     <pv_name>$(P)PRC-TR1-Name</pv_name>
-    <x>1480</x>
-    <y>990</y>
+    <x>1680</x>
+    <y>250</y>
     <width>160</width>
     <height>30</height>
     <format>6</format>
@@ -1513,8 +1461,8 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_10</name>
     <pv_name>$(P)PRC-TR1-ArrayRate_RBV</pv_name>
-    <x>1780</x>
-    <y>990</y>
+    <x>1680</x>
+    <y>390</y>
     <width>160</width>
     <height>30</height>
     <format>1</format>
@@ -1531,9 +1479,9 @@
   <widget type="label" version="2.0.0">
     <name>Label_16</name>
     <text>Array rate</text>
-    <x>1670</x>
-    <y>990</y>
-    <width>90</width>
+    <x>1540</x>
+    <y>390</y>
+    <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -1548,8 +1496,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_15</name>
     <text>Array counter</text>
-    <x>1340</x>
-    <y>1030</y>
+    <x>1540</x>
+    <y>320</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1565,8 +1513,8 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_9</name>
     <pv_name>$(P)PRC-TR1-ArrayCounter_RBV</pv_name>
-    <x>1480</x>
-    <y>1030</y>
+    <x>1680</x>
+    <y>320</y>
     <width>160</width>
     <height>30</height>
     <format>1</format>
@@ -1583,8 +1531,8 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_8</name>
     <pv_name>$(P)PRC-TR1-DataType_RBV</pv_name>
-    <x>2100</x>
-    <y>990</y>
+    <x>1680</x>
+    <y>530</y>
     <width>160</width>
     <height>30</height>
     <format>6</format>
@@ -1601,8 +1549,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_14</name>
     <text>Data type</text>
-    <x>1960</x>
-    <y>990</y>
+    <x>1540</x>
+    <y>530</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1618,8 +1566,8 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_6</name>
     <pv_name>$(P)PRC-TR1-ArraySize0_RBV</pv_name>
-    <x>1780</x>
-    <y>1030</y>
+    <x>1680</x>
+    <y>460</y>
     <width>160</width>
     <height>30</height>
     <format>1</format>
@@ -1636,9 +1584,9 @@
   <widget type="label" version="2.0.0">
     <name>Label_13</name>
     <text>Array Size</text>
-    <x>1670</x>
-    <y>1030</y>
-    <width>90</width>
+    <x>1540</x>
+    <y>460</y>
+    <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -1653,8 +1601,8 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)PRC-TR1-TimePerPoint</pv_name>
-    <x>2100</x>
-    <y>1030</y>
+    <x>1680</x>
+    <y>600</y>
     <width>160</width>
     <height>30</height>
     <format>2</format>
@@ -1670,8 +1618,8 @@
   <widget type="label" version="2.0.0">
     <name>Label_2</name>
     <text>Time point value</text>
-    <x>1960</x>
-    <y>1030</y>
+    <x>1540</x>
+    <y>600</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1686,10 +1634,10 @@
   </widget>
   <widget type="xyplot" version="2.0.0">
     <name>XY Graph_1</name>
-    <x>1340</x>
+    <x>60</x>
     <y>140</y>
-    <width>921</width>
-    <height>790</height>
+    <width>1420</width>
+    <height>590</height>
     <background_color>
       <color name="Transparent" red="255" green="255" blue="255" alpha="0">
       </color>
@@ -2099,9 +2047,9 @@
   <widget type="label" version="2.0.0">
     <name>BGGrey02-title_21</name>
     <text>Arraydata</text>
-    <x>1300</x>
+    <x>20</x>
     <y>70</y>
-    <width>1000</width>
+    <width>1860</width>
     <height>50</height>
     <font>
       <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
diff --git a/99-Shared/adsis8300bcm/raw.bob b/99-Shared/adsis8300bcm/raw.bob
index d09085c..56be692 100644
--- a/99-Shared/adsis8300bcm/raw.bob
+++ b/99-Shared/adsis8300bcm/raw.bob
@@ -3,20 +3,44 @@
   <name>$(P) RAW</name>
   <x>470</x>
   <y>197</y>
-  <width>2320</width>
-  <height>1067</height>
-  <background_color>
-    <color red="240" green="240" blue="240">
-    </color>
-  </background_color>
+  <width>1660</width>
+  <height>840</height>
   <actions>
   </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_4</name>
+    <x>20</x>
+    <y>70</y>
+    <width>620</width>
+    <height>750</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_12</name>
+    <x>40</x>
+    <y>210</y>
+    <width>580</width>
+    <height>470</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-titlebar_6</name>
     <x>660</x>
     <y>70</y>
     <width>980</width>
-    <height>890</height>
+    <height>750</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -28,7 +52,7 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_14</name>
     <x>680</x>
-    <y>830</y>
+    <y>690</y>
     <width>940</width>
     <height>110</height>
     <line_width>0</line_width>
@@ -44,7 +68,7 @@
     <x>680</x>
     <y>120</y>
     <width>940</width>
-    <height>690</height>
+    <height>550</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -72,24 +96,10 @@
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-titlebar_4</name>
-    <x>20</x>
-    <y>70</y>
-    <width>620</width>
-    <height>590</height>
-    <line_width>0</line_width>
-    <background_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
-      </color>
-    </background_color>
-    <corner_width>10</corner_width>
-    <corner_height>10</corner_height>
-  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_11</name>
     <x>40</x>
-    <y>570</y>
+    <y>730</y>
     <width>580</width>
     <height>70</height>
     <line_width>0</line_width>
@@ -105,7 +115,7 @@
     <class>TITLE-BAR</class>
     <x use_class="true">0</x>
     <y use_class="true">0</y>
-    <width>2320</width>
+    <width>1660</width>
     <height use_class="true">50</height>
     <line_width use_class="true">0</line_width>
     <background_color use_class="true">
@@ -119,7 +129,7 @@
     <text>$(P)</text>
     <x use_class="true">20</x>
     <y use_class="true">0</y>
-    <width>2280</width>
+    <width>1620</width>
     <height use_class="true">50</height>
     <font use_class="true">
       <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -139,7 +149,7 @@
     <x>40</x>
     <y>120</y>
     <width>580</width>
-    <height>430</height>
+    <height>70</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -169,10 +179,10 @@
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_3</name>
-    <text>Num samples</text>
-    <x>80</x>
-    <y>180</y>
-    <width>120</width>
+    <text>Number of Samples</text>
+    <x>50</x>
+    <y>230</y>
+    <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -188,7 +198,7 @@
     <name>Text Update_1</name>
     <pv_name>$(P)RAW-NumSamplesR</pv_name>
     <x>220</x>
-    <y>180</y>
+    <y>230</y>
     <width>180</width>
     <height>30</height>
     <precision>0</precision>
@@ -206,7 +216,7 @@
     <name>Label_7</name>
     <text>Factor</text>
     <x>80</x>
-    <y>380</y>
+    <y>480</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -223,7 +233,7 @@
     <name>Text Update_2</name>
     <pv_name>$(P)RAW-FactorR</pv_name>
     <x>220</x>
-    <y>380</y>
+    <y>480</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -240,7 +250,7 @@
     <name>Text Input_1</name>
     <pv_name>$(P)RAW-Factor</pv_name>
     <x>420</x>
-    <y>380</y>
+    <y>480</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -256,7 +266,7 @@
     <name>Label_8</name>
     <text>Offset</text>
     <x>80</x>
-    <y>420</y>
+    <y>530</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -273,7 +283,7 @@
     <name>Text Update_3</name>
     <pv_name>$(P)RAW-OffsetR</pv_name>
     <x>220</x>
-    <y>420</y>
+    <y>530</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -290,7 +300,7 @@
     <name>Text Input_2</name>
     <pv_name>$(P)RAW-Offset</pv_name>
     <x>420</x>
-    <y>420</y>
+    <y>530</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -306,7 +316,7 @@
     <name>Label_9</name>
     <text>Scaling</text>
     <x>80</x>
-    <y>300</y>
+    <y>380</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -323,7 +333,7 @@
     <name>Label_296</name>
     <text>Memory Address</text>
     <x>80</x>
-    <y>220</y>
+    <y>280</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -340,7 +350,7 @@
     <name>Text Update_80</name>
     <pv_name>$(P)RAW-MemoryAddressR</pv_name>
     <x>220</x>
-    <y>220</y>
+    <y>280</y>
     <width>180</width>
     <height>30</height>
     <format>1</format>
@@ -358,7 +368,7 @@
     <name>Text Input_8</name>
     <pv_name>$(P)RAW-MemoryAddress</pv_name>
     <x>420</x>
-    <y>220</y>
+    <y>280</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -374,7 +384,7 @@
     <name>Label_297</name>
     <text>Fraction bits</text>
     <x>80</x>
-    <y>260</y>
+    <y>330</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -391,7 +401,7 @@
     <name>Text Update_81</name>
     <pv_name>$(P)RAW-FractionBitsR</pv_name>
     <x>220</x>
-    <y>260</y>
+    <y>330</y>
     <width>180</width>
     <height>30</height>
     <format>1</format>
@@ -409,7 +419,7 @@
     <name>Text Input_9</name>
     <pv_name>$(P)RAW-FractionBits</pv_name>
     <x>420</x>
-    <y>260</y>
+    <y>330</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -425,7 +435,7 @@
     <name>Label_298</name>
     <text>Decimation</text>
     <x>80</x>
-    <y>460</y>
+    <y>580</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -442,7 +452,7 @@
     <name>Text Update_82</name>
     <pv_name>$(P)RAW-DecimationR</pv_name>
     <x>220</x>
-    <y>460</y>
+    <y>580</y>
     <width>180</width>
     <height>30</height>
     <precision>0</precision>
@@ -460,7 +470,7 @@
     <name>Text Input_10</name>
     <pv_name>$(P)RAW-Decimation</pv_name>
     <x>420</x>
-    <y>460</y>
+    <y>580</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -476,7 +486,7 @@
     <name>Label_311</name>
     <text>Converting</text>
     <x>80</x>
-    <y>340</y>
+    <y>430</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -493,7 +503,7 @@
     <name>Text Update_96</name>
     <pv_name>$(P)RAW-ScalingR</pv_name>
     <x>220</x>
-    <y>300</y>
+    <y>380</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -510,7 +520,7 @@
     <name>Text Update_97</name>
     <pv_name>$(P)RAW-ConvertingR</pv_name>
     <x>220</x>
-    <y>340</y>
+    <y>430</y>
     <width>180</width>
     <height>30</height>
     <show_units>false</show_units>
@@ -588,7 +598,7 @@
     <name>Menu Button_2</name>
     <pv_name>$(P)RAW-Scaling</pv_name>
     <x>420</x>
-    <y>300</y>
+    <y>380</y>
     <width>180</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -600,7 +610,7 @@
     <name>Menu Button_3</name>
     <pv_name>$(P)RAW-Converting</pv_name>
     <x>420</x>
-    <y>340</y>
+    <y>430</y>
     <width>180</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -612,7 +622,7 @@
     <name>Label_2</name>
     <text>Time point value</text>
     <x>1310</x>
-    <y>890</y>
+    <y>750</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -629,7 +639,7 @@
     <name>Text Update</name>
     <pv_name>$(P)RAW-TR1-TimePerPoint</pv_name>
     <x>1450</x>
-    <y>890</y>
+    <y>750</y>
     <width>150</width>
     <height>30</height>
     <format>2</format>
@@ -646,7 +656,7 @@
     <name>Label_13</name>
     <text>Array Size</text>
     <x>1030</x>
-    <y>890</y>
+    <y>750</y>
     <width>80</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -663,7 +673,7 @@
     <name>Text Update_6</name>
     <pv_name>$(P)RAW-TR1-ArraySize0_RBV</pv_name>
     <x>1130</x>
-    <y>890</y>
+    <y>750</y>
     <width>150</width>
     <height>30</height>
     <format>1</format>
@@ -681,7 +691,7 @@
     <name>Label_14</name>
     <text>Data type</text>
     <x>1310</x>
-    <y>850</y>
+    <y>710</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -698,7 +708,7 @@
     <name>Text Update_8</name>
     <pv_name>$(P)RAW-TR1-DataType_RBV</pv_name>
     <x>1450</x>
-    <y>850</y>
+    <y>710</y>
     <width>150</width>
     <height>30</height>
     <format>6</format>
@@ -716,7 +726,7 @@
     <name>Text Update_9</name>
     <pv_name>$(P)RAW-TR1-ArrayCounter_RBV</pv_name>
     <x>840</x>
-    <y>890</y>
+    <y>750</y>
     <width>150</width>
     <height>30</height>
     <format>1</format>
@@ -734,7 +744,7 @@
     <name>Label_15</name>
     <text>Array counter</text>
     <x>700</x>
-    <y>890</y>
+    <y>750</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -751,7 +761,7 @@
     <name>Label_16</name>
     <text>Array rate</text>
     <x>1030</x>
-    <y>850</y>
+    <y>710</y>
     <width>80</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -768,7 +778,7 @@
     <name>Text Update_10</name>
     <pv_name>$(P)RAW-TR1-ArrayRate_RBV</pv_name>
     <x>1130</x>
-    <y>850</y>
+    <y>710</y>
     <width>150</width>
     <height>30</height>
     <format>1</format>
@@ -786,7 +796,7 @@
     <name>Text Update_95</name>
     <pv_name>$(P)RAW-TR1-Name</pv_name>
     <x>840</x>
-    <y>850</y>
+    <y>710</y>
     <width>150</width>
     <height>30</height>
     <format>6</format>
@@ -804,7 +814,7 @@
     <name>Label_310</name>
     <text>Name</text>
     <x>700</x>
-    <y>850</y>
+    <y>710</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -821,7 +831,7 @@
     <name>Label_331</name>
     <text>Tick</text>
     <x>80</x>
-    <y>500</y>
+    <y>630</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -838,7 +848,7 @@
     <name>Text Update_106</name>
     <pv_name>$(P)RAW-TickValueR</pv_name>
     <x>220</x>
-    <y>500</y>
+    <y>630</y>
     <width>180</width>
     <height>30</height>
     <format>2</format>
@@ -858,7 +868,7 @@
       <R>RAW-TR1-</R>
     </macros>
     <x>60</x>
-    <y>590</y>
+    <y>750</y>
     <width>540</width>
     <height>30</height>
     <resize>2</resize>
@@ -874,7 +884,7 @@
     <x>700</x>
     <y>140</y>
     <width>900</width>
-    <height>650</height>
+    <height>510</height>
     <background_color>
       <color name="Transparent" red="255" green="255" blue="255" alpha="0">
       </color>
@@ -971,4 +981,22 @@
       </trace>
     </traces>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_17</name>
+    <text>Channel</text>
+    <x>20</x>
+    <y>690</y>
+    <width>620</width>
+    <height>40</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="20.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
 </display>
diff --git a/99-Shared/adsis8300bcm/trace_item.bob b/99-Shared/adsis8300bcm/trace_item.bob
index 918e5aa..90e7e9b 100644
--- a/99-Shared/adsis8300bcm/trace_item.bob
+++ b/99-Shared/adsis8300bcm/trace_item.bob
@@ -25,16 +25,8 @@
   <widget type="led" version="2.0.0">
     <name>LED_1</name>
     <pv_name>$(P)$(R)EnableCallbacks_RBV</pv_name>
-    <x>245</x>
+    <x>15</x>
     <y>5</y>
-    <off_color>
-      <color name="IO Background" red="235" green="235" blue="235">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </on_color>
     <actions>
     </actions>
   </widget>
@@ -67,12 +59,9 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)Name</pv_name>
+    <x>50</x>
     <width>220</width>
     <height>30</height>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
-- 
GitLab