diff --git a/99-Shared/_original/10-Top/bcmioc/instance.bob b/99-Shared/_original/10-Top/bcmioc/instance.bob
index 90e98d4eab2d3e751840483604341296b3c656f8..c65cbbd85c25403c007d2d01b9c1e49903e9d3d9 100644
--- a/99-Shared/_original/10-Top/bcmioc/instance.bob
+++ b/99-Shared/_original/10-Top/bcmioc/instance.bob
@@ -14,7 +14,7 @@
     <width>300</width>
     <height>261</height>
     <font>
-      <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
+      <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
       </font>
     </font>
     <horizontal_alignment>1</horizontal_alignment>
@@ -31,7 +31,7 @@
     <name>Menu Button_1</name>
     <actions>
       <action type="open_display">
-        <file>../../99-Shared/adsis8300bcm/bcm.bob</file>
+        <file>../../adsis8300bcm/bcm.bob</file>
         <macros>
           <P>$(CONTROL_GROUP):$(AMC_NAME):</P>
           <R></R>
@@ -58,7 +58,7 @@
     <name>Menu Button_2</name>
     <actions>
       <action type="open_display">
-        <file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
+        <file>../../adsis8300bcm/bcm_instance.bob</file>
         <macros>
           <CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
           <P>$(SYSTEM1):</P>
diff --git a/99-Shared/adsis8300/system.bob b/99-Shared/adsis8300/system.bob
index d65a23be89acce5bfad55ed3d691e8bff40fe26f..be2e80f58cdb7740186f960be3b34d08931eba23 100644
--- a/99-Shared/adsis8300/system.bob
+++ b/99-Shared/adsis8300/system.bob
@@ -1,48 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>$(P)$(R) System</name>
-  <width>1360</width>
-  <height>930</height>
+  <width>1320</width>
+  <height>840</height>
   <actions>
   </actions>
-  <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>1360</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="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>1320</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="rectangle" version="2.0.0">
     <name>Rectangle_1</name>
-    <x>690</x>
-    <y>70</y>
+    <x>670</x>
     <width>650</width>
     <height>840</height>
     <line_width>0</line_width>
@@ -63,8 +28,6 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>Rectangle</name>
-    <x>20</x>
-    <y>70</y>
     <width>650</width>
     <height>840</height>
     <line_width>0</line_width>
@@ -85,8 +48,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_13</name>
-    <x>40</x>
-    <y>450</y>
+    <x>20</x>
+    <y>380</y>
     <width>610</width>
     <height>250</height>
     <line_width>0</line_width>
@@ -99,8 +62,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_12</name>
-    <x>710</x>
-    <y>500</y>
+    <x>690</x>
+    <y>430</y>
     <width>610</width>
     <height>390</height>
     <line_width>0</line_width>
@@ -113,8 +76,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_11</name>
-    <x>40</x>
-    <y>760</y>
+    <x>20</x>
+    <y>690</y>
     <width>610</width>
     <height>130</height>
     <line_width>0</line_width>
@@ -127,8 +90,8 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_9</name>
-    <x>40</x>
-    <y>120</y>
+    <x>20</x>
+    <y>50</y>
     <width>610</width>
     <height>270</height>
     <line_width>0</line_width>
@@ -142,8 +105,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_213</name>
     <text>RTM type:</text>
-    <x>730</x>
-    <y>800</y>
+    <x>710</x>
+    <y>730</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -159,8 +122,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_101</name>
     <pv_name>$(P)$(R)RtmTypeR</pv_name>
-    <x>900</x>
-    <y>800</y>
+    <x>880</x>
+    <y>730</y>
     <width>190</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -176,8 +139,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_214</name>
     <text>IRQ Poll:</text>
-    <x>730</x>
-    <y>840</y>
+    <x>710</x>
+    <y>770</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -193,8 +156,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_102</name>
     <pv_name>$(P)$(R)IrqPollR</pv_name>
-    <x>900</x>
-    <y>840</y>
+    <x>880</x>
+    <y>770</y>
     <width>190</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -210,8 +173,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_40</name>
     <pv_name>$(P)$(R)TickValueR</pv_name>
-    <x>900</x>
-    <y>640</y>
+    <x>880</x>
+    <y>570</y>
     <width>190</width>
     <height>30</height>
     <format>2</format>
@@ -228,8 +191,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_1</name>
     <pv_name>$(P)$(R)SamplingFrequencyR</pv_name>
-    <x>900</x>
-    <y>600</y>
+    <x>880</x>
+    <y>530</y>
     <width>190</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -245,8 +208,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_1</name>
     <text>Sampling frequency:</text>
-    <x>730</x>
-    <y>600</y>
+    <x>710</x>
+    <y>530</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -262,8 +225,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_2</name>
     <text>Time tick:</text>
-    <x>730</x>
-    <y>640</y>
+    <x>710</x>
+    <y>570</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -279,8 +242,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_198</name>
     <text>Clock source:</text>
-    <x>730</x>
-    <y>520</y>
+    <x>710</x>
+    <y>450</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -296,8 +259,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_199</name>
     <text>Clock divider:</text>
-    <x>730</x>
-    <y>560</y>
+    <x>710</x>
+    <y>490</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -313,8 +276,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_200</name>
     <text>Trigger source:</text>
-    <x>730</x>
-    <y>680</y>
+    <x>710</x>
+    <y>610</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -330,8 +293,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_201</name>
     <text>Trigger line:</text>
-    <x>730</x>
-    <y>720</y>
+    <x>710</x>
+    <y>650</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -347,8 +310,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_202</name>
     <text>Trigger repeat:</text>
-    <x>730</x>
-    <y>760</y>
+    <x>710</x>
+    <y>690</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -364,8 +327,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_85</name>
     <pv_name>$(P)$(R)ClockSourceR</pv_name>
-    <x>900</x>
-    <y>520</y>
+    <x>880</x>
+    <y>450</y>
     <width>190</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -381,8 +344,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_86</name>
     <pv_name>$(P)$(R)ClockDividerR</pv_name>
-    <x>900</x>
-    <y>560</y>
+    <x>880</x>
+    <y>490</y>
     <width>190</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -398,8 +361,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_87</name>
     <pv_name>$(P)$(R)TriggerSourceR</pv_name>
-    <x>900</x>
-    <y>680</y>
+    <x>880</x>
+    <y>610</y>
     <width>190</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -415,8 +378,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_88</name>
     <pv_name>$(P)$(R)TriggerExternalLineR</pv_name>
-    <x>900</x>
-    <y>720</y>
+    <x>880</x>
+    <y>650</y>
     <width>190</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -432,8 +395,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_89</name>
     <pv_name>$(P)$(R)TriggerRepeatR</pv_name>
-    <x>900</x>
-    <y>760</y>
+    <x>880</x>
+    <y>690</y>
     <width>190</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -449,8 +412,8 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button_15</name>
     <pv_name>$(P)$(R)TriggerSource</pv_name>
-    <x>1110</x>
-    <y>680</y>
+    <x>1090</x>
+    <y>610</y>
     <width>190</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -461,8 +424,8 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)ClockSource</pv_name>
-    <x>1110</x>
-    <y>520</y>
+    <x>1090</x>
+    <y>450</y>
     <width>190</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -473,8 +436,8 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button_19</name>
     <pv_name>$(P)$(R)IrqPoll</pv_name>
-    <x>1110</x>
-    <y>840</y>
+    <x>1090</x>
+    <y>770</y>
     <width>190</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -485,8 +448,8 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button_18</name>
     <pv_name>$(P)$(R)RtmType</pv_name>
-    <x>1110</x>
-    <y>800</y>
+    <x>1090</x>
+    <y>730</y>
     <width>190</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -497,8 +460,8 @@ $(pv_value)</tooltip>
   <widget type="spinner" version="2.0.0">
     <name>Spinner_7</name>
     <pv_name>$(P)$(R)TriggerRepeat</pv_name>
-    <x>1110</x>
-    <y>760</y>
+    <x>1090</x>
+    <y>690</y>
     <width>190</width>
     <height>30</height>
     <format>0</format>
@@ -512,8 +475,8 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_13</name>
     <pv_name>$(P)$(R)SamplingFrequency</pv_name>
-    <x>1110</x>
-    <y>600</y>
+    <x>1090</x>
+    <y>530</y>
     <width>190</width>
     <height>30</height>
     <actions>
@@ -527,8 +490,8 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button_16</name>
     <pv_name>$(P)$(R)TriggerExternalLine</pv_name>
-    <x>1110</x>
-    <y>720</y>
+    <x>1090</x>
+    <y>650</y>
     <width>190</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -539,8 +502,8 @@ $(pv_value)</tooltip>
   <widget type="spinner" version="2.0.0">
     <name>Spinner_6</name>
     <pv_name>$(P)$(R)ClockDivider</pv_name>
-    <x>1110</x>
-    <y>560</y>
+    <x>1090</x>
+    <y>490</y>
     <width>190</width>
     <height>30</height>
     <format>0</format>
@@ -552,8 +515,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_207</name>
     <text>Model:</text>
-    <x>60</x>
-    <y>180</y>
+    <x>40</x>
+    <y>110</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -569,8 +532,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_96</name>
     <pv_name>$(P)$(R)Model_RBV</pv_name>
-    <x>230</x>
-    <y>180</y>
+    <x>210</x>
+    <y>110</y>
     <width>190</width>
     <height>30</height>
     <format>6</format>
@@ -587,8 +550,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_208</name>
     <text>Firmware version:</text>
-    <x>60</x>
-    <y>220</y>
+    <x>40</x>
+    <y>150</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -604,8 +567,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_97</name>
     <pv_name>$(P)$(R)FirmwareVersion_RBV</pv_name>
-    <x>230</x>
-    <y>220</y>
+    <x>210</x>
+    <y>150</y>
     <width>190</width>
     <height>30</height>
     <format>6</format>
@@ -622,8 +585,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_209</name>
     <text>Serial number:</text>
-    <x>60</x>
-    <y>260</y>
+    <x>40</x>
+    <y>190</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -639,8 +602,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_98</name>
     <pv_name>$(P)$(R)SerialNumber_RBV</pv_name>
-    <x>230</x>
-    <y>260</y>
+    <x>210</x>
+    <y>190</y>
     <width>190</width>
     <height>30</height>
     <format>6</format>
@@ -657,8 +620,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_210</name>
     <text>Memory size:</text>
-    <x>60</x>
-    <y>300</y>
+    <x>40</x>
+    <y>230</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -674,8 +637,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_99</name>
     <pv_name>$(P)$(R)MemorySizeR</pv_name>
-    <x>230</x>
-    <y>300</y>
+    <x>210</x>
+    <y>230</y>
     <width>190</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -691,8 +654,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_211</name>
     <text>Manufacturer:</text>
-    <x>60</x>
-    <y>140</y>
+    <x>40</x>
+    <y>70</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -708,8 +671,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_100</name>
     <pv_name>$(P)$(R)Manufacturer_RBV</pv_name>
-    <x>230</x>
-    <y>140</y>
+    <x>210</x>
+    <y>70</y>
     <width>190</width>
     <height>30</height>
     <format>6</format>
@@ -726,8 +689,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_212</name>
     <text>Device path:</text>
-    <x>60</x>
-    <y>340</y>
+    <x>40</x>
+    <y>270</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -743,8 +706,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_101</name>
     <pv_name>$(P)$(R)DevicePathR</pv_name>
-    <x>230</x>
-    <y>340</y>
+    <x>210</x>
+    <y>270</y>
     <width>190</width>
     <height>30</height>
     <format>6</format>
@@ -761,8 +724,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_104</name>
     <pv_name>$(P)$(R)MessageR</pv_name>
-    <x>60</x>
-    <y>780</y>
+    <x>40</x>
+    <y>710</y>
     <width>570</width>
     <height>90</height>
     <background_color>
@@ -781,8 +744,8 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_2</name>
     <pv_name>$(P)$(R)NumSamples</pv_name>
-    <x>440</x>
-    <y>570</y>
+    <x>420</x>
+    <y>500</y>
     <width>190</width>
     <height>30</height>
     <actions>
@@ -796,8 +759,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_219</name>
     <text>Number of samples:</text>
-    <x>60</x>
-    <y>570</y>
+    <x>40</x>
+    <y>500</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -813,8 +776,8 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_3</name>
     <pv_name>$(P)$(R)ArrayCounter</pv_name>
-    <x>440</x>
-    <y>610</y>
+    <x>420</x>
+    <y>540</y>
     <width>190</width>
     <height>30</height>
     <actions>
@@ -828,8 +791,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_220</name>
     <text>No. of acquisitions:</text>
-    <x>60</x>
-    <y>610</y>
+    <x>40</x>
+    <y>540</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -845,8 +808,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_221</name>
     <text>Acquire:</text>
-    <x>60</x>
-    <y>470</y>
+    <x>40</x>
+    <y>400</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -869,8 +832,8 @@ $(pv_value)</tooltip>
     </actions>
     <pv_name>$(P)$(R)Acquire</pv_name>
     <text>Start</text>
-    <x>270</x>
-    <y>470</y>
+    <x>250</x>
+    <y>400</y>
     <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -887,8 +850,8 @@ $(pv_value)</tooltip>
     </actions>
     <pv_name>$(P)$(R)Acquire</pv_name>
     <text>Stop</text>
-    <x>360</x>
-    <y>470</y>
+    <x>340</x>
+    <y>400</y>
     <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -898,8 +861,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_105</name>
     <pv_name>$(P)$(R)NumSamplesR</pv_name>
-    <x>230</x>
-    <y>570</y>
+    <x>210</x>
+    <y>500</y>
     <width>190</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -915,8 +878,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_106</name>
     <pv_name>$(P)$(R)ArrayCounter_RBV</pv_name>
-    <x>230</x>
-    <y>610</y>
+    <x>210</x>
+    <y>540</y>
     <width>190</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -941,8 +904,8 @@ $(pv_value)</tooltip>
       </action>
     </actions>
     <text>Asyn</text>
-    <x>270</x>
-    <y>520</y>
+    <x>250</x>
+    <y>450</y>
     <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
@@ -953,28 +916,16 @@ $(pv_value)</tooltip>
   <widget type="led" version="2.0.0">
     <name>LED</name>
     <pv_name>$(P)$(R)Acquire</pv_name>
-    <x>230</x>
-    <y>475</y>
-    <off_color>
-      <color name="IO Background" red="235" green="235" blue="235">
-      </color>
-    </off_color>
-    <foreground_color>
-      <color red="192" green="192" blue="192">
-      </color>
-    </foreground_color>
-    <line_color>
-      <color red="150" green="150" blue="150">
-      </color>
-    </line_color>
+    <x>210</x>
+    <y>405</y>
     <actions>
     </actions>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_234</name>
     <text>Asyn record:</text>
-    <x>60</x>
-    <y>520</y>
+    <x>40</x>
+    <y>450</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -990,8 +941,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_235</name>
     <text>Acquisition rate:</text>
-    <x>60</x>
-    <y>650</y>
+    <x>40</x>
+    <y>580</y>
     <width>150</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1007,8 +958,8 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_119</name>
     <pv_name>$(P)$(R)ArrayRate_RBV</pv_name>
-    <x>230</x>
-    <y>650</y>
+    <x>210</x>
+    <y>580</y>
     <width>190</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -1024,8 +975,8 @@ $(pv_value)</tooltip>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_2</name>
     <file>sis8300-evr.bob</file>
-    <x>710</x>
-    <y>120</y>
+    <x>690</x>
+    <y>50</y>
     <width>610</width>
     <height>310</height>
     <resize>2</resize>
@@ -1039,8 +990,7 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>BGGrey02-title_18</name>
     <text>Driver message</text>
-    <x>10</x>
-    <y>710</y>
+    <y>640</y>
     <width>650</width>
     <height>50</height>
     <font>
@@ -1058,8 +1008,7 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>BGGrey02-title_19</name>
     <text>EVR settings</text>
-    <x>690</x>
-    <y>70</y>
+    <x>670</x>
     <width>650</width>
     <height>50</height>
     <font>
@@ -1077,8 +1026,6 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>BGGrey02-title_20</name>
     <text>Device Information</text>
-    <x>20</x>
-    <y>70</y>
     <width>650</width>
     <height>50</height>
     <font>
@@ -1096,8 +1043,8 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>BGGrey02-title_21</name>
     <text>Timing Settings</text>
-    <x>690</x>
-    <y>450</y>
+    <x>670</x>
+    <y>380</y>
     <width>650</width>
     <height>50</height>
     <font>
@@ -1115,8 +1062,7 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>BGGrey02-title_22</name>
     <text>Acquisition Settings</text>
-    <x>20</x>
-    <y>400</y>
+    <y>330</y>
     <width>650</width>
     <height>50</height>
     <font>
diff --git a/99-Shared/adsis8300/system_top.bob b/99-Shared/adsis8300/system_top.bob
new file mode 100644
index 0000000000000000000000000000000000000000..890f2ca614c9bbbdeeac1cc36dcafa232d757eb6
--- /dev/null
+++ b/99-Shared/adsis8300/system_top.bob
@@ -0,0 +1,1122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>$(P)$(R) System</name>
+  <width>1360</width>
+  <height>930</height>
+  <actions>
+  </actions>
+  <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>1360</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="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>$(P) System</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1320</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="rectangle" version="2.0.0">
+    <name>Rectangle_1</name>
+    <x>690</x>
+    <y>70</y>
+    <width>650</width>
+    <height>840</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>5</corner_height>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <x>20</x>
+    <y>70</y>
+    <width>650</width>
+    <height>840</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>5</corner_height>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_13</name>
+    <x>40</x>
+    <y>450</y>
+    <width>610</width>
+    <height>250</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_12</name>
+    <x>710</x>
+    <y>500</y>
+    <width>610</width>
+    <height>390</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>760</y>
+    <width>610</width>
+    <height>130</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>40</x>
+    <y>120</y>
+    <width>610</width>
+    <height>270</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_213</name>
+    <text>RTM type:</text>
+    <x>730</x>
+    <y>800</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)$(R)RtmTypeR</pv_name>
+    <x>900</x>
+    <y>800</y>
+    <width>190</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_214</name>
+    <text>IRQ Poll:</text>
+    <x>730</x>
+    <y>840</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)$(R)IrqPollR</pv_name>
+    <x>900</x>
+    <y>840</y>
+    <width>190</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="textupdate" version="2.0.0">
+    <name>Text Update_40</name>
+    <pv_name>$(P)$(R)TickValueR</pv_name>
+    <x>900</x>
+    <y>640</y>
+    <width>190</width>
+    <height>30</height>
+    <format>2</format>
+    <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="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(P)$(R)SamplingFrequencyR</pv_name>
+    <x>900</x>
+    <y>600</y>
+    <width>190</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_1</name>
+    <text>Sampling frequency:</text>
+    <x>730</x>
+    <y>600</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_2</name>
+    <text>Time tick:</text>
+    <x>730</x>
+    <y>640</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_198</name>
+    <text>Clock source:</text>
+    <x>730</x>
+    <y>520</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_199</name>
+    <text>Clock divider:</text>
+    <x>730</x>
+    <y>560</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_200</name>
+    <text>Trigger source:</text>
+    <x>730</x>
+    <y>680</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_201</name>
+    <text>Trigger line:</text>
+    <x>730</x>
+    <y>720</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_202</name>
+    <text>Trigger repeat:</text>
+    <x>730</x>
+    <y>760</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_85</name>
+    <pv_name>$(P)$(R)ClockSourceR</pv_name>
+    <x>900</x>
+    <y>520</y>
+    <width>190</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="textupdate" version="2.0.0">
+    <name>Text Update_86</name>
+    <pv_name>$(P)$(R)ClockDividerR</pv_name>
+    <x>900</x>
+    <y>560</y>
+    <width>190</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="textupdate" version="2.0.0">
+    <name>Text Update_87</name>
+    <pv_name>$(P)$(R)TriggerSourceR</pv_name>
+    <x>900</x>
+    <y>680</y>
+    <width>190</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="textupdate" version="2.0.0">
+    <name>Text Update_88</name>
+    <pv_name>$(P)$(R)TriggerExternalLineR</pv_name>
+    <x>900</x>
+    <y>720</y>
+    <width>190</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="textupdate" version="2.0.0">
+    <name>Text Update_89</name>
+    <pv_name>$(P)$(R)TriggerRepeatR</pv_name>
+    <x>900</x>
+    <y>760</y>
+    <width>190</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="combo" version="2.0.0">
+    <name>Menu Button_15</name>
+    <pv_name>$(P)$(R)TriggerSource</pv_name>
+    <x>1110</x>
+    <y>680</y>
+    <width>190</width>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="combo" version="2.0.0">
+    <name>Menu Button</name>
+    <pv_name>$(P)$(R)ClockSource</pv_name>
+    <x>1110</x>
+    <y>520</y>
+    <width>190</width>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="combo" version="2.0.0">
+    <name>Menu Button_19</name>
+    <pv_name>$(P)$(R)IrqPoll</pv_name>
+    <x>1110</x>
+    <y>840</y>
+    <width>190</width>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="combo" version="2.0.0">
+    <name>Menu Button_18</name>
+    <pv_name>$(P)$(R)RtmType</pv_name>
+    <x>1110</x>
+    <y>800</y>
+    <width>190</width>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="spinner" version="2.0.0">
+    <name>Spinner_7</name>
+    <pv_name>$(P)$(R)TriggerRepeat</pv_name>
+    <x>1110</x>
+    <y>760</y>
+    <width>190</width>
+    <height>30</height>
+    <format>0</format>
+    <precision>3</precision>
+    <actions>
+    </actions>
+    <minimum>-1.0</minimum>
+    <maximum>1.7976931348623157E308</maximum>
+    <limits_from_pv>false</limits_from_pv>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_13</name>
+    <pv_name>$(P)$(R)SamplingFrequency</pv_name>
+    <x>1110</x>
+    <y>600</y>
+    <width>190</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="combo" version="2.0.0">
+    <name>Menu Button_16</name>
+    <pv_name>$(P)$(R)TriggerExternalLine</pv_name>
+    <x>1110</x>
+    <y>720</y>
+    <width>190</width>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="spinner" version="2.0.0">
+    <name>Spinner_6</name>
+    <pv_name>$(P)$(R)ClockDivider</pv_name>
+    <x>1110</x>
+    <y>560</y>
+    <width>190</width>
+    <height>30</height>
+    <format>0</format>
+    <precision>3</precision>
+    <actions>
+    </actions>
+    <maximum>1.7976931348623157E308</maximum>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_207</name>
+    <text>Model:</text>
+    <x>60</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_96</name>
+    <pv_name>$(P)$(R)Model_RBV</pv_name>
+    <x>230</x>
+    <y>180</y>
+    <width>190</width>
+    <height>30</height>
+    <format>6</format>
+    <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_208</name>
+    <text>Firmware version:</text>
+    <x>60</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_97</name>
+    <pv_name>$(P)$(R)FirmwareVersion_RBV</pv_name>
+    <x>230</x>
+    <y>220</y>
+    <width>190</width>
+    <height>30</height>
+    <format>6</format>
+    <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_209</name>
+    <text>Serial number:</text>
+    <x>60</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_98</name>
+    <pv_name>$(P)$(R)SerialNumber_RBV</pv_name>
+    <x>230</x>
+    <y>260</y>
+    <width>190</width>
+    <height>30</height>
+    <format>6</format>
+    <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_210</name>
+    <text>Memory size:</text>
+    <x>60</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_99</name>
+    <pv_name>$(P)$(R)MemorySizeR</pv_name>
+    <x>230</x>
+    <y>300</y>
+    <width>190</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_211</name>
+    <text>Manufacturer:</text>
+    <x>60</x>
+    <y>140</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)$(R)Manufacturer_RBV</pv_name>
+    <x>230</x>
+    <y>140</y>
+    <width>190</width>
+    <height>30</height>
+    <format>6</format>
+    <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_212</name>
+    <text>Device path:</text>
+    <x>60</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_101</name>
+    <pv_name>$(P)$(R)DevicePathR</pv_name>
+    <x>230</x>
+    <y>340</y>
+    <width>190</width>
+    <height>30</height>
+    <format>6</format>
+    <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="textupdate" version="2.0.0">
+    <name>Text Update_104</name>
+    <pv_name>$(P)$(R)MessageR</pv_name>
+    <x>60</x>
+    <y>780</y>
+    <width>570</width>
+    <height>90</height>
+    <background_color>
+      <color name="IO Background" red="235" green="235" blue="235">
+      </color>
+    </background_color>
+    <format>6</format>
+    <vertical_alignment>1</vertical_alignment>
+    <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_2</name>
+    <pv_name>$(P)$(R)NumSamples</pv_name>
+    <x>440</x>
+    <y>570</y>
+    <width>190</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_219</name>
+    <text>Number of samples:</text>
+    <x>60</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="textentry" version="3.0.0">
+    <name>Text Input_3</name>
+    <pv_name>$(P)$(R)ArrayCounter</pv_name>
+    <x>440</x>
+    <y>610</y>
+    <width>190</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_220</name>
+    <text>No. of acquisitions:</text>
+    <x>60</x>
+    <y>610</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_221</name>
+    <text>Acquire:</text>
+    <x>60</x>
+    <y>470</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="action_button" version="3.0.0">
+    <name>Action Button_3</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)Acquire</pv_name>
+    <text>Start</text>
+    <x>270</x>
+    <y>470</y>
+    <width>70</width>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_4</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)Acquire</pv_name>
+    <text>Stop</text>
+    <x>360</x>
+    <y>470</y>
+    <width>70</width>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_105</name>
+    <pv_name>$(P)$(R)NumSamplesR</pv_name>
+    <x>230</x>
+    <y>570</y>
+    <width>190</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="textupdate" version="2.0.0">
+    <name>Text Update_106</name>
+    <pv_name>$(P)$(R)ArrayCounter_RBV</pv_name>
+    <x>230</x>
+    <y>610</y>
+    <width>190</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="action_button" version="3.0.0">
+    <name>Action Button_6</name>
+    <actions>
+      <action type="open_display">
+        <file>../asyn/asynRecord.opi</file>
+        <macros>
+          <R>$(R)AsynIO</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Asyn</text>
+    <x>270</x>
+    <y>520</y>
+    <width>70</width>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED</name>
+    <pv_name>$(P)$(R)Acquire</pv_name>
+    <x>230</x>
+    <y>475</y>
+    <actions>
+    </actions>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_234</name>
+    <text>Asyn record:</text>
+    <x>60</x>
+    <y>520</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_235</name>
+    <text>Acquisition rate:</text>
+    <x>60</x>
+    <y>650</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)$(R)ArrayRate_RBV</pv_name>
+    <x>230</x>
+    <y>650</y>
+    <width>190</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="embedded" version="2.0.0">
+    <name>Linking Container_2</name>
+    <file>sis8300-evr.bob</file>
+    <x>710</x>
+    <y>120</y>
+    <width>610</width>
+    <height>310</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>BGGrey02-title_18</name>
+    <text>Driver message</text>
+    <x>20</x>
+    <y>710</y>
+    <width>650</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>BGGrey02-title_19</name>
+    <text>EVR settings</text>
+    <x>690</x>
+    <y>70</y>
+    <width>650</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>BGGrey02-title_20</name>
+    <text>Device Information</text>
+    <x>20</x>
+    <y>70</y>
+    <width>650</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>BGGrey02-title_21</name>
+    <text>Timing Settings</text>
+    <x>690</x>
+    <y>450</y>
+    <width>650</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>BGGrey02-title_22</name>
+    <text>Acquisition Settings</text>
+    <x>20</x>
+    <y>400</y>
+    <width>650</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>
+</display>
diff --git a/99-Shared/adsis8300bcm/acct.bob b/99-Shared/adsis8300bcm/acct.bob
index 053d032c480ac046d84b2e407ffa5c655769fbf2..8399c9c3971157121e4bd5faa7ab7442e259b414 100644
--- a/99-Shared/adsis8300bcm/acct.bob
+++ b/99-Shared/adsis8300bcm/acct.bob
@@ -89,6 +89,186 @@
       <corner_width>5</corner_width>
       <corner_height>5</corner_height>
     </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_24</name>
+      <x>700</x>
+      <y>380</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_20</name>
+      <x>700</x>
+      <y>160</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_19</name>
+      <x>700</x>
+      <y>120</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_18</name>
+      <x>700</x>
+      <y>80</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_16</name>
+      <x>210</x>
+      <y>240</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_15</name>
+      <x>210</x>
+      <y>200</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_14</name>
+      <x>210</x>
+      <y>160</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_13</name>
+      <x>210</x>
+      <y>120</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_12</name>
+      <x>210</x>
+      <y>310</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_11</name>
+      <x>210</x>
+      <y>380</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_10</name>
+      <x>210</x>
+      <y>420</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_9</name>
+      <x>210</x>
+      <y>500</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_8</name>
+      <x>210</x>
+      <y>540</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_7</name>
+      <x>210</x>
+      <y>580</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_6</name>
+      <x>210</x>
+      <y>620</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
     <widget type="label" version="2.0.0">
       <name>Label_340</name>
       <text>Errant Threshold:</text>
@@ -128,9 +308,10 @@
       <pv_name>$(P)MaxPulseLengthR</pv_name>
       <x>210</x>
       <y>310</y>
-      <width>120</width>
+      <width>110</width>
       <height>30</height>
       <format>1</format>
+      <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -162,9 +343,10 @@
       <pv_name>$(P)LowerWindowStartR</pv_name>
       <x>210</x>
       <y>500</y>
-      <width>120</width>
+      <width>110</width>
       <height>30</height>
       <format>1</format>
+      <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -212,9 +394,10 @@
       <pv_name>$(P)LowerWindowEndR</pv_name>
       <x>210</x>
       <y>540</y>
-      <width>120</width>
+      <width>110</width>
       <height>30</height>
       <format>1</format>
+      <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -262,9 +445,10 @@
       <pv_name>$(P)ErrantWindowStartR</pv_name>
       <x>210</x>
       <y>580</y>
-      <width>120</width>
+      <width>110</width>
       <height>30</height>
       <format>1</format>
+      <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -312,9 +496,10 @@
       <pv_name>$(P)ErrantWindowEndR</pv_name>
       <x>210</x>
       <y>620</y>
-      <width>120</width>
+      <width>110</width>
       <height>30</height>
       <format>1</format>
+      <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -365,6 +550,7 @@
       <width>120</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>
@@ -475,6 +661,7 @@
       <width>120</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>
@@ -513,23 +700,6 @@
         </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>
@@ -563,23 +733,6 @@
         </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>
@@ -596,23 +749,6 @@
         </color>
       </border_color>
     </widget>
-    <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>
-      <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_19</name>
       <pv_name>$(P)ErrantThreshold</pv_name>
@@ -668,10 +804,11 @@
       <pv_name>$(P)TriggerSourceR</pv_name>
       <x>210</x>
       <y>80</y>
-      <width>120</width>
+      <width>110</width>
       <height>30</height>
       <format>6</format>
       <show_units>false</show_units>
+      <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -703,9 +840,10 @@
       <pv_name>$(P)PulseChargeR</pv_name>
       <x>210</x>
       <y>120</y>
-      <width>120</width>
+      <width>110</width>
       <height>30</height>
       <format>1</format>
+      <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -737,9 +875,10 @@
       <pv_name>$(P)FlatTopChargeR</pv_name>
       <x>210</x>
       <y>160</y>
-      <width>120</width>
+      <width>110</width>
       <height>30</height>
       <format>1</format>
+      <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -771,9 +910,10 @@
       <pv_name>$(P)PulseWidthR</pv_name>
       <x>210</x>
       <y>200</y>
-      <width>120</width>
+      <width>110</width>
       <height>30</height>
       <format>1</format>
+      <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -805,10 +945,11 @@
       <pv_name>$(P)AdcOffsetR</pv_name>
       <x>700</x>
       <y>120</y>
-      <width>120</width>
+      <width>110</width>
       <height>30</height>
       <precision>0</precision>
       <show_units>false</show_units>
+      <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -823,9 +964,10 @@
       <pv_name>$(P)AdcScaleR</pv_name>
       <x>700</x>
       <y>80</y>
-      <width>120</width>
+      <width>110</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>
@@ -889,9 +1031,10 @@
       <pv_name>$(P)FlatTopStartR</pv_name>
       <x>210</x>
       <y>380</y>
-      <width>120</width>
+      <width>110</width>
       <height>30</height>
       <format>1</format>
+      <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -940,9 +1083,10 @@
       <pv_name>$(P)FlatTopEndR</pv_name>
       <x>210</x>
       <y>420</y>
-      <width>120</width>
+      <width>110</width>
       <height>30</height>
       <format>1</format>
+      <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -1008,9 +1152,10 @@
       <pv_name>$(P)FlatTopCurrentR</pv_name>
       <x>210</x>
       <y>240</y>
-      <width>120</width>
+      <width>110</width>
       <height>30</height>
       <format>1</format>
+      <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -1042,8 +1187,9 @@
       <pv_name>$(P)FineDelayR</pv_name>
       <x>700</x>
       <y>160</y>
-      <width>120</width>
+      <width>110</width>
       <height>30</height>
+      <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -1091,8 +1237,9 @@
       <pv_name>$(P)DroopRateR</pv_name>
       <x>700</x>
       <y>380</y>
-      <width>120</width>
+      <width>110</width>
       <height>30</height>
+      <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
       <actions>
@@ -1143,6 +1290,7 @@
       <width>120</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>
@@ -1189,6 +1337,7 @@
       <width>120</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>
@@ -1210,6 +1359,96 @@
       </background_color>
       <border_alarm_sensitive>false</border_alarm_sensitive>
     </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_32</name>
+      <x>700</x>
+      <y>490</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_33</name>
+      <x>700</x>
+      <y>530</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rectangle_34</name>
+      <x>700</x>
+      <y>570</y>
+      <width>120</width>
+      <height>30</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_103</name>
+      <pv_name>$(P)ErrantThresholdR</pv_name>
+      <x>700</x>
+      <y>570</y>
+      <width>110</width>
+      <height>30</height>
+      <format>1</format>
+      <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>700</x>
+      <y>530</y>
+      <width>110</width>
+      <height>30</height>
+      <format>1</format>
+      <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>700</x>
+      <y>490</y>
+      <width>110</width>
+      <height>30</height>
+      <format>1</format>
+      <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>
   <widget type="group" version="2.0.0">
     <name>Group</name>
diff --git a/99-Shared/adsis8300bcm/bcm.bob b/99-Shared/adsis8300bcm/bcm.bob
index 404b2d29efe45b523a214b37f84173436e230405..01f5f3f4c50a2f4f162041c69664ddceea950f58 100644
--- a/99-Shared/adsis8300bcm/bcm.bob
+++ b/99-Shared/adsis8300bcm/bcm.bob
@@ -5,6 +5,288 @@
   <height>1200</height>
   <actions>
   </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_4</name>
+    <x>20</x>
+    <y>70</y>
+    <width>520</width>
+    <height>1110</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>500</y>
+    <width>480</width>
+    <height>610</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_10</name>
+    <x>40</x>
+    <y>120</y>
+    <width>480</width>
+    <height>360</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>Rectangle_42</name>
+    <x>240</x>
+    <y>140</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_39</name>
+    <x>240</x>
+    <y>180</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_40</name>
+    <x>240</x>
+    <y>220</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_41</name>
+    <x>240</x>
+    <y>260</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_38</name>
+    <x>240</x>
+    <y>300</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_37</name>
+    <x>240</x>
+    <y>340</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_36</name>
+    <x>240</x>
+    <y>380</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_43</name>
+    <x>240</x>
+    <y>1060</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_44</name>
+    <x>240</x>
+    <y>1020</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_45</name>
+    <x>240</x>
+    <y>980</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_46</name>
+    <x>240</x>
+    <y>940</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_47</name>
+    <x>240</x>
+    <y>900</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_48</name>
+    <x>240</x>
+    <y>860</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_50</name>
+    <x>240</x>
+    <y>800</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_49</name>
+    <x>240</x>
+    <y>760</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_52</name>
+    <x>240</x>
+    <y>700</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_51</name>
+    <x>240</x>
+    <y>660</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_54</name>
+    <x>240</x>
+    <y>600</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_53</name>
+    <x>240</x>
+    <y>560</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_55</name>
+    <x>240</x>
+    <y>520</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-titlebar_8</name>
     <x>1100</x>
@@ -269,48 +551,6 @@
     <vertical_alignment use_class="true">1</vertical_alignment>
     <wrap_words use_class="true">false</wrap_words>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-titlebar_4</name>
-    <x>20</x>
-    <y>70</y>
-    <width>520</width>
-    <height>1110</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>500</y>
-    <width>480</width>
-    <height>610</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_10</name>
-    <x>40</x>
-    <y>120</y>
-    <width>480</width>
-    <height>360</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>BGGrey02-title_19</name>
     <text>Acquisition</text>
@@ -387,9 +627,9 @@
     <pv_name>$(P)$(R)Acquire_RBV</pv_name>
     <x>240</x>
     <y>260</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -404,9 +644,9 @@
     <pv_name>$(P)$(R)NumSamplesR</pv_name>
     <x>240</x>
     <y>140</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -461,9 +701,9 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)ArrayRate_RBV</pv_name>
     <x>240</x>
     <y>300</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -546,7 +786,7 @@ $(pv_value)</tooltip>
     <name>Action Button_24</name>
     <actions>
       <action type="open_display">
-        <file>../adsis8300/system.opi</file>
+        <file>../adsis8300/system_top.bob</file>
         <target>tab</target>
       </action>
     </actions>
@@ -622,10 +862,10 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)TickValueR</pv_name>
     <x>240</x>
     <y>380</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>2</format>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -640,9 +880,9 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)SamplingFrequencyR</pv_name>
     <x>240</x>
     <y>340</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -837,9 +1077,9 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)TriggerRepeatR</pv_name>
     <x>240</x>
     <y>180</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -867,10 +1107,10 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)ClockFrequencyMeasR</pv_name>
     <x>240</x>
     <y>860</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -971,10 +1211,10 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)TriggerPeriodMeasR</pv_name>
     <x>240</x>
     <y>900</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1006,10 +1246,10 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)TriggerWidthMeasR</pv_name>
     <x>240</x>
     <y>940</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1041,9 +1281,9 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)ArrayCounter_RBV</pv_name>
     <x>240</x>
     <y>220</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1075,10 +1315,10 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)MinTriggerPeriodR</pv_name>
     <x>240</x>
     <y>980</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <precision>0</precision>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1142,10 +1382,10 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)MaxPulseWidthR</pv_name>
     <x>240</x>
     <y>1020</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <precision>0</precision>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1756,10 +1996,10 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)ReadyR</pv_name>
     <x>240</x>
     <y>600</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <precision>0</precision>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1803,10 +2043,10 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)ClockFrequencyMeasR</pv_name>
     <x>240</x>
     <y>660</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1838,9 +2078,9 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)AuxiliaryClockMissingR</pv_name>
     <x>240</x>
     <y>700</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1872,9 +2112,9 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)MainClockMissingR</pv_name>
     <x>240</x>
     <y>660</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2059,11 +2299,11 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)AcquisitionTriggerSourceR</pv_name>
     <x>240</x>
     <y>520</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <precision>0</precision>
     <show_units>false</show_units>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2107,11 +2347,11 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)BeamTriggerSourceR</pv_name>
     <x>240</x>
     <y>560</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <precision>0</precision>
     <show_units>false</show_units>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2191,9 +2431,9 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)ReadyFPGAR</pv_name>
     <x>240</x>
     <y>760</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2241,9 +2481,9 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)BeamPermitFPGAR</pv_name>
     <x>240</x>
     <y>800</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2592,10 +2832,10 @@ $(pv_value)</tooltip>
     <pv_name>$(P)$(R)BeamOverThresholdR</pv_name>
     <x>240</x>
     <y>1060</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <precision>0</precision>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
diff --git a/99-Shared/adsis8300bcm/diff.bob b/99-Shared/adsis8300bcm/diff.bob
index 967d4a4d927ad369d4f91b64559dbf349beea9d3..73ea8748040173f1011474fdec4c83bd8156b6ff 100644
--- a/99-Shared/adsis8300bcm/diff.bob
+++ b/99-Shared/adsis8300bcm/diff.bob
@@ -7,6 +7,222 @@
   <height>790</height>
   <actions>
   </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_4</name>
+    <x>20</x>
+    <y>70</y>
+    <width>540</width>
+    <height>220</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_10</name>
+    <x>40</x>
+    <y>120</y>
+    <width>500</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>Rectangle_71</name>
+    <x>260</x>
+    <y>220</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_8</name>
+    <x>1140</x>
+    <y>70</y>
+    <width>540</width>
+    <height>340</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_16</name>
+    <x>1160</x>
+    <y>120</y>
+    <width>500</width>
+    <height>270</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>Rectangle_68</name>
+    <x>1380</x>
+    <y>160</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_67</name>
+    <x>1380</x>
+    <y>217</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_70</name>
+    <x>1380</x>
+    <y>320</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_69</name>
+    <x>1380</x>
+    <y>270</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_11</name>
+    <x>580</x>
+    <y>430</y>
+    <width>480</width>
+    <height>340</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_13</name>
+    <x>600</x>
+    <y>480</y>
+    <width>440</width>
+    <height>270</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>Rectangle_62</name>
+    <x>820</x>
+    <y>500</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_61</name>
+    <x>820</x>
+    <y>540</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_64</name>
+    <x>820</x>
+    <y>580</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_63</name>
+    <x>820</x>
+    <y>620</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_66</name>
+    <x>820</x>
+    <y>660</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_65</name>
+    <x>820</x>
+    <y>700</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-titlebar_12</name>
     <x>580</x>
@@ -21,6 +237,132 @@
     <corner_width>10</corner_width>
     <corner_height>10</corner_height>
   </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_12</name>
+    <x>600</x>
+    <y>120</y>
+    <width>500</width>
+    <height>270</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>Rectangle_57</name>
+    <x>820</x>
+    <y>160</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_58</name>
+    <x>820</x>
+    <y>217</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_60</name>
+    <x>820</x>
+    <y>270</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_59</name>
+    <x>820</x>
+    <y>320</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_7</name>
+    <x>20</x>
+    <y>310</y>
+    <width>540</width>
+    <height>220</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_17</name>
+    <x>40</x>
+    <y>360</y>
+    <width>500</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>Rectangle_54</name>
+    <x>260</x>
+    <y>380</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_55</name>
+    <x>260</x>
+    <y>420</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_56</name>
+    <x>260</x>
+    <y>460</y>
+    <width>120</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="Read_Background" red="230" green="235" blue="232">
+      </color>
+    </background_color>
+  </widget>
   <widget type="label" version="2.0.0">
     <name>BGGrey02-title_26</name>
     <text>Windows width</text>
@@ -40,20 +382,6 @@
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-titlebar_11</name>
-    <x>580</x>
-    <y>430</y>
-    <width>480</width>
-    <height>340</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_25</name>
     <text>Limits</text>
@@ -106,20 +434,6 @@
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-titlebar_8</name>
-    <x>1140</x>
-    <y>70</y>
-    <width>540</width>
-    <height>340</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>Windows start- and end</text>
@@ -139,20 +453,6 @@
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-titlebar_7</name>
-    <x>20</x>
-    <y>310</y>
-    <width>540</width>
-    <height>220</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_21</name>
     <text>Thresholds</text>
@@ -172,48 +472,6 @@
     <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>540</width>
-    <height>220</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_17</name>
-    <x>40</x>
-    <y>360</y>
-    <width>500</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-background_16</name>
-    <x>1160</x>
-    <y>120</y>
-    <width>500</width>
-    <height>270</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_14</name>
     <x>40</x>
@@ -228,34 +486,6 @@
     <corner_width>5</corner_width>
     <corner_height>5</corner_height>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-background_13</name>
-    <x>600</x>
-    <y>480</y>
-    <width>440</width>
-    <height>270</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_12</name>
-    <x>600</x>
-    <y>120</y>
-    <width>500</width>
-    <height>270</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_5</name>
     <x>1080</x>
@@ -303,20 +533,6 @@
     <corner_width>5</corner_width>
     <corner_height>5</corner_height>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-background_10</name>
-    <x>40</x>
-    <y>120</y>
-    <width>500</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>titleBar</name>
     <class>TITLE-BAR</class>
@@ -433,7 +649,7 @@
     <pv_name>$(P)DF$(IDX)-DelayR</pv_name>
     <x>260</x>
     <y>220</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
     <vertical_alignment>1</vertical_alignment>
@@ -659,9 +875,10 @@
     <pv_name>$(P)DF$(IDX)-FastThresholdR</pv_name>
     <x>260</x>
     <y>380</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -713,9 +930,10 @@
     <pv_name>$(P)DF$(IDX)-RisingWindowStartR</pv_name>
     <x>1380</x>
     <y>160</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1061,9 +1279,10 @@
     <pv_name>$(P)DF$(IDX)-FastMinimumR</pv_name>
     <x>820</x>
     <y>500</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1123,9 +1342,10 @@
     <pv_name>$(P)DF$(IDX)-MediumThresholdR</pv_name>
     <x>260</x>
     <y>420</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1177,9 +1397,10 @@
     <pv_name>$(P)DF$(IDX)-SlowThresholdR</pv_name>
     <x>260</x>
     <y>460</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1231,9 +1452,10 @@
     <pv_name>$(P)DF$(IDX)-RisingWindowEndR</pv_name>
     <x>1380</x>
     <y>217</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1285,9 +1507,10 @@
     <pv_name>$(P)DF$(IDX)-FallingWindowStartR</pv_name>
     <x>1380</x>
     <y>270</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1339,9 +1562,10 @@
     <pv_name>$(P)DF$(IDX)-FallingWindowEndR</pv_name>
     <x>1380</x>
     <y>320</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1393,9 +1617,10 @@
     <pv_name>$(P)DF$(IDX)-FastMaximumR</pv_name>
     <x>820</x>
     <y>540</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1431,9 +1656,10 @@
     <pv_name>$(P)DF$(IDX)-MediumMinimumR</pv_name>
     <x>820</x>
     <y>580</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1469,9 +1695,10 @@
     <pv_name>$(P)DF$(IDX)-MediumMaximumR</pv_name>
     <x>820</x>
     <y>620</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1507,9 +1734,10 @@
     <pv_name>$(P)DF$(IDX)-SlowMinimumR</pv_name>
     <x>820</x>
     <y>660</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1545,9 +1773,10 @@
     <pv_name>$(P)DF$(IDX)-SlowMaximumR</pv_name>
     <x>820</x>
     <y>700</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1583,9 +1812,10 @@
     <pv_name>$(P)DF$(IDX)-FastWindowWidthR</pv_name>
     <x>820</x>
     <y>160</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1637,9 +1867,10 @@
     <pv_name>$(P)DF$(IDX)-MediumWindowWidthR</pv_name>
     <x>820</x>
     <y>270</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1691,9 +1922,10 @@
     <pv_name>$(P)DF$(IDX)-FastWindowWidthInverseR</pv_name>
     <x>820</x>
     <y>217</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1729,9 +1961,10 @@
     <pv_name>$(P)DF$(IDX)-MediumWindowWidthInverseR</pv_name>
     <x>820</x>
     <y>320</y>
-    <width>120</width>
+    <width>110</width>
     <height>30</height>
     <format>1</format>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
diff --git a/99-Shared/adsis8300bcm/lut_dest.bob b/99-Shared/adsis8300bcm/lut_dest.bob
index 0e4385c621e6be55b4f241d30785431a9712c8c3..426809a96f574818e46426bb639bebf6d47c1448 100644
--- a/99-Shared/adsis8300bcm/lut_dest.bob
+++ b/99-Shared/adsis8300bcm/lut_dest.bob
@@ -4,7 +4,7 @@
   <width>490</width>
   <height>860</height>
   <background_color>
-    <color red="240" green="240" blue="240">
+    <color name="BACKGROUND" red="220" green="225" blue="221">
     </color>
   </background_color>
   <actions>
diff --git a/99-Shared/adsis8300bcm/lut_mode.bob b/99-Shared/adsis8300bcm/lut_mode.bob
index ad0ad4836fe903a8f51f1bb043bee0416af16fab..ee940e8bf71390e7d0233eda62c60002a30fde6a 100644
--- a/99-Shared/adsis8300bcm/lut_mode.bob
+++ b/99-Shared/adsis8300bcm/lut_mode.bob
@@ -3,10 +3,6 @@
   <name>LUT mode setup</name>
   <width>490</width>
   <height>860</height>
-  <background_color>
-    <color red="240" green="240" blue="240">
-    </color>
-  </background_color>
   <actions>
   </actions>
   <widget type="rectangle" version="2.0.0">