diff --git a/10-Top/bpmioc/instance.bob b/10-Top/bpmioc/instance.bob
index 15a7a5eae81158bf6a108aedcc95c18388e479a9..6d743b45f4c4076fdf3e314f8c8a79b4f6a9abf5 100644
--- a/10-Top/bpmioc/instance.bob
+++ b/10-Top/bpmioc/instance.bob
@@ -1,31 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <width>300</width>
-  <height>100</height>
+  <width>340</width>
+  <height>260</height>
   <background_color>
-    <color red="240" green="240" blue="240">
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
   </background_color>
   <actions>
   </actions>
-  <widget type="label" version="2.0.0">
-    <name>Label_1</name>
-    <text>$(CONTROL_GROUP):$(AMC_NAME)</text>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_4</name>
+    <width>340</width>
+    <height>260</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>20</x>
+    <y>130</y>
     <width>300</width>
-    <height>100</height>
-    <font>
-      <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>1</border_width>
-    <border_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
+    <height>110</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
-    </border_color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_15</name>
+    <x>20</x>
+    <y>50</y>
+    <width>300</width>
+    <height>70</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="action_button" version="3.0.0">
     <name>Menu Button_3</name>
@@ -40,18 +61,9 @@
       </action>
     </actions>
     <text>$(CONTROL_GROUP):$(AMC_NAME)</text>
-    <x>60</x>
-    <y>30</y>
-    <width>187</width>
-    <height>20</height>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
+    <x>40</x>
+    <y>70</y>
+    <width>260</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -68,18 +80,9 @@
       </action>
     </actions>
     <text>$(SYSTEM1)</text>
-    <x>60</x>
-    <y>55</y>
-    <width>187</width>
-    <height>20</height>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
+    <x>40</x>
+    <y>150</y>
+    <width>260</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -95,18 +98,26 @@
       </action>
     </actions>
     <text>$(SYSTEM2)</text>
-    <x>60</x>
-    <y>75</y>
-    <width>187</width>
-    <height>20</height>
+    <x>40</x>
+    <y>190</y>
+    <width>260</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_19</name>
+    <text>$(CONTROL_GROUP):$(AMC_NAME)</text>
+    <width>340</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="28.0">
+      </font>
+    </font>
     <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
+      <color name="WHITE" red="255" green="255" blue="255">
       </color>
     </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
   </widget>
 </display>
diff --git a/10-Top/bpmioc/top.bob b/10-Top/bpmioc/top.bob
index 5a4ce6c154d32b2913454ef31446b8c0030f2637..6c3c4132d8e332343a5e34b78c4679e0d5895ee8 100644
--- a/10-Top/bpmioc/top.bob
+++ b/10-Top/bpmioc/top.bob
@@ -4,27 +4,78 @@
   <macros>
     <TITLE>BPM IOCs</TITLE>
   </macros>
-  <width>595</width>
-  <height>183</height>
-  <background_color>
-    <color red="240" green="240" blue="240">
-    </color>
-  </background_color>
+  <width>1460</width>
+  <height>350</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>1460</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
   <widget type="embedded" version="2.0.0">
-    <name>Linking Container</name>
+    <name>Linking Container_1</name>
+    <file>instance.opi</file>
+    <macros>
+      <AMC_NAME>Ctrl-AMC-003</AMC_NAME>
+      <CONTROL_GROUP>LAB-BPM19</CONTROL_GROUP>
+      <SYSTEM1>LAB-019:PBI-BPM-001:</SYSTEM1>
+      <SYSTEM2>LAB-019:PBI-BPM-002:</SYSTEM2>
+    </macros>
+    <x>20</x>
+    <y>70</y>
+    <width>340</width>
+    <height>260</height>
+    <resize>2</resize>
+    <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>instance.opi</file>
     <macros>
       <AMC_NAME>Ctrl-AMC-004</AMC_NAME>
-      <CONTROL_GROUP>LAB-BPM04</CONTROL_GROUP>
-      <SYSTEM1>LAB-004:PBI-BPM-001:</SYSTEM1>
-      <SYSTEM2>LAB-004:PBI-BPM-002:</SYSTEM2>
+      <CONTROL_GROUP>LAB-BPM19</CONTROL_GROUP>
+      <SYSTEM1>LAB-019:PBI-BPM-003:</SYSTEM1>
+      <SYSTEM2>LAB-019:PBI-BPM-004:</SYSTEM2>
     </macros>
+    <x>380</x>
+    <y>70</y>
+    <width>340</width>
+    <height>260</height>
+    <resize>2</resize>
+    <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_3</name>
     <file>instance.opi</file>
-    <x>9</x>
-    <y>80</y>
-    <width>350</width>
-    <height>88</height>
+    <macros>
+      <AMC_NAME>Ctrl-AMC-005</AMC_NAME>
+      <CONTROL_GROUP>LAB-BPM19</CONTROL_GROUP>
+      <SYSTEM1>LAB-019:PBI-BPM-005:</SYSTEM1>
+      <SYSTEM2>LAB-019:PBI-BPM-006:</SYSTEM2>
+    </macros>
+    <x>740</x>
+    <y>70</y>
+    <width>340</width>
+    <height>260</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -33,26 +84,75 @@
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_1</name>
-    <text>$(TITLE)</text>
-    <x>9</x>
-    <y>15</y>
-    <width>577</width>
-    <height>50</height>
-    <font>
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container_4</name>
+    <file>instance.opi</file>
+    <macros>
+      <AMC_NAME>Ctrl-AMC-006</AMC_NAME>
+      <CONTROL_GROUP>LAB-BPM19</CONTROL_GROUP>
+      <SYSTEM1>LAB-019:PBI-BPM-007:</SYSTEM1>
+      <SYSTEM2>LAB-019:PBI-BPM-008:</SYSTEM2>
+    </macros>
+    <x>1100</x>
+    <y>70</y>
+    <width>340</width>
+    <height>260</height>
+    <resize>2</resize>
     <actions>
     </actions>
-    <border_width>3</border_width>
     <border_color>
       <color red="0" green="128" blue="255">
       </color>
     </border_color>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>Beam Position and Phase Monitor : Engineering Screen (IOC)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1150</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="action_button" version="3.0.0">
+    <name>Operator</name>
+    <actions>
+      <action type="open_display">
+        <file>../../../../../30-Operator/10-ACC/99-PBI/10-Top/BPM.bob</file>
+        <target>replace</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Operator</text>
+    <x>1190</x>
+    <y>10</y>
+    <width>120</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>MachineExpert</name>
+    <actions>
+      <action type="open_display">
+        <file>../../../../../20-SystemExpert/10-ACC/99-PBI/10-Top/BPM.bob</file>
+        <target>replace</target>
+      </action>
+    </actions>
+    <text>Machine Expert</text>
+    <x>1320</x>
+    <y>10</y>
+    <width>120</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
 </display>
diff --git a/99-Shared/adsis8300bpm/aiChannel.bob b/99-Shared/adsis8300bpm/aiChannel.bob
index 210162abf487d8f8f74eee67da3abe94a34cca3b..8c65f80eac55d580a69977c95455f9da1ae741e3 100644
--- a/99-Shared/adsis8300bpm/aiChannel.bob
+++ b/99-Shared/adsis8300bpm/aiChannel.bob
@@ -3,70 +3,164 @@
   <name>BPM Ch $(CH)</name>
   <x>470</x>
   <y>197</y>
-  <width>1550</width>
-  <height>800</height>
-  <background_color>
-    <color red="240" green="240" blue="240">
-    </color>
-  </background_color>
+  <width>2040</width>
+  <height>840</height>
   <actions>
   </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>655</x>
-    <y>11</y>
-    <width>390</width>
-    <height>25</height>
+    <name>BGGrey03-titlebar_6</name>
+    <x>1080</x>
+    <y>70</y>
+    <width>940</width>
+    <height>690</height>
     <line_width>0</line_width>
-    <line_color>
-      <color red="128" green="0" blue="255">
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
-    </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>PV prefix: $(P)$(R)$(CH)</text>
-    <x>655</x>
-    <y>12</y>
-    <width>390</width>
-    <height>25</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="14.851485148514852">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_22</name>
+    <x>1100</x>
+    <y>90</y>
+    <width>900</width>
+    <height>650</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    </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>550</x>
+    <y>70</y>
+    <width>510</width>
+    <height>690</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
-    </border_color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_4</name>
+    <x>20</x>
+    <y>70</y>
+    <width>510</width>
+    <height>750</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <x>570</x>
+    <y>120</y>
+    <width>470</width>
+    <height>170</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_19</name>
+    <x>570</x>
+    <y>350</y>
+    <width>470</width>
+    <height>60</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_20</name>
+    <x>570</x>
+    <y>470</y>
+    <width>470</width>
+    <height>50</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_17</name>
+    <x>570</x>
+    <y>580</y>
+    <width>470</width>
+    <height>50</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>40</x>
+    <y>590</y>
+    <width>470</width>
+    <height>210</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_15</name>
+    <x>40</x>
+    <y>120</y>
+    <width>470</width>
+    <height>410</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
   <widget type="xyplot" version="2.0.0">
     <name>XY Graph</name>
-    <x>400</x>
-    <y>55</y>
-    <width>847</width>
-    <height>495</height>
+    <x>1110</x>
+    <y>100</y>
+    <width>880</width>
+    <height>630</height>
     <background_color>
-      <color red="240" green="240" blue="240">
+      <color name="Transparent" red="255" green="255" blue="255" alpha="0">
       </color>
     </background_color>
     <title_font>
       <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
       </font>
     </title_font>
-    <show_toolbar>true</show_toolbar>
     <actions>
     </actions>
     <rules>
@@ -141,16 +235,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_1</name>
-    <text>Time link or
-time/point</text>
-    <x>22</x>
-    <y>100</y>
-    <width>94</width>
-    <height>36</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <text>Time link or timepoint</text>
+    <x>50</x>
+    <y>250</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -164,17 +253,10 @@ time/point</text>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)$(CH)TR1-TimePerPointLink.DOL</pv_name>
-    <x>138</x>
-    <y>108</y>
-    <width>217</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
+    <x>220</x>
+    <y>250</y>
+    <width>120</width>
+    <height>30</height>
     <format>6</format>
     <show_units>false</show_units>
     <actions>
@@ -188,13 +270,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_2</name>
     <text>Time/point</text>
-    <x>20</x>
-    <y>144</y>
-    <width>96</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>50</x>
+    <y>290</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -208,21 +287,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)$(CH)TR1-TimePerPoint</pv_name>
-    <x>139</x>
-    <y>145</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>350</x>
+    <y>290</y>
+    <width>120</width>
+    <height>30</height>
     <format>2</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -237,10 +305,8 @@ time/point</text>
   <widget type="led" version="2.0.0">
     <name>LED_1</name>
     <pv_name>$(P)$(R)$(CH)DoneR</pv_name>
-    <x>140</x>
-    <y>217</y>
-    <width>16</width>
-    <height>16</height>
+    <x>230</x>
+    <y>175</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -249,27 +315,16 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_3</name>
     <text>Num bytes</text>
-    <x>10</x>
-    <y>168</y>
-    <width>106</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>50</x>
+    <y>330</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -283,21 +338,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_1</name>
     <pv_name>$(P)$(R)$(CH)NumBytesR</pv_name>
-    <x>139</x>
-    <y>169</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>350</x>
+    <y>331</y>
+    <width>120</width>
+    <height>30</height>
     <precision>0</precision>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -312,13 +356,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_4</name>
     <text>Done</text>
-    <x>16</x>
-    <y>217</y>
-    <width>96</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>50</x>
+    <y>170</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -332,10 +373,8 @@ time/point</text>
   <widget type="led" version="2.0.0">
     <name>LED_1</name>
     <pv_name>$(P)$(R)$(CH)ActiveR</pv_name>
-    <x>350</x>
-    <y>217</y>
-    <width>16</width>
-    <height>16</height>
+    <x>230</x>
+    <y>215</y>
     <off_color>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
@@ -344,27 +383,16 @@ time/point</text>
       <color name="Major" red="250" green="12" blue="14">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_5</name>
     <text>Active</text>
-    <x>225</x>
-    <y>217</y>
-    <width>96</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>120</x>
+    <y>210</y>
+    <width>92</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -375,38 +403,11 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_4</name>
-    <pv_name>$(P)$(CH)Name</pv_name>
-    <x>230</x>
-    <y>9</y>
-    <width>336</width>
-    <height>31</height>
-    <font>
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
   <widget type="led" version="2.0.0">
     <name>LED_3</name>
     <pv_name>$(P)$(R)$(CH)ControlR</pv_name>
-    <x>140</x>
-    <y>72</y>
-    <width>16</width>
-    <height>16</height>
+    <x>230</x>
+    <y>135</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -415,14 +416,6 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -436,18 +429,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)Control</pv_name>
     <text>Enable</text>
-    <x>157</x>
-    <y>70</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>270</x>
+    <y>130</y>
+    <width>70</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_10</name>
@@ -459,37 +443,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)Control</pv_name>
     <text>Disable</text>
-    <x>216</x>
-    <y>70</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_10</name>
-    <text>Control</text>
-    <x>16</x>
-    <y>70</y>
+    <x>350</x>
+    <y>130</y>
     <width>70</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <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_42</name>
@@ -504,27 +460,16 @@ time/point</text>
       </action>
     </actions>
     <text>More..</text>
-    <x>306</x>
-    <y>364</y>
-    <width>49</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>430</x>
+    <y>600</y>
+    <width>70</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_4</name>
     <pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks_RBV</pv_name>
-    <x>140</x>
-    <y>366</y>
-    <width>16</width>
-    <height>16</height>
+    <x>230</x>
+    <y>605</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -533,14 +478,6 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -554,18 +491,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks</pv_name>
     <text>Enable</text>
-    <x>157</x>
-    <y>364</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>273</x>
+    <y>600</y>
+    <width>70</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_44</name>
@@ -577,46 +505,17 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks</pv_name>
     <text>Disable</text>
-    <x>216</x>
-    <y>364</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_11</name>
-    <text>Trace</text>
-    <x>16</x>
-    <y>345</y>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
+    <x>350</x>
+    <y>600</y>
+    <width>70</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_13</name>
     <text>Array Size</text>
-    <x>16</x>
-    <y>439</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>50</x>
+    <y>720</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -630,22 +529,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_6</name>
     <pv_name>$(P)$(R)$(CH)TR1-ArraySize0_RBV</pv_name>
-    <x>139</x>
-    <y>440</y>
-    <width>65</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>350</x>
+    <y>721</y>
+    <width>120</width>
+    <height>30</height>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
@@ -661,13 +548,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_14</name>
     <text>Data type</text>
-    <x>26</x>
-    <y>464</y>
-    <width>90</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>50</x>
+    <y>760</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -681,22 +565,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_8</name>
     <pv_name>$(P)$(R)$(CH)TR1-DataType_RBV</pv_name>
-    <x>139</x>
-    <y>465</y>
-    <width>79</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>350</x>
+    <y>761</y>
+    <width>120</width>
+    <height>30</height>
     <format>6</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -711,21 +583,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_9</name>
     <pv_name>$(P)$(R)$(CH)TR1-ArrayCounter_RBV</pv_name>
-    <x>139</x>
-    <y>391</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>350</x>
+    <y>641</y>
+    <width>120</width>
+    <height>30</height>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -740,12 +601,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_15</name>
     <text>Array counter</text>
-    <x>16</x>
-    <y>390</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>50</x>
+    <y>640</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -759,12 +618,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_16</name>
     <text>Array rate</text>
-    <x>16</x>
-    <y>415</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>50</x>
+    <y>680</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -778,21 +635,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_10</name>
     <pv_name>$(P)$(R)$(CH)TR1-ArrayRate_RBV</pv_name>
-    <x>139</x>
-    <y>416</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>350</x>
+    <y>681</y>
+    <width>120</width>
+    <height>30</height>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -807,12 +653,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_17</name>
     <text>Control</text>
-    <x>16</x>
-    <y>364</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>50</x>
+    <y>600</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -823,53 +667,13 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_18</name>
-    <text>AI channel</text>
-    <x>16</x>
-    <y>15</y>
-    <width>188</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <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_19</name>
-    <text>Attenuation</text>
-    <x>16</x>
-    <y>495</y>
-    <width>70</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <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_20</name>
     <text>Value</text>
-    <x>16</x>
-    <y>513</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>580</x>
+    <y>590</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -883,21 +687,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_11</name>
     <pv_name>$(P)$(R)$(CH)AttnR</pv_name>
-    <x>258</x>
-    <y>514</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>590</y>
+    <width>120</width>
+    <height>30</height>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -912,17 +705,10 @@ time/point</text>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_3</name>
     <pv_name>$(P)$(R)$(CH)Attn</pv_name>
-    <x>139</x>
-    <y>513</y>
-    <width>112</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
+    <x>750</x>
+    <y>590</y>
+    <width>120</width>
+    <height>30</height>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -935,10 +721,8 @@ time/point</text>
   <widget type="led" version="2.0.0">
     <name>LED_9</name>
     <pv_name>$(P)$(R)$(CH)SelfTrigControlR</pv_name>
-    <x>140</x>
-    <y>572</y>
-    <width>16</width>
-    <height>16</height>
+    <x>760</x>
+    <y>135</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -947,14 +731,6 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -968,18 +744,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)SelfTrigControl</pv_name>
     <text>Enable</text>
-    <x>157</x>
-    <y>570</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>803</x>
+    <y>130</y>
+    <width>70</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_48</name>
@@ -991,46 +758,17 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)SelfTrigControl</pv_name>
     <text>Disable</text>
-    <x>216</x>
-    <y>570</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_287</name>
-    <text>Self-triggering</text>
-    <x>16</x>
-    <y>551</y>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
+    <x>880</x>
+    <y>130</y>
+    <width>70</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_288</name>
     <text>Control</text>
-    <x>16</x>
-    <y>570</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>580</x>
+    <y>130</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1044,12 +782,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_289</name>
     <text>Threshold</text>
-    <x>16</x>
-    <y>594</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>580</x>
+    <y>170</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1063,21 +799,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_76</name>
     <pv_name>$(P)$(R)$(CH)SelfTrigThresholdR</pv_name>
-    <x>258</x>
-    <y>595</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>171</y>
+    <width>120</width>
+    <height>30</height>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -1092,17 +817,10 @@ time/point</text>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_4</name>
     <pv_name>$(P)$(R)$(CH)SelfTrigThreshold</pv_name>
-    <x>139</x>
-    <y>594</y>
-    <width>112</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
+    <x>750</x>
+    <y>170</y>
+    <width>120</width>
+    <height>30</height>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -1115,12 +833,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_290</name>
     <text>Window</text>
-    <x>16</x>
-    <y>620</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>580</x>
+    <y>210</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1134,21 +850,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_77</name>
     <pv_name>$(P)$(R)$(CH)SelfTrigWindowR</pv_name>
-    <x>258</x>
-    <y>621</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>211</y>
+    <width>120</width>
+    <height>30</height>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -1163,17 +868,10 @@ time/point</text>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_5</name>
     <pv_name>$(P)$(R)$(CH)SelfTrigWindow</pv_name>
-    <x>139</x>
-    <y>620</y>
-    <width>112</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
+    <x>750</x>
+    <y>210</y>
+    <width>120</width>
+    <height>30</height>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -1186,10 +884,8 @@ time/point</text>
   <widget type="led" version="2.0.0">
     <name>LED_10</name>
     <pv_name>$(P)$(R)$(CH)SelfTrigTriggered</pv_name>
-    <x>140</x>
-    <y>647</y>
-    <width>16</width>
-    <height>16</height>
+    <x>760</x>
+    <y>255</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -1198,26 +894,16 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_291</name>
     <text>Triggered</text>
-    <x>16</x>
-    <y>645</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>580</x>
+    <y>250</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1231,13 +917,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_292</name>
     <text>Num samples</text>
-    <x>10</x>
-    <y>197</y>
-    <width>106</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>50</x>
+    <y>370</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1251,21 +934,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_78</name>
     <pv_name>$(P)$(R)$(CH)NumSamplesR</pv_name>
-    <x>139</x>
-    <y>198</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>350</x>
+    <y>371</y>
+    <width>120</width>
+    <height>30</height>
     <precision>0</precision>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -1290,27 +962,16 @@ time/point</text>
       </action>
     </actions>
     <text>More..</text>
-    <x>303</x>
-    <y>696</y>
-    <width>49</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>960</x>
+    <y>360</y>
+    <width>70</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_7</name>
     <pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks_RBV</pv_name>
-    <x>137</x>
-    <y>698</y>
-    <width>16</width>
-    <height>16</height>
+    <x>760</x>
+    <y>365</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -1319,14 +980,6 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -1340,18 +993,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks</pv_name>
     <text>Enable</text>
-    <x>154</x>
-    <y>696</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>800</x>
+    <y>360</y>
+    <width>70</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_54</name>
@@ -1363,46 +1007,17 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks</pv_name>
     <text>Disable</text>
-    <x>213</x>
-    <y>696</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_34</name>
-    <text>Circular buffer</text>
-    <x>13</x>
-    <y>677</y>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
+    <x>880</x>
+    <y>360</y>
+    <width>70</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_35</name>
     <text>Control</text>
-    <x>13</x>
-    <y>696</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>580</x>
+    <y>361</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1426,27 +1041,16 @@ time/point</text>
       </action>
     </actions>
     <text>More..</text>
-    <x>303</x>
-    <y>747</y>
-    <width>49</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>960</x>
+    <y>480</y>
+    <width>70</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_8</name>
     <pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks_RBV</pv_name>
-    <x>137</x>
-    <y>749</y>
-    <width>16</width>
-    <height>16</height>
+    <x>760</x>
+    <y>485</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -1455,14 +1059,6 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -1476,18 +1072,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks</pv_name>
     <text>Enable</text>
-    <x>154</x>
-    <y>747</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>800</x>
+    <y>480</y>
+    <width>70</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_57</name>
@@ -1499,28 +1086,17 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks</pv_name>
     <text>Disable</text>
-    <x>213</x>
-    <y>747</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>480</y>
+    <width>70</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_37</name>
     <text>Control</text>
-    <x>13</x>
-    <y>747</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>580</x>
+    <y>480</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1531,35 +1107,13 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_40</name>
-    <text>Circular buffer trace</text>
-    <x>16</x>
-    <y>728</y>
-    <width>142</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <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_297</name>
     <text>Memory addr.</text>
-    <x>10</x>
-    <y>286</y>
-    <width>106</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>50</x>
+    <y>490</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1573,21 +1127,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_79</name>
     <pv_name>$(P)$(R)$(CH)MemoryAddressR</pv_name>
-    <x>258</x>
-    <y>286</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>350</x>
+    <y>490</y>
+    <width>120</width>
+    <height>30</height>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -1602,17 +1145,10 @@ time/point</text>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_6</name>
     <pv_name>$(P)$(R)$(CH)MemoryAddress</pv_name>
-    <x>139</x>
-    <y>286</y>
-    <width>112</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
+    <x>220</x>
+    <y>490</y>
+    <width>120</width>
+    <height>30</height>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -1622,133 +1158,138 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_58</name>
+  <widget type="label" version="2.0.0">
+    <name>Label_302</name>
+    <text>PCIe start</text>
+    <x>50</x>
+    <y>410</y>
+    <width>160</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
-      <action type="open_display">
-        <file>../adcore/NDFileHDF5.opi</file>
-        <macros>
-          <P>$(P)$(R)</P>
-          <R>$(CH)HDF1-</R>
-        </macros>
-        <target>tab</target>
-      </action>
     </actions>
-    <text>More..</text>
-    <x>690</x>
-    <y>696</y>
-    <width>49</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
+    </border_color>
   </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_13</name>
-    <pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks_RBV</pv_name>
-    <x>524</x>
-    <y>698</y>
-    <width>16</width>
-    <height>16</height>
-    <off_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </on_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>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_80</name>
+    <pv_name>$(P)$(R)$(CH)PcieStartTimeR</pv_name>
+    <x>350</x>
+    <y>411</y>
+    <width>120</width>
+    <height>30</height>
+    <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
     </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_59</name>
+  <widget type="label" version="2.0.0">
+    <name>Label_303</name>
+    <text>PCIe time</text>
+    <x>50</x>
+    <y>450</y>
+    <width>160</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
-      </action>
     </actions>
-    <pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks</pv_name>
-    <text>Enable</text>
-    <x>541</x>
-    <y>696</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
+    </border_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_60</name>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_81</name>
+    <pv_name>$(P)$(R)$(CH)PcieTransferTimeR</pv_name>
+    <x>350</x>
+    <y>451</y>
+    <width>120</width>
+    <height>30</height>
+    <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>0</value>
-      </action>
     </actions>
-    <pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks</pv_name>
-    <text>Disable</text>
-    <x>600</x>
-    <y>696</y>
-    <width>43</width>
-    <height>20</height>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_20</name>
+    <text>Trace</text>
+    <x>20</x>
+    <y>540</y>
+    <width>510</width>
+    <height>50</height>
     <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
       </font>
     </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
       </color>
-    </background_color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_298</name>
-    <text>HDF5 file save</text>
-    <x>400</x>
-    <y>677</y>
-    <width>142</width>
+    <name>BGGrey02-title_22</name>
+    <text>Attenuation</text>
+    <x>550</x>
+    <y>530</y>
+    <width>510</width>
+    <height>50</height>
     <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.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>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_299</name>
+    <name>BGGrey02-title_23</name>
     <text>Control</text>
-    <x>400</x>
-    <y>696</y>
+    <x>20</x>
+    <y>70</y>
+    <width>510</width>
+    <height>50</height>
     <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
       </font>
     </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_19</name>
+    <text>Control</text>
+    <x>50</x>
+    <y>130</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1760,90 +1301,103 @@ time/point</text>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_302</name>
-    <text>PCIe start</text>
-    <y>235</y>
-    <width>116</width>
+    <name>BGGrey02-title_24</name>
+    <text>Self-triggering</text>
+    <x>550</x>
+    <y>70</y>
+    <width>510</width>
+    <height>50</height>
     <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
       </font>
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
+    <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>
-    <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_80</name>
-    <pv_name>$(P)$(R)$(CH)PcieStartTimeR</pv_name>
-    <x>139</x>
-    <y>236</y>
-    <height>18</height>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_25</name>
+    <text>Circular buffer trace</text>
+    <x>550</x>
+    <y>420</y>
+    <width>510</width>
+    <height>50</height>
     <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
       </font>
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="WHITE" red="255" green="255" blue="255">
       </color>
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <show_units>false</show_units>
+    <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_303</name>
-    <text>PCIe time</text>
-    <y>255</y>
-    <width>116</width>
+    <name>BGGrey02-title_26</name>
+    <text>Circular buffer</text>
+    <x>550</x>
+    <y>300</y>
+    <width>510</width>
+    <height>50</height>
     <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
       </font>
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
+    <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>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_21</name>
+    <x>570</x>
+    <y>690</y>
+    <width>470</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
-    </border_color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_81</name>
-    <pv_name>$(P)$(R)$(CH)PcieTransferTimeR</pv_name>
-    <x>139</x>
-    <y>256</y>
-    <height>18</height>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_27</name>
+    <text>HDF5 file save</text>
+    <x>550</x>
+    <y>640</y>
+    <width>510</width>
+    <height>50</height>
     <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
       </font>
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="WHITE" red="255" green="255" blue="255">
       </color>
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <show_units>false</show_units>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_299</name>
+    <text>Control</text>
+    <x>580</x>
+    <y>700</y>
+    <width>160</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1853,4 +1407,108 @@ time/point</text>
       </color>
     </border_color>
   </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_60</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks</pv_name>
+    <text>Disable</text>
+    <x>880</x>
+    <y>700</y>
+    <width>70</width>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_59</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks</pv_name>
+    <text>Enable</text>
+    <x>800</x>
+    <y>700</y>
+    <width>70</width>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_13</name>
+    <pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks_RBV</pv_name>
+    <x>760</x>
+    <y>705</y>
+    <off_color>
+      <color name="Major" red="250" green="12" blue="14">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+      </color>
+    </on_color>
+    <actions>
+    </actions>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_58</name>
+    <actions>
+      <action type="open_display">
+        <file>../adcore/NDFileHDF5.opi</file>
+        <macros>
+          <P>$(P)$(R)</P>
+          <R>$(CH)HDF1-</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>More..</text>
+    <x>959</x>
+    <y>700</y>
+    <width>70</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>2040</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)$(CH)Name</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>2000</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>
+    <rules>
+      <rule name="text" prop_id="text" out_exp="true">
+        <exp bool_exp="pv0">
+          <expression>pvStr0</expression>
+        </exp>
+        <pv_name>$(P)$(CH)Name</pv_name>
+      </rule>
+    </rules>
+  </widget>
 </display>
diff --git a/99-Shared/adsis8300bpm/aiChannelItem.bob b/99-Shared/adsis8300bpm/aiChannelItem.bob
index bbe66e3347b6a52169c2590ff35e26fdc92e7599..01758ecf36e0fde8a71c61c49f9025002ed3b8c6 100644
--- a/99-Shared/adsis8300bpm/aiChannelItem.bob
+++ b/99-Shared/adsis8300bpm/aiChannelItem.bob
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <width>420</width>
-  <height>20</height>
+  <width>470</width>
+  <height>30</height>
   <background_color>
-    <color red="240" green="240" blue="240">
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
   </background_color>
   <actions>
@@ -12,10 +12,7 @@
     <name>Text Update_75</name>
     <pv_name>$(P)$(R)$(CH)Name</pv_name>
     <width>230</width>
-    <font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-      </font>
-    </font>
+    <height>30</height>
     <background_color>
       <color red="255" green="255" blue="255">
       </color>
@@ -34,9 +31,7 @@
     <name>LED_1</name>
     <pv_name>$(P)$(R)$(CH)ControlR</pv_name>
     <x>240</x>
-    <y>2</y>
-    <width>16</width>
-    <height>16</height>
+    <y>5</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -45,14 +40,6 @@
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -66,13 +53,8 @@
     </actions>
     <pv_name>$(P)$(R)$(CH)Control</pv_name>
     <text>Enable</text>
-    <x>257</x>
-    <width>50</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
+    <x>270</x>
+    <width>60</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -88,13 +70,8 @@
     </actions>
     <pv_name>$(P)$(R)$(CH)Control</pv_name>
     <text>Disable</text>
-    <x>310</x>
-    <width>50</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
+    <x>340</x>
+    <width>60</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -109,13 +86,8 @@
       </action>
     </actions>
     <text>More..</text>
-    <x>370</x>
-    <width>50</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
+    <x>410</x>
+    <width>60</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
diff --git a/99-Shared/adsis8300bpm/bpm.bob b/99-Shared/adsis8300bpm/bpm.bob
index 19f67720d311a301a5df84222ecd0ec26f5990ac..82b472fd97f360eb6b9c8cabdca456a1e24258ca 100644
--- a/99-Shared/adsis8300bpm/bpm.bob
+++ b/99-Shared/adsis8300bpm/bpm.bob
@@ -1,142 +1,286 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>$(TITLE) : Main</name>
-  <width>1187</width>
-  <height>856</height>
-  <background_color>
-    <color red="240" green="240" blue="240">
-    </color>
-  </background_color>
+  <width>2070</width>
+  <height>910</height>
   <actions>
   </actions>
-  <grid_step_x>6</grid_step_x>
-  <grid_step_y>6</grid_step_y>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_9</name>
+    <x>1210</x>
+    <y>70</y>
+    <width>840</width>
+    <height>820</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>1640</x>
+    <y>360</y>
+    <width>390</width>
+    <height>190</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_19</name>
+    <x>1230</x>
+    <y>160</y>
+    <width>390</width>
+    <height>190</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_18</name>
+    <x>1640</x>
+    <y>160</y>
+    <width>390</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>1640</x>
+    <y>600</y>
+    <width>390</width>
+    <height>230</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_15</name>
+    <x>1230</x>
+    <y>560</y>
+    <width>390</width>
+    <height>310</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>1230</x>
+    <y>400</y>
+    <width>390</width>
+    <height>110</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_361</name>
-    <text>More panels</text>
-    <x>14</x>
-    <y>780</y>
-    <width>765</width>
-    <height>69</height>
+    <name>BGGrey02-title_24</name>
+    <text>Parameters</text>
+    <x>1210</x>
+    <y>70</y>
+    <width>840</width>
+    <height>50</height>
     <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
       </font>
     </font>
-    <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
       </color>
-    </background_color>
-    <transparent>false</transparent>
+    </foreground_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_8</name>
+    <x>940</x>
+    <y>70</y>
+    <width>250</width>
+    <height>300</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
-    </border_color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_309</name>
-    <text>Parameters</text>
-    <x>410</x>
-    <y>52</y>
-    <width>765</width>
-    <height>381</height>
+    <name>BGGrey02-title_23</name>
+    <text>More panels</text>
+    <x>940</x>
+    <y>70</y>
+    <width>250</width>
+    <height>50</height>
     <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
       </font>
     </font>
-    <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
       </color>
-    </background_color>
-    <transparent>false</transparent>
+    </foreground_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_7</name>
+    <x>430</x>
+    <y>510</y>
+    <width>760</width>
+    <height>380</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
-    </border_color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_129</name>
-    <text>Acquisition</text>
-    <x>14</x>
-    <y>52</y>
-    <width>387</width>
-    <height>253</height>
+    <name>BGGrey02-title_22</name>
+    <text>Event Receiver</text>
+    <x>430</x>
+    <y>510</y>
+    <width>760</width>
+    <height>50</height>
     <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
       </font>
     </font>
-    <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
       </color>
-    </background_color>
-    <transparent>false</transparent>
+    </foreground_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_6</name>
+    <x>20</x>
+    <y>70</y>
+    <width>390</width>
+    <height>820</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
-    </border_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>120</y>
+    <width>350</width>
+    <height>750</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_23</name>
-    <text>$(P)$(R)</text>
-    <x>5</x>
-    <y>7</y>
-    <width>1177</width>
-    <height>29</height>
+    <name>BGGrey02-title_21</name>
+    <text>SIS8300</text>
+    <x>20</x>
+    <y>70</y>
+    <width>390</width>
+    <height>50</height>
     <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
       </font>
     </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_4</name>
+    <x>430</x>
+    <y>70</y>
+    <width>490</width>
+    <height>420</height>
+    <line_width>0</line_width>
     <background_color>
-      <color name="IO Focus Entry" red="198" green="217" blue="241">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </background_color>
-    <transparent>false</transparent>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_19</name>
+    <text>Acquisition</text>
+    <x>430</x>
+    <y>70</y>
+    <width>490</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>
-    <actions>
-    </actions>
-    <border_width>1</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_7</name>
-    <actions>
-      <action type="open_display">
-        <file>bpmReference.opi</file>
-        <macros>
-          <I>1</I>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>Ref. line 1</text>
-    <x>30</x>
-    <y>820</y>
-    <width>79</width>
-    <height>20</height>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_10</name>
+    <x>450</x>
+    <y>120</y>
+    <width>450</width>
+    <height>350</height>
+    <line_width>0</line_width>
     <background_color>
-      <color red="240" green="240" blue="240">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
-    <tooltip>$(actions)</tooltip>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_8</name>
@@ -148,22 +292,15 @@
     </actions>
     <pv_name>$(P)$(R)Acquire</pv_name>
     <text>Stop</text>
-    <x>292</x>
-    <y>276</y>
-    <width>79</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>770</x>
+    <y>420</y>
+    <width>110</width>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_2</name>
     <pv_name>$(P)$(R)Acquire</pv_name>
-    <x>205</x>
-    <y>88</y>
-    <width>16</width>
-    <height>16</height>
+    <x>770</x>
+    <y>145</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -172,28 +309,16 @@
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_41</name>
     <pv_name>$(P)$(R)Acquire_RBV</pv_name>
-    <x>245</x>
-    <y>84</y>
-    <width>95</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
+    <x>640</x>
+    <y>140</y>
+    <width>110</width>
+    <height>30</height>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -206,13 +331,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_45</name>
     <pv_name>$(P)$(R)NumSamplesR</pv_name>
-    <x>306</x>
-    <y>124</y>
-    <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>640</x>
+    <y>220</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -226,13 +348,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_51</name>
     <pv_name>$(P)$(R)PulseCountR</pv_name>
-    <x>203</x>
-    <y>144</y>
-    <width>139</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>640</x>
+    <y>260</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -246,14 +365,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_60</name>
     <pv_name>$(P)$(R)ArrayRate_RBV</pv_name>
-    <x>203</x>
-    <y>103</y>
-    <width>98</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
+    <x>640</x>
+    <y>180</y>
+    <width>110</width>
+    <height>30</height>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -266,9 +381,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_157</name>
     <text>Rate</text>
-    <x>29</x>
-    <y>103</y>
-    <width>119</width>
+    <x>470</x>
+    <y>180</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -282,9 +398,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_158</name>
     <text>Status</text>
-    <x>29</x>
-    <y>84</y>
-    <width>119</width>
+    <x>470</x>
+    <y>140</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -298,9 +415,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_163</name>
     <text>Pulse counter</text>
-    <x>29</x>
-    <y>144</y>
-    <width>152</width>
+    <x>470</x>
+    <y>260</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -313,10 +431,11 @@
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_166</name>
-    <text>maximum # raw samples</text>
-    <x>29</x>
-    <y>124</y>
-    <width>152</width>
+    <text>max. # raw samples</text>
+    <x>470</x>
+    <y>220</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -330,9 +449,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_271</name>
     <text>Control</text>
-    <x>29</x>
-    <y>276</y>
-    <width>119</width>
+    <x>470</x>
+    <y>420</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -346,9 +466,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_124</name>
     <text>ROI start Trigger</text>
-    <x>419</x>
-    <y>181</y>
-    <width>124</width>
+    <x>1250</x>
+    <y>620</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -362,13 +483,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_70</name>
     <pv_name>$(P)$(R)RoiStartTriggerR</pv_name>
-    <x>675</x>
-    <y>181</y>
+    <x>1390</x>
+    <y>620</y>
     <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -382,9 +500,8 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)RoiStartTrigger</pv_name>
-    <x>558</x>
-    <y>181</y>
-    <height>20</height>
+    <x>1500</x>
+    <y>620</y>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -394,31 +511,22 @@
   <widget type="led" version="2.0.0">
     <name>LED</name>
     <pv_name>$(P)$(R)PulseDoneR</pv_name>
-    <x>366</x>
-    <y>146</y>
-    <width>16</width>
-    <height>16</height>
+    <x>770</x>
+    <y>265</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>
     <actions>
     </actions>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_280</name>
     <text>Pulse missed</text>
-    <x>29</x>
-    <y>164</y>
-    <width>152</width>
+    <x>470</x>
+    <y>300</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -432,13 +540,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_71</name>
     <pv_name>$(P)$(R)PulseMissedR</pv_name>
-    <x>203</x>
-    <y>164</y>
-    <width>139</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>640</x>
+    <y>300</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -452,9 +557,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_125</name>
     <text>Near IQ M</text>
-    <x>434</x>
-    <y>86</y>
-    <width>105</width>
+    <x>1250</x>
+    <y>420</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -468,9 +574,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_60</name>
     <text>Near IQ N</text>
-    <x>434</x>
-    <y>105</y>
-    <width>105</width>
+    <x>1250</x>
+    <y>460</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -484,15 +591,12 @@
   <widget type="spinner" version="2.0.0">
     <name>Spinner_1</name>
     <pv_name>$(P)$(R)NearIQM</pv_name>
-    <x>558</x>
-    <y>86</y>
+    <x>1500</x>
+    <y>420</y>
     <width>99</width>
+    <height>30</height>
     <format>0</format>
     <precision>3</precision>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <actions>
     </actions>
     <minimum>-1.7976931348623157E308</minimum>
@@ -501,15 +605,12 @@
   <widget type="spinner" version="2.0.0">
     <name>Spinner_2</name>
     <pv_name>$(P)$(R)NearIQN</pv_name>
-    <x>558</x>
-    <y>105</y>
+    <x>1500</x>
+    <y>460</y>
     <width>99</width>
+    <height>30</height>
     <format>0</format>
     <precision>3</precision>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <actions>
     </actions>
     <minimum>-1.7976931348623157E308</minimum>
@@ -518,13 +619,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_72</name>
     <pv_name>$(P)$(R)NearIQMR</pv_name>
-    <x>675</x>
-    <y>86</y>
+    <x>1390</x>
+    <y>420</y>
     <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -538,13 +636,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_73</name>
     <pv_name>$(P)$(R)NearIQNR</pv_name>
-    <x>675</x>
-    <y>105</y>
+    <x>1390</x>
+    <y>460</y>
     <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -555,43 +650,13 @@
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_298</name>
-    <text>SIS8300</text>
-    <x>14</x>
-    <y>325</y>
-    <width>387</width>
-    <height>424</height>
-    <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
-      </font>
-    </font>
-    <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
-      </color>
-    </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
-  </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_40</name>
     <pv_name>$(P)$(R)TickValueR</pv_name>
-    <x>212</x>
-    <y>533</y>
-    <width>108</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
+    <x>220</x>
+    <y>490</y>
+    <width>150</width>
+    <height>30</height>
     <format>2</format>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -605,14 +670,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_1</name>
     <pv_name>$(P)$(R)SamplingFrequencyR</pv_name>
-    <x>212</x>
-    <y>514</y>
-    <width>108</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
+    <x>220</x>
+    <y>450</y>
+    <width>150</width>
+    <height>30</height>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -625,9 +686,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_1</name>
     <text>Sampling frequency</text>
-    <x>53</x>
-    <y>514</y>
-    <width>144</width>
+    <x>50</x>
+    <y>450</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -641,9 +703,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_2</name>
     <text>Time tick</text>
-    <x>53</x>
-    <y>533</y>
-    <width>144</width>
+    <x>50</x>
+    <y>490</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -657,29 +720,21 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_69</name>
     <pv_name>$(P)$(R)MessageR</pv_name>
-    <x>29</x>
-    <y>705</y>
-    <width>360</width>
-    <height>43</height>
-    <foreground_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
-      </color>
-    </background_color>
+    <x>220</x>
+    <y>770</y>
+    <width>150</width>
+    <height>80</height>
     <format>6</format>
     <actions>
     </actions>
-    <border_width>1</border_width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_273</name>
     <text>Driver message</text>
-    <x>53</x>
-    <y>685</y>
-    <width>144</width>
+    <x>50</x>
+    <y>770</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -693,9 +748,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_315</name>
     <text>Trigger repeat</text>
-    <x>29</x>
-    <y>238</y>
-    <width>119</width>
+    <x>470</x>
+    <y>380</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -709,13 +765,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_105</name>
     <pv_name>$(P)$(R)TriggerRepeatR</pv_name>
-    <x>299</x>
-    <y>238</y>
-    <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>640</x>
+    <y>380</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -729,14 +782,11 @@
   <widget type="spinner" version="2.0.0">
     <name>Spinner_7</name>
     <pv_name>$(P)$(R)TriggerRepeat</pv_name>
-    <x>203</x>
-    <y>238</y>
-    <width>89</width>
+    <x>770</x>
+    <y>380</y>
+    <width>110</width>
+    <height>30</height>
     <format>0</format>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <actions>
     </actions>
     <minimum>-1.0</minimum>
@@ -745,14 +795,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_106</name>
     <pv_name>$(P)$(R)TickValueIQR</pv_name>
-    <x>212</x>
-    <y>552</y>
-    <width>108</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
+    <x>220</x>
+    <y>530</y>
+    <width>150</width>
+    <height>30</height>
     <format>2</format>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -766,9 +812,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_316</name>
     <text>IQ time tick</text>
-    <x>53</x>
-    <y>552</y>
-    <width>144</width>
+    <x>50</x>
+    <y>530</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -782,14 +829,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_108</name>
     <pv_name>$(P)$(R)BPMFWGitHashR</pv_name>
-    <x>212</x>
-    <y>476</y>
-    <width>108</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
+    <x>220</x>
+    <y>370</y>
+    <width>150</width>
+    <height>30</height>
     <format>4</format>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -803,9 +846,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_319</name>
     <text>FW GIT hash</text>
-    <x>53</x>
-    <y>476</y>
-    <width>144</width>
+    <x>50</x>
+    <y>370</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -819,14 +863,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_109</name>
     <pv_name>$(P)$(R)BPMFWVersionR</pv_name>
-    <x>212</x>
-    <y>495</y>
-    <width>108</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
+    <x>220</x>
+    <y>410</y>
+    <width>150</width>
+    <height>30</height>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -839,9 +879,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_320</name>
     <text>FW version</text>
-    <x>53</x>
-    <y>495</y>
-    <width>144</width>
+    <x>50</x>
+    <y>410</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -855,9 +896,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_321</name>
     <text>BPM Ready</text>
-    <x>799</x>
-    <y>156</y>
-    <width>122</width>
+    <x>1660</x>
+    <y>460</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -871,13 +913,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_110</name>
     <pv_name>$(P)$(R)ReadyR</pv_name>
-    <x>1048</x>
-    <y>156</y>
-    <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>1802</x>
+    <y>460</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -891,9 +930,8 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_1</name>
     <pv_name>$(P)$(R)Ready</pv_name>
-    <x>937</x>
-    <y>156</y>
-    <height>20</height>
+    <x>1910</x>
+    <y>460</y>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -903,9 +941,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_322</name>
     <text>RJ45 force</text>
-    <x>434</x>
-    <y>324</y>
-    <width>105</width>
+    <x>1660</x>
+    <y>620</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -919,13 +958,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_111</name>
     <pv_name>$(P)$(R)RJ45ForceR</pv_name>
-    <x>675</x>
-    <y>324</y>
+    <x>1802</x>
+    <y>620</y>
     <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -939,9 +975,8 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_2</name>
     <pv_name>$(P)$(R)RJ45Force</pv_name>
-    <x>558</x>
-    <y>324</y>
-    <height>20</height>
+    <x>1912</x>
+    <y>620</y>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -951,9 +986,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_323</name>
     <text>RJ45 line 1</text>
-    <x>434</x>
-    <y>343</y>
-    <width>105</width>
+    <x>1660</x>
+    <y>660</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -967,13 +1003,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_112</name>
     <pv_name>$(P)$(R)RJ45Line1R</pv_name>
-    <x>675</x>
-    <y>343</y>
+    <x>1802</x>
+    <y>660</y>
     <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -987,9 +1020,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_327</name>
     <text>RJ45 line 2</text>
-    <x>434</x>
-    <y>362</y>
-    <width>105</width>
+    <x>1660</x>
+    <y>700</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1003,13 +1037,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_113</name>
     <pv_name>$(P)$(R)RJ45Line2R</pv_name>
-    <x>675</x>
-    <y>362</y>
+    <x>1802</x>
+    <y>700</y>
     <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1023,9 +1054,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_328</name>
     <text>RJ45 line 3</text>
-    <x>434</x>
-    <y>381</y>
-    <width>105</width>
+    <x>1660</x>
+    <y>740</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1039,13 +1071,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_114</name>
     <pv_name>$(P)$(R)RJ45Line3R</pv_name>
-    <x>675</x>
-    <y>381</y>
+    <x>1802</x>
+    <y>740</y>
     <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1059,9 +1088,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_329</name>
     <text>RJ45 line 4</text>
-    <x>434</x>
-    <y>400</y>
-    <width>105</width>
+    <x>1660</x>
+    <y>780</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1075,13 +1105,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_115</name>
     <pv_name>$(P)$(R)RJ45Line4R</pv_name>
-    <x>675</x>
-    <y>400</y>
+    <x>1802</x>
+    <y>780</y>
     <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1095,9 +1122,8 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_3</name>
     <pv_name>$(P)$(R)RJ45Line1</pv_name>
-    <x>558</x>
-    <y>343</y>
-    <height>20</height>
+    <x>1912</x>
+    <y>660</y>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -1107,9 +1133,8 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_4</name>
     <pv_name>$(P)$(R)RJ45Line2</pv_name>
-    <x>558</x>
-    <y>362</y>
-    <height>20</height>
+    <x>1912</x>
+    <y>700</y>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -1119,9 +1144,8 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_5</name>
     <pv_name>$(P)$(R)RJ45Line3</pv_name>
-    <x>558</x>
-    <y>381</y>
-    <height>20</height>
+    <x>1912</x>
+    <y>740</y>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -1131,9 +1155,8 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_6</name>
     <pv_name>$(P)$(R)RJ45Line4</pv_name>
-    <x>558</x>
-    <y>400</y>
-    <height>20</height>
+    <x>1912</x>
+    <y>780</y>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -1143,9 +1166,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_207</name>
     <text>Model</text>
-    <x>53</x>
-    <y>381</y>
-    <width>144</width>
+    <x>50</x>
+    <y>170</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1159,14 +1183,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_96</name>
     <pv_name>$(P)$(R)Model_RBV</pv_name>
-    <x>212</x>
-    <y>381</y>
-    <width>108</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
+    <x>220</x>
+    <y>170</y>
+    <width>150</width>
+    <height>30</height>
     <format>6</format>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1180,9 +1200,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_208</name>
     <text>Firmware version</text>
-    <x>53</x>
-    <y>400</y>
-    <width>144</width>
+    <x>50</x>
+    <y>210</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1196,14 +1217,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_97</name>
     <pv_name>$(P)$(R)FirmwareVersion_RBV</pv_name>
-    <x>212</x>
-    <y>400</y>
-    <width>108</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
+    <x>220</x>
+    <y>210</y>
+    <width>150</width>
+    <height>30</height>
     <format>6</format>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1217,9 +1234,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_209</name>
     <text>Serial number</text>
-    <x>53</x>
-    <y>419</y>
-    <width>144</width>
+    <x>50</x>
+    <y>250</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1233,14 +1251,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_98</name>
     <pv_name>$(P)$(R)SerialNumber_RBV</pv_name>
-    <x>212</x>
-    <y>419</y>
-    <width>108</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
+    <x>220</x>
+    <y>250</y>
+    <width>150</width>
+    <height>30</height>
     <format>6</format>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1254,9 +1268,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_210</name>
     <text>Memory size</text>
-    <x>53</x>
-    <y>438</y>
-    <width>144</width>
+    <x>50</x>
+    <y>290</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1270,14 +1285,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_99</name>
     <pv_name>$(P)$(R)MemorySizeR</pv_name>
-    <x>212</x>
-    <y>438</y>
-    <width>108</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
+    <x>220</x>
+    <y>290</y>
+    <width>150</width>
+    <height>30</height>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1290,9 +1301,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_211</name>
     <text>Manufacturer</text>
-    <x>53</x>
-    <y>362</y>
-    <width>144</width>
+    <x>50</x>
+    <y>130</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1306,14 +1318,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_100</name>
     <pv_name>$(P)$(R)Manufacturer_RBV</pv_name>
-    <x>212</x>
-    <y>362</y>
-    <width>108</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
+    <x>220</x>
+    <y>130</y>
+    <width>150</width>
+    <height>30</height>
     <format>6</format>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1327,9 +1335,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_212</name>
     <text>Device path</text>
-    <x>53</x>
-    <y>457</y>
-    <width>144</width>
+    <x>50</x>
+    <y>330</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1343,14 +1352,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_121</name>
     <pv_name>$(P)$(R)DevicePathR</pv_name>
-    <x>212</x>
-    <y>457</y>
-    <width>108</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
+    <x>220</x>
+    <y>330</y>
+    <width>150</width>
+    <height>30</height>
     <format>6</format>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1364,9 +1369,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_336</name>
     <text>ROI end Trigger</text>
-    <x>419</x>
-    <y>200</y>
-    <width>124</width>
+    <x>1250</x>
+    <y>660</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1380,13 +1386,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_122</name>
     <pv_name>$(P)$(R)RoiEndTriggerR</pv_name>
-    <x>675</x>
-    <y>200</y>
+    <x>1390</x>
+    <y>660</y>
     <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1400,9 +1403,8 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_7</name>
     <pv_name>$(P)$(R)RoiEndTrigger</pv_name>
-    <x>558</x>
-    <y>200</y>
-    <height>20</height>
+    <x>1500</x>
+    <y>660</y>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -1412,13 +1414,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_123</name>
     <pv_name>$(P)$(R)AcquisitionSampleCountR</pv_name>
-    <x>675</x>
-    <y>219</y>
+    <x>1390</x>
+    <y>700</y>
     <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1432,9 +1431,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_337</name>
     <text>Acq. sample count</text>
-    <x>419</x>
-    <y>219</y>
-    <width>124</width>
+    <x>1250</x>
+    <y>700</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1448,13 +1448,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_124</name>
     <pv_name>$(P)$(R)RoiSampleCountR</pv_name>
-    <x>675</x>
-    <y>238</y>
+    <x>1390</x>
+    <y>740</y>
     <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1468,9 +1465,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_338</name>
     <text>ROI sample count</text>
-    <x>419</x>
-    <y>238</y>
-    <width>124</width>
+    <x>1250</x>
+    <y>740</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1484,14 +1482,11 @@
   <widget type="spinner" version="2.0.0">
     <name>Spinner_8</name>
     <pv_name>$(P)$(R)NumSamples</pv_name>
-    <x>203</x>
-    <y>124</y>
-    <width>97</width>
+    <x>770</x>
+    <y>220</y>
+    <width>110</width>
+    <height>30</height>
     <format>0</format>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <actions>
     </actions>
     <minimum>-1.0</minimum>
@@ -1500,9 +1495,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_339</name>
     <text>Control</text>
-    <x>804</x>
-    <y>332</y>
-    <width>105</width>
+    <x>1250</x>
+    <y>180</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1516,10 +1512,8 @@
   <widget type="led" version="2.0.0">
     <name>LED_4</name>
     <pv_name>$(P)$(R)EnergyInterlockControlR</pv_name>
-    <x>933</x>
-    <y>334</y>
-    <width>16</width>
-    <height>16</height>
+    <x>1400</x>
+    <y>185</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -1528,35 +1522,8 @@
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_36</name>
-    <text>Energy interlock</text>
-    <x>786</x>
-    <y>313</y>
-    <width>142</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <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_43</name>
@@ -1568,18 +1535,9 @@
     </actions>
     <pv_name>$(P)$(R)EnergyInterlockControl</pv_name>
     <text>Enable</text>
-    <x>984</x>
-    <y>332</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>1448</x>
+    <y>180</y>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_44</name>
@@ -1591,25 +1549,17 @@
     </actions>
     <pv_name>$(P)$(R)EnergyInterlockControl</pv_name>
     <text>Disable</text>
-    <x>1068</x>
-    <y>332</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>1532</x>
+    <y>180</y>
+    <width>60</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_66</name>
     <text>Lower threshold</text>
-    <x>804</x>
-    <y>370</y>
-    <width>105</width>
+    <x>1250</x>
+    <y>260</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1623,12 +1573,9 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)EnergyInterlockLowerThreshold</pv_name>
-    <x>928</x>
-    <y>370</y>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>1500</x>
+    <y>260</y>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1640,13 +1587,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_76</name>
     <pv_name>$(P)$(R)EnergyInterlockLowerThresholdR</pv_name>
-    <x>1045</x>
-    <y>370</y>
-    <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>1390</x>
+    <y>260</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1660,9 +1604,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_343</name>
     <text>Status</text>
-    <x>804</x>
-    <y>351</y>
-    <width>105</width>
+    <x>1250</x>
+    <y>220</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1683,26 +1628,15 @@
     </actions>
     <pv_name>$(P)$(R)EnergyInterlockClear</pv_name>
     <text>Clear</text>
-    <x>984</x>
-    <y>351</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>1448</x>
+    <y>220</y>
+    <width>60</width>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_3</name>
     <pv_name>$(P)$(R)EnergyInterlockStatusR</pv_name>
-    <x>933</x>
-    <y>353</y>
-    <width>16</width>
-    <height>16</height>
+    <x>1400</x>
+    <y>225</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -1711,62 +1645,14 @@
       <color name="Major" red="250" green="12" blue="14">
       </color>
     </on_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>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_344</name>
-    <text>RJ45 lines</text>
-    <x>416</x>
-    <y>305</y>
-    <width>142</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <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_345</name>
-    <text>Trigger lines</text>
-    <x>416</x>
-    <y>143</y>
-    <width>142</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_6</name>
     <pv_name>$(P)$(R)AngleDiffPhaseUnwrapControlR</pv_name>
-    <x>940</x>
-    <y>107</y>
-    <width>16</width>
-    <height>16</height>
+    <x>1820</x>
+    <y>385</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -1775,14 +1661,6 @@
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -1796,18 +1674,9 @@
     </actions>
     <pv_name>$(P)$(R)AngleDiffPhaseUnwrapControl</pv_name>
     <text>Enable</text>
-    <x>991</x>
-    <y>105</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>1870</x>
+    <y>380</y>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_47</name>
@@ -1819,25 +1688,17 @@
     </actions>
     <pv_name>$(P)$(R)AngleDiffPhaseUnwrapControl</pv_name>
     <text>Disable</text>
-    <x>1075</x>
-    <y>105</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>1950</x>
+    <y>380</y>
+    <width>60</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_346</name>
     <text>Control</text>
-    <x>810</x>
-    <y>105</y>
-    <width>105</width>
+    <x>1660</x>
+    <y>380</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1851,9 +1712,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_347</name>
     <text>Threshold</text>
-    <x>810</x>
-    <y>126</y>
-    <width>105</width>
+    <x>1660</x>
+    <y>420</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1867,12 +1729,9 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_6</name>
     <pv_name>$(P)$(R)AngleDiffPhaseUnwrap</pv_name>
-    <x>937</x>
-    <y>126</y>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>1910</x>
+    <y>420</y>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1884,12 +1743,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_126</name>
     <pv_name>$(P)$(R)AngleDiffPhaseUnwrapR</pv_name>
-    <x>1051</x>
-    <y>126</y>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>1800</x>
+    <y>420</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1900,31 +1757,13 @@
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_342</name>
-    <text>Phase unwrap for angle difference</text>
-    <x>792</x>
-    <y>86</y>
-    <width>221</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <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_351</name>
     <text>Acquisition Trigger</text>
-    <x>419</x>
-    <y>162</y>
-    <width>124</width>
+    <x>1250</x>
+    <y>580</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1938,13 +1777,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_128</name>
     <pv_name>$(P)$(R)AcquisitionTriggerR</pv_name>
-    <x>675</x>
-    <y>162</y>
+    <x>1390</x>
+    <y>580</y>
     <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1958,9 +1794,8 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_8</name>
     <pv_name>$(P)$(R)AcquisitionTrigger</pv_name>
-    <x>558</x>
-    <y>162</y>
-    <height>20</height>
+    <x>1500</x>
+    <y>580</y>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -1970,13 +1805,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_129</name>
     <pv_name>$(P)$(R)RoiFirstSampleR</pv_name>
-    <x>675</x>
-    <y>257</y>
+    <x>1390</x>
+    <y>780</y>
     <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1990,9 +1822,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_352</name>
     <text>ROI first sample</text>
-    <x>419</x>
-    <y>257</y>
-    <width>124</width>
+    <x>1250</x>
+    <y>780</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2006,13 +1839,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_130</name>
     <pv_name>$(P)$(R)RoiLastSampleR</pv_name>
-    <x>675</x>
-    <y>276</y>
+    <x>1390</x>
+    <y>820</y>
     <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2026,9 +1856,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_353</name>
     <text>ROI last sample</text>
-    <x>419</x>
-    <y>276</y>
-    <width>124</width>
+    <x>1250</x>
+    <y>820</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2042,13 +1873,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_131</name>
     <pv_name>$(P)$(R)PcieStartTimeR</pv_name>
-    <x>203</x>
-    <y>616</y>
-    <width>139</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>220</x>
+    <y>650</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2062,9 +1890,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_354</name>
     <text>PCIe start</text>
-    <x>29</x>
-    <y>616</y>
-    <width>119</width>
+    <x>50</x>
+    <y>650</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2078,9 +1907,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_355</name>
     <text>Self-trigger armed</text>
-    <x>799</x>
-    <y>187</y>
-    <width>122</width>
+    <x>1660</x>
+    <y>500</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2094,13 +1924,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_132</name>
     <pv_name>$(P)$(R)SelfTriggerArmedR</pv_name>
-    <x>1048</x>
-    <y>187</y>
-    <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>1802</x>
+    <y>500</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2114,9 +1941,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_356</name>
     <text>Upper threshold</text>
-    <x>804</x>
-    <y>388</y>
-    <width>105</width>
+    <x>1250</x>
+    <y>300</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2130,12 +1958,9 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_8</name>
     <pv_name>$(P)$(R)EnergyInterlockUpperThreshold</pv_name>
-    <x>928</x>
-    <y>388</y>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>1500</x>
+    <y>300</y>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2147,13 +1972,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_133</name>
     <pv_name>$(P)$(R)EnergyInterlockUpperThresholdR</pv_name>
-    <x>1045</x>
-    <y>388</y>
-    <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>1390</x>
+    <y>300</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2167,9 +1989,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_357</name>
     <text>Clock alive</text>
-    <x>799</x>
-    <y>242</y>
-    <width>122</width>
+    <x>1660</x>
+    <y>180</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2180,32 +2003,11 @@
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_358</name>
-    <text>Health status</text>
-    <x>795</x>
-    <y>223</y>
-    <width>221</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
   <widget type="led" version="2.0.0">
     <name>LED_7</name>
     <pv_name>$(P)$(R)HealthClockAliveR</pv_name>
-    <x>943</x>
-    <y>244</y>
-    <width>16</width>
-    <height>16</height>
+    <x>1820</x>
+    <y>185</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -2214,23 +2016,16 @@
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_359</name>
     <text>Clock interrupted</text>
-    <x>799</x>
-    <y>261</y>
-    <width>122</width>
+    <x>1660</x>
+    <y>220</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2244,10 +2039,8 @@
   <widget type="led" version="2.0.0">
     <name>LED_8</name>
     <pv_name>$(P)$(R)HealthClockIntrR</pv_name>
-    <x>943</x>
-    <y>263</y>
-    <width>16</width>
-    <height>16</height>
+    <x>1820</x>
+    <y>225</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -2256,14 +2049,6 @@
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -2277,25 +2062,17 @@
     </actions>
     <pv_name>$(P)$(R)HealthClockIntrClear</pv_name>
     <text>Clear</text>
-    <x>1006</x>
-    <y>261</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>1860</x>
+    <y>220</y>
+    <width>60</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_360</name>
     <text>Clock frequency</text>
-    <x>799</x>
-    <y>280</y>
-    <width>122</width>
+    <x>1660</x>
+    <y>260</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2309,13 +2086,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_134</name>
     <pv_name>$(P)$(R)HealthClockFrequencyR</pv_name>
-    <x>946</x>
-    <y>280</y>
+    <x>1800</x>
+    <y>260</y>
     <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2328,9 +2102,9 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container</name>
-    <file>../../opi/adsis8300/sis8300-evr.bob</file>
-    <x>416</x>
-    <y>446</y>
+    <file>../adsis8300/sis8300-evr.bob</file>
+    <x>450</x>
+    <y>560</y>
     <width>720</width>
     <height>310</height>
     <resize>2</resize>
@@ -2341,47 +2115,6 @@
       </color>
     </border_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_49</name>
-    <actions>
-      <action type="open_display">
-        <file>bpmReference.opi</file>
-        <macros>
-          <I>2</I>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>Ref. line 2</text>
-    <x>118</x>
-    <y>820</y>
-    <width>79</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_50</name>
-    <actions>
-      <action type="open_display">
-        <file>bpmAngleDifference.opi</file>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>Angle diff.</text>
-    <x>208</x>
-    <y>820</y>
-    <width>79</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_51</name>
     <actions>
@@ -2392,69 +2125,17 @@
     </actions>
     <pv_name>$(P)$(R)Acquire</pv_name>
     <text>Start</text>
-    <x>207</x>
-    <y>276</y>
-    <width>79</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_52</name>
-    <actions>
-      <action type="open_display">
-        <file>bpmInstance.opi</file>
-        <macros>
-          <CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
-          <P>$(SYSTEM1)</P>
-          <R></R>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>$(SYSTEM1)</text>
-    <x>330</x>
-    <y>820</y>
-    <width>214</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_53</name>
-    <actions>
-      <action type="open_display">
-        <file>bpmInstance.opi</file>
-        <macros>
-          <CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
-          <P>$(SYSTEM2)</P>
-          <R></R>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>$(SYSTEM2)</text>
-    <x>554</x>
-    <y>820</y>
-    <width>214</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
+    <x>640</x>
+    <y>420</y>
+    <width>110</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_362</name>
     <text>PCIe end</text>
-    <x>29</x>
-    <y>636</y>
-    <width>119</width>
+    <x>50</x>
+    <y>690</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2468,13 +2149,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_135</name>
     <pv_name>$(P)$(R)PcieEndTimeR</pv_name>
-    <x>203</x>
-    <y>636</y>
-    <width>139</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>220</x>
+    <y>690</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2488,9 +2166,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_363</name>
     <text>PCIe time</text>
-    <x>29</x>
-    <y>656</y>
-    <width>119</width>
+    <x>50</x>
+    <y>730</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2504,13 +2183,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_136</name>
     <pv_name>$(P)$(R)PcieTransferTimeR</pv_name>
-    <x>203</x>
-    <y>656</y>
-    <width>139</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>220</x>
+    <y>730</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2524,9 +2200,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_364</name>
     <text>PCIe link speed</text>
-    <x>72</x>
-    <y>572</y>
-    <width>119</width>
+    <x>50</x>
+    <y>570</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2540,13 +2217,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_137</name>
     <pv_name>$(P)$(R)PcieLinkSpeedR</pv_name>
-    <x>197</x>
-    <y>572</y>
-    <width>139</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>220</x>
+    <y>570</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2560,9 +2234,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_365</name>
     <text>PCIe link width</text>
-    <x>72</x>
-    <y>592</y>
-    <width>119</width>
+    <x>50</x>
+    <y>610</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2576,13 +2251,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_138</name>
     <pv_name>$(P)$(R)PcieLinkWidthR</pv_name>
-    <x>197</x>
-    <y>592</y>
-    <width>139</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>220</x>
+    <y>610</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2596,9 +2268,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_281</name>
     <text>Pulse missed count</text>
-    <x>29</x>
-    <y>184</y>
-    <width>152</width>
+    <x>470</x>
+    <y>340</y>
+    <width>160</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2612,13 +2285,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_74</name>
     <pv_name>$(P)$(R)PulseMissedCountR</pv_name>
-    <x>203</x>
-    <y>184</y>
-    <width>139</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>640</x>
+    <y>340</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2629,4 +2299,252 @@
       </color>
     </border_color>
   </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_13</name>
+    <x>960</x>
+    <y>120</y>
+    <width>210</width>
+    <height>230</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="action_button" version="3.0.0">
+    <name>Action Button_53</name>
+    <actions>
+      <action type="open_display">
+        <file>bpmInstance.opi</file>
+        <macros>
+          <CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
+          <P>$(SYSTEM2)</P>
+          <R></R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>$(SYSTEM2)</text>
+    <x>980</x>
+    <y>300</y>
+    <width>170</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_52</name>
+    <actions>
+      <action type="open_display">
+        <file>bpmInstance.opi</file>
+        <macros>
+          <CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
+          <P>$(SYSTEM1)</P>
+          <R></R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>$(SYSTEM1)</text>
+    <x>980</x>
+    <y>260</y>
+    <width>170</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_50</name>
+    <actions>
+      <action type="open_display">
+        <file>bpmAngleDifference.opi</file>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Angle difference</text>
+    <x>980</x>
+    <y>220</y>
+    <width>170</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_49</name>
+    <actions>
+      <action type="open_display">
+        <file>bpmReference.opi</file>
+        <macros>
+          <I>2</I>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Ref. line 2</text>
+    <x>980</x>
+    <y>180</y>
+    <width>170</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_7</name>
+    <actions>
+      <action type="open_display">
+        <file>bpmReference.opi</file>
+        <macros>
+          <I>1</I>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Ref. line 1</text>
+    <x>980</x>
+    <y>140</y>
+    <width>170</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_25</name>
+    <text>Trigger lines</text>
+    <x>1230</x>
+    <y>520</y>
+    <width>390</width>
+    <height>40</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.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_26</name>
+    <text>RJ45 lines</text>
+    <x>1640</x>
+    <y>560</y>
+    <width>390</width>
+    <height>40</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.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_27</name>
+    <text>Phase unwrap for angle difference</text>
+    <x>1640</x>
+    <y>320</y>
+    <width>390</width>
+    <height>40</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.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_28</name>
+    <text>Near IQ</text>
+    <x>1230</x>
+    <y>360</y>
+    <width>390</width>
+    <height>40</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.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_29</name>
+    <text>Health status</text>
+    <x>1640</x>
+    <y>120</y>
+    <width>390</width>
+    <height>40</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.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_30</name>
+    <text>Energy interlock</text>
+    <x>1230</x>
+    <y>120</y>
+    <width>390</width>
+    <height>40</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>2070</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)$(R)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>2030</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>
 </display>
diff --git a/99-Shared/adsis8300bpm/bpmAngleDifference.bob b/99-Shared/adsis8300bpm/bpmAngleDifference.bob
index 919445239c77f92f5be667644f392c292a6453c1..d0767b3c8df70f402cc755d91fb4cbdc309efef9 100644
--- a/99-Shared/adsis8300bpm/bpmAngleDifference.bob
+++ b/99-Shared/adsis8300bpm/bpmAngleDifference.bob
@@ -1,47 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <width>448</width>
-  <height>69</height>
-  <background_color>
-    <color red="240" green="240" blue="240">
-    </color>
-  </background_color>
+  <width>570</width>
+  <height>180</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>570</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>Label_276</name>
+    <name>title</name>
+    <class>TITLE</class>
     <text>Angle difference</text>
-    <width>448</width>
-    <height>69</height>
-    <font>
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>530</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>BGGrey03-titlebar_4</name>
+    <x>20</x>
+    <y>70</y>
+    <width>530</width>
+    <height>90</height>
+    <line_width>0</line_width>
     <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
+    <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>90</y>
+    <width>490</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
-    </border_color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_18</name>
+    <file>bpmChannelAverageItem.opi</file>
     <macros>
       <CH>DIFF-A-</CH>
     </macros>
-    <file>bpmChannelAverageItem.opi</file>
-    <x>18</x>
-    <y>42</y>
-    <width>420</width>
-    <height>20</height>
+    <x>50</x>
+    <y>100</y>
+    <width>470</width>
+    <height>30</height>
     <resize>2</resize>
     <actions>
     </actions>
diff --git a/99-Shared/adsis8300bpm/bpmChannel.bob b/99-Shared/adsis8300bpm/bpmChannel.bob
index cd2ec05e20c8b97eae915172010e4e906ab35d8d..91cc36849213e3f17a5c4da7187ea5f16e50514a 100644
--- a/99-Shared/adsis8300bpm/bpmChannel.bob
+++ b/99-Shared/adsis8300bpm/bpmChannel.bob
@@ -3,63 +3,173 @@
   <name>BPM Ch $(CH)</name>
   <x>470</x>
   <y>197</y>
-  <width>1550</width>
-  <height>800</height>
+  <width>1950</width>
+  <height>910</height>
   <background_color>
-    <color red="240" green="240" blue="240">
+    <color name="BACKGROUND" red="220" green="225" blue="221">
     </color>
   </background_color>
   <actions>
   </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>445</x>
-    <y>11</y>
-    <width>741</width>
-    <height>25</height>
+    <name>BGGrey03-titlebar_7</name>
+    <x>1010</x>
+    <y>70</y>
+    <width>920</width>
+    <height>660</height>
     <line_width>0</line_width>
-    <line_color>
-      <color red="128" green="0" blue="255">
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
-    </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_19</name>
+    <x>1030</x>
+    <y>120</y>
+    <width>880</width>
+    <height>590</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</name>
-    <text>PV prefix: $(P)$(R)$(CH)</text>
-    <x>445</x>
-    <y>12</y>
-    <width>741</width>
-    <height>25</height>
+    <name>BGGrey02-title_28</name>
+    <text>ArrayData</text>
+    <x>1010</x>
+    <y>70</y>
+    <width>920</width>
+    <height>50</height>
     <font>
-      <font family="Sans" style="REGULAR" size="14.851485148514852">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
       </font>
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <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>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_5</name>
+    <x>520</x>
+    <y>70</y>
+    <width>470</width>
+    <height>660</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
-    </border_color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_4</name>
+    <x>20</x>
+    <y>70</y>
+    <width>480</width>
+    <height>820</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_19</name>
+    <text>Status</text>
+    <x>20</x>
+    <y>70</y>
+    <width>480</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_10</name>
+    <x>40</x>
+    <y>120</y>
+    <width>440</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>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1950</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)$(CH)Name</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1910</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>
+    <rules>
+      <rule name="text" prop_id="text" out_exp="true">
+        <exp bool_exp="pv0">
+          <expression>pvStr0</expression>
+        </exp>
+        <pv_name>$(P)$(CH)Name</pv_name>
+      </rule>
+    </rules>
+    <tooltip>Prefix: $(P)$(R)$(CH)</tooltip>
   </widget>
   <widget type="xyplot" version="2.0.0">
     <name>XY Graph</name>
-    <x>400</x>
-    <y>55</y>
+    <x>1040</x>
+    <y>130</y>
     <width>847</width>
-    <height>358</height>
+    <height>570</height>
     <background_color>
-      <color red="240" green="240" blue="240">
+      <color name="Transparent" red="255" green="255" blue="255" alpha="0">
       </color>
     </background_color>
     <title_font>
@@ -140,17 +250,12 @@ $(pv_value)</tooltip>
     </traces>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_1</name>
-    <text>Time link or
-time/point</text>
-    <x>24</x>
-    <y>75</y>
-    <width>94</width>
-    <height>36</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <name>Label_10</name>
+    <text>Control</text>
+    <x>60</x>
+    <y>140</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -161,40 +266,30 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input</name>
-    <pv_name>$(P)$(R)$(CH)TR1-TimePerPointLink.DOL</pv_name>
-    <x>140</x>
-    <y>83</y>
-    <width>217</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-    <format>6</format>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_81</name>
+    <pv_name>$(P)$(R)$(CH)PcieTransferTimeR</pv_name>
+    <x>190</x>
+    <y>421</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
     </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
     <border_color>
       <color red="0" green="128" blue="255">
       </color>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_2</name>
-    <text>Time/point</text>
-    <x>22</x>
-    <y>119</y>
-    <width>96</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <name>Label_303</name>
+    <text>PCIe time</text>
+    <x>60</x>
+    <y>420</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -206,24 +301,12 @@ time/point</text>
     </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>Text Update</name>
-    <pv_name>$(P)$(R)$(CH)TR1-TimePerPoint</pv_name>
-    <x>141</x>
-    <y>120</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>2</format>
+    <name>Text Update_80</name>
+    <pv_name>$(P)$(R)$(CH)PcieStartTimeR</pv_name>
+    <x>190</x>
+    <y>381</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -234,42 +317,64 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_1</name>
-    <pv_name>$(P)$(R)$(CH)DoneR</pv_name>
-    <x>142</x>
-    <y>240</y>
-    <width>16</width>
-    <height>16</height>
-    <off_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </on_color>
-    <foreground_color>
-      <color red="192" green="192" blue="192">
+  <widget type="label" version="2.0.0">
+    <name>Label_302</name>
+    <text>PCIe start</text>
+    <x>60</x>
+    <y>380</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </foreground_color>
-    <line_color>
-      <color red="150" green="150" blue="150">
+    </border_color>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_7</name>
+    <pv_name>$(P)$(R)$(CH)MemoryAddress</pv_name>
+    <x>330</x>
+    <y>460</y>
+    <width>130</width>
+    <height>30</height>
+    <show_units>false</show_units>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </line_color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_79</name>
+    <pv_name>$(P)$(R)$(CH)MemoryAddressR</pv_name>
+    <x>190</x>
+    <y>460</y>
+    <width>130</width>
+    <height>30</height>
+    <format>1</format>
+    <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
     </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_3</name>
-    <text>Num bytes</text>
-    <x>2</x>
-    <y>143</y>
-    <width>116</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <name>Label_297</name>
+    <text>Memory addr.</text>
+    <x>60</x>
+    <y>460</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -281,23 +386,12 @@ time/point</text>
     </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>Text Update_1</name>
-    <pv_name>$(P)$(R)$(CH)NumBytesR</pv_name>
-    <x>141</x>
-    <y>144</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <name>Text Update_19</name>
+    <pv_name>$(P)$(R)$(CH)NumSamplesR</pv_name>
+    <x>190</x>
+    <y>340</y>
+    <width>130</width>
+    <height>30</height>
     <precision>0</precision>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -310,15 +404,12 @@ time/point</text>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_4</name>
-    <text>Done</text>
-    <x>18</x>
-    <y>240</y>
-    <width>96</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <name>Label_33</name>
+    <text>Num samples</text>
+    <x>60</x>
+    <y>340</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -329,42 +420,57 @@ time/point</text>
       </color>
     </border_color>
   </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_10</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)$(CH)Control</pv_name>
+    <text>Disable</text>
+    <x>330</x>
+    <y>140</y>
+    <width>60</width>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_9</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)$(CH)Control</pv_name>
+    <text>Enable</text>
+    <x>260</x>
+    <y>140</y>
+    <width>60</width>
+  </widget>
   <widget type="led" version="2.0.0">
-    <name>LED_1</name>
-    <pv_name>$(P)$(R)$(CH)ActiveR</pv_name>
-    <x>335</x>
-    <y>240</y>
-    <width>16</width>
-    <height>16</height>
+    <name>LED_3</name>
+    <pv_name>$(P)$(R)$(CH)Status</pv_name>
+    <x>210</x>
+    <y>145</y>
     <off_color>
-      <color name="IO Background" red="235" green="235" blue="235">
+      <color name="Major" red="250" green="12" blue="14">
       </color>
     </off_color>
     <on_color>
-      <color name="Major" red="250" green="12" blue="14">
+      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_5</name>
     <text>Active</text>
-    <x>210</x>
-    <y>240</y>
-    <width>96</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>220</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -376,88 +482,132 @@ time/point</text>
     </border_color>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>LED_2</name>
-    <pv_name>$(P)$(R)$(CH)ConvStatus</pv_name>
-    <x>137</x>
-    <y>320</y>
-    <width>16</width>
-    <height>16</height>
+    <name>LED_1</name>
+    <pv_name>$(P)$(R)$(CH)ActiveR</pv_name>
+    <x>210</x>
+    <y>220</y>
     <off_color>
-      <color name="Major" red="250" green="12" blue="14">
+      <color name="IO Background" red="235" green="235" blue="235">
       </color>
     </off_color>
     <on_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+      <color name="Major" red="250" green="12" blue="14">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_7</name>
+  <widget type="label" version="2.0.0">
+    <name>Label_4</name>
+    <text>Done</text>
+    <x>60</x>
+    <y>180</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
-      </action>
     </actions>
-    <pv_name>$(P)$(R)$(CH)ConvControl</pv_name>
-    <text>Enable</text>
-    <x>154</x>
-    <y>318</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
+    </border_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_8</name>
-    <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>0</value>
-      </action>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(P)$(R)$(CH)NumBytesR</pv_name>
+    <x>190</x>
+    <y>300</y>
+    <width>130</width>
+    <height>30</height>
+    <precision>0</precision>
+    <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
     </actions>
-    <pv_name>$(P)$(R)$(CH)ConvControl</pv_name>
-    <text>Disable</text>
-    <x>213</x>
-    <y>318</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_6</name>
-    <text>Converting</text>
-    <x>13</x>
-    <y>289</y>
-    <width>80</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
+    <name>Label_3</name>
+    <text>Num bytes</text>
+    <x>60</x>
+    <y>300</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_1</name>
+    <pv_name>$(P)$(R)$(CH)DoneR</pv_name>
+    <x>210</x>
+    <y>180</y>
+    <off_color>
+      <color name="Major" red="250" green="12" blue="14">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+      </color>
+    </on_color>
+    <actions>
+    </actions>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update</name>
+    <pv_name>$(P)$(R)$(CH)TR1-TimePerPoint</pv_name>
+    <x>190</x>
+    <y>260</y>
+    <width>130</width>
+    <height>30</height>
+    <format>2</format>
+    <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input</name>
+    <pv_name>$(P)$(R)$(CH)TR1-TimePerPointLink.DOL</pv_name>
+    <x>330</x>
+    <y>260</y>
+    <width>130</width>
+    <height>30</height>
+    <format>6</format>
+    <show_units>false</show_units>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <text>Time-link/point:</text>
+    <x>60</x>
+    <y>260</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -467,16 +617,46 @@ time/point</text>
       </color>
     </border_color>
   </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_11</name>
+    <x>50</x>
+    <y>560</y>
+    <width>430</width>
+    <height>190</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_7</name>
-    <text>Scale</text>
-    <x>43</x>
-    <y>392</y>
-    <width>70</width>
+    <name>BGGrey02-title_20</name>
+    <text>Scaling</text>
+    <x>20</x>
+    <y>510</y>
+    <width>480</width>
+    <height>50</height>
     <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
       </font>
     </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_7</name>
+    <text>Scale</text>
+    <x>60</x>
+    <y>620</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -490,17 +670,10 @@ time/point</text>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_1</name>
     <pv_name>$(P)$(R)$(CH)ScalingFactor</pv_name>
-    <x>135</x>
-    <y>392</y>
-    <width>112</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
+    <x>330</x>
+    <y>620</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -513,21 +686,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_2</name>
     <pv_name>$(P)$(R)$(CH)ScalingFactorR</pv_name>
-    <x>252</x>
-    <y>393</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>620</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -541,13 +703,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_8</name>
     <text>Offset</text>
-    <x>43</x>
-    <y>413</y>
-    <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>660</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -561,21 +720,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_3</name>
     <pv_name>$(P)$(R)$(CH)ScalingOffsetR</pv_name>
-    <x>252</x>
-    <y>414</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>660</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -589,17 +737,10 @@ time/point</text>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_2</name>
     <pv_name>$(P)$(R)$(CH)ScalingOffset</pv_name>
-    <x>135</x>
-    <y>413</y>
-    <width>112</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
+    <x>330</x>
+    <y>660</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -610,15 +751,12 @@ time/point</text>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_9</name>
-    <text>Control</text>
-    <x>43</x>
-    <y>318</y>
-    <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <name>Label_30</name>
+    <text>Decimation</text>
+    <x>60</x>
+    <y>700</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -630,21 +768,14 @@ time/point</text>
     </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>Text Update_4</name>
-    <pv_name>$(P)$(CH)Name</pv_name>
-    <x>95</x>
-    <y>8</y>
-    <width>336</width>
-    <height>31</height>
-    <font>
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <name>Text Update_18</name>
+    <pv_name>$(P)$(R)$(CH)DecimFactorR</pv_name>
+    <x>190</x>
+    <y>700</y>
+    <width>130</width>
+    <height>30</height>
+    <precision>0</precision>
+    <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -655,12 +786,10 @@ time/point</text>
     </border_color>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>LED_3</name>
-    <pv_name>$(P)$(R)$(CH)Status</pv_name>
-    <x>142</x>
-    <y>47</y>
-    <width>16</width>
-    <height>16</height>
+    <name>LED_6</name>
+    <pv_name>$(P)$(R)$(CH)ScalingControlR</pv_name>
+    <x>210</x>
+    <y>582</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -669,73 +798,62 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_6</name>
+    <pv_name>$(P)$(R)$(CH)DecimFactor</pv_name>
+    <x>330</x>
+    <y>700</y>
+    <width>130</width>
+    <height>30</height>
+    <precision>0</precision>
+    <show_units>false</show_units>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_9</name>
+    <name>Action Button_50</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(pv_name)</pv_name>
         <value>1</value>
       </action>
     </actions>
-    <pv_name>$(P)$(R)$(CH)Control</pv_name>
+    <pv_name>$(P)$(R)$(CH)ScalingControl</pv_name>
     <text>Enable</text>
-    <x>159</x>
-    <y>45</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>260</x>
+    <y>580</y>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_10</name>
+    <name>Action Button_51</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(pv_name)</pv_name>
         <value>0</value>
       </action>
     </actions>
-    <pv_name>$(P)$(R)$(CH)Control</pv_name>
+    <pv_name>$(P)$(R)$(CH)ScalingControl</pv_name>
     <text>Disable</text>
-    <x>218</x>
-    <y>45</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>330</x>
+    <y>580</y>
+    <width>60</width>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_10</name>
+    <name>Label_32</name>
     <text>Control</text>
-    <x>18</x>
-    <y>45</y>
-    <width>70</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
+    <x>60</x>
+    <y>580</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -745,6 +863,39 @@ time/point</text>
       </color>
     </border_color>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_21</name>
+    <text>Trace</text>
+    <x>520</x>
+    <y>70</y>
+    <width>470</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_12</name>
+    <x>540</x>
+    <y>120</y>
+    <width>430</width>
+    <height>228</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="action_button" version="3.0.0">
     <name>Action Button_42</name>
     <actions>
@@ -758,27 +909,16 @@ time/point</text>
       </action>
     </actions>
     <text>More..</text>
-    <x>303</x>
-    <y>480</y>
-    <width>49</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>890</x>
+    <y>140</y>
+    <width>60</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_4</name>
     <pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks_RBV</pv_name>
-    <x>137</x>
-    <y>482</y>
-    <width>16</width>
-    <height>16</height>
+    <x>700</x>
+    <y>145</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -787,14 +927,6 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -808,18 +940,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks</pv_name>
     <text>Enable</text>
-    <x>154</x>
-    <y>480</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>750</x>
+    <y>140</y>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_44</name>
@@ -831,47 +954,18 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks</pv_name>
     <text>Disable</text>
-    <x>213</x>
-    <y>480</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>820</x>
+    <y>140</y>
+    <width>60</width>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_11</name>
-    <text>Trace</text>
-    <x>13</x>
-    <y>461</y>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <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_13</name>
-    <text>Array Size</text>
-    <x>13</x>
-    <y>555</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
+    <name>Label_13</name>
+    <text>Array Size</text>
+    <x>550</x>
+    <y>260</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -884,22 +978,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_6</name>
     <pv_name>$(P)$(R)$(CH)TR1-ArraySize0_RBV</pv_name>
-    <x>136</x>
-    <y>556</y>
-    <width>65</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>680</x>
+    <y>260</y>
+    <width>230</width>
+    <height>30</height>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -914,13 +996,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_14</name>
     <text>Data type</text>
-    <x>23</x>
-    <y>580</y>
-    <width>90</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>550</x>
+    <y>300</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -934,22 +1013,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_8</name>
     <pv_name>$(P)$(R)$(CH)TR1-DataType_RBV</pv_name>
-    <x>136</x>
-    <y>581</y>
-    <width>79</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>680</x>
+    <y>300</y>
+    <width>230</width>
+    <height>30</height>
     <format>6</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -964,21 +1031,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_9</name>
     <pv_name>$(P)$(R)$(CH)TR1-ArrayCounter_RBV</pv_name>
-    <x>136</x>
-    <y>507</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>680</x>
+    <y>180</y>
+    <width>230</width>
+    <height>30</height>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -993,13 +1049,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_15</name>
     <text>Array counter</text>
-    <x>2</x>
-    <y>506</y>
-    <width>111</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>550</x>
+    <y>180</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1013,12 +1066,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_16</name>
     <text>Array rate</text>
-    <x>13</x>
-    <y>531</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>550</x>
+    <y>220</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1032,21 +1083,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_10</name>
     <pv_name>$(P)$(R)$(CH)TR1-ArrayRate_RBV</pv_name>
-    <x>136</x>
-    <y>532</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>680</x>
+    <y>220</y>
+    <width>230</width>
+    <height>30</height>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -1061,12 +1101,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_17</name>
     <text>Control</text>
-    <x>13</x>
-    <y>480</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>550</x>
+    <y>140</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1078,80 +1116,43 @@ time/point</text>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_18</name>
-    <text>BPM channel</text>
-    <x>16</x>
-    <y>15</y>
-    <width>188</width>
+    <name>BGGrey02-title_22</name>
+    <text>Converting</text>
+    <x>20</x>
+    <y>750</y>
+    <width>480</width>
+    <height>50</height>
     <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
       </font>
     </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
       </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_30</name>
-    <text>Decimation</text>
-    <x>21</x>
-    <y>431</y>
-    <width>92</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_18</name>
-    <pv_name>$(P)$(R)$(CH)DecimFactorR</pv_name>
-    <x>252</x>
-    <y>432</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_14</name>
+    <x>50</x>
+    <y>800</y>
+    <width>430</width>
+    <height>70</height>
+    <line_width>0</line_width>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
-    <precision>0</precision>
-    <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>LED_6</name>
-    <pv_name>$(P)$(R)$(CH)ScalingControlR</pv_name>
-    <x>137</x>
-    <y>375</y>
-    <width>16</width>
-    <height>16</height>
+    <name>LED_2</name>
+    <pv_name>$(P)$(R)$(CH)ConvStatus</pv_name>
+    <x>210</x>
+    <y>822</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -1160,98 +1161,45 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_6</name>
-    <pv_name>$(P)$(R)$(CH)DecimFactor</pv_name>
-    <x>135</x>
-    <y>431</y>
-    <width>112</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-    <precision>0</precision>
-    <show_units>false</show_units>
     <actions>
     </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_50</name>
+    <name>Action Button_7</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(pv_name)</pv_name>
         <value>1</value>
       </action>
     </actions>
-    <pv_name>$(P)$(R)$(CH)ScalingControl</pv_name>
+    <pv_name>$(P)$(R)$(CH)ConvControl</pv_name>
     <text>Enable</text>
-    <x>154</x>
-    <y>373</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>260</x>
+    <y>820</y>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_51</name>
+    <name>Action Button_8</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(pv_name)</pv_name>
         <value>0</value>
       </action>
     </actions>
-    <pv_name>$(P)$(R)$(CH)ScalingControl</pv_name>
+    <pv_name>$(P)$(R)$(CH)ConvControl</pv_name>
     <text>Disable</text>
-    <x>213</x>
-    <y>373</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>330</x>
+    <y>820</y>
+    <width>60</width>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_31</name>
-    <text>Scaling</text>
-    <x>13</x>
-    <y>344</y>
-    <width>80</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
+    <name>Label_9</name>
+    <text>Control</text>
+    <x>60</x>
+    <y>820</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1262,73 +1210,103 @@ time/point</text>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_32</name>
-    <text>Control</text>
-    <x>43</x>
-    <y>373</y>
-    <width>70</width>
+    <name>BGGrey02-title_23</name>
+    <text>Circular buffer</text>
+    <x>520</x>
+    <y>350</y>
+    <width>470</width>
+    <height>50</height>
     <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
       </font>
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
+    <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>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_15</name>
+    <x>540</x>
+    <y>400</y>
+    <width>430</width>
+    <height>70</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
-    </border_color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_33</name>
-    <text>Num samples</text>
-    <x>2</x>
-    <y>169</y>
-    <width>116</width>
+    <name>BGGrey02-title_24</name>
+    <text>Circular buffer trace</text>
+    <x>520</x>
+    <y>470</y>
+    <width>470</width>
+    <height>50</height>
     <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
       </font>
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
+    <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>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_16</name>
+    <x>540</x>
+    <y>520</y>
+    <width>430</width>
+    <height>70</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
-    </border_color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_19</name>
-    <pv_name>$(P)$(R)$(CH)NumSamplesR</pv_name>
-    <x>141</x>
-    <y>170</y>
-    <height>18</height>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_25</name>
+    <text>HDF5 file save</text>
+    <x>520</x>
+    <y>590</y>
+    <width>470</width>
+    <height>50</height>
     <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
       </font>
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="WHITE" red="255" green="255" blue="255">
       </color>
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <precision>0</precision>
-    <show_units>false</show_units>
+    <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">
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_17</name>
+    <x>540</x>
+    <y>640</y>
+    <width>430</width>
+    <height>70</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
-    </border_color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_52</name>
@@ -1343,27 +1321,16 @@ time/point</text>
       </action>
     </actions>
     <text>More..</text>
-    <x>298</x>
-    <y>633</y>
-    <width>49</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>890</x>
+    <y>420</y>
+    <width>60</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_7</name>
     <pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks_RBV</pv_name>
-    <x>132</x>
-    <y>635</y>
-    <width>16</width>
-    <height>16</height>
+    <x>700</x>
+    <y>422</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -1372,14 +1339,6 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -1393,18 +1352,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks</pv_name>
     <text>Enable</text>
-    <x>149</x>
-    <y>633</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>750</x>
+    <y>420</y>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_54</name>
@@ -1416,46 +1366,17 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks</pv_name>
     <text>Disable</text>
-    <x>208</x>
-    <y>633</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_34</name>
-    <text>Circular buffer</text>
-    <x>8</x>
-    <y>614</y>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
+    <x>820</x>
+    <y>420</y>
+    <width>60</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_35</name>
     <text>Control</text>
-    <x>8</x>
-    <y>633</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>550</x>
+    <y>420</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1479,27 +1400,16 @@ time/point</text>
       </action>
     </actions>
     <text>More..</text>
-    <x>298</x>
-    <y>684</y>
-    <width>49</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>890</x>
+    <y>540</y>
+    <width>60</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_8</name>
     <pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks_RBV</pv_name>
-    <x>132</x>
-    <y>686</y>
-    <width>16</width>
-    <height>16</height>
+    <x>700</x>
+    <y>542</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -1508,14 +1418,6 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -1529,18 +1431,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks</pv_name>
     <text>Enable</text>
-    <x>149</x>
-    <y>684</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>750</x>
+    <y>540</y>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_57</name>
@@ -1552,67 +1445,17 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks</pv_name>
     <text>Disable</text>
-    <x>208</x>
-    <y>684</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_36</name>
-    <text>Circular buffer trace</text>
-    <x>8</x>
-    <y>665</y>
-    <width>142</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
+    <x>820</x>
+    <y>540</y>
+    <width>60</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_37</name>
     <text>Control</text>
-    <x>8</x>
-    <y>684</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <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_297</name>
-    <text>Memory addr.</text>
-    <x>6</x>
-    <y>259</y>
-    <width>106</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>550</x>
+    <y>540</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1623,58 +1466,6 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_79</name>
-    <pv_name>$(P)$(R)$(CH)MemoryAddressR</pv_name>
-    <x>254</x>
-    <y>260</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_7</name>
-    <pv_name>$(P)$(R)$(CH)MemoryAddress</pv_name>
-    <x>135</x>
-    <y>259</y>
-    <width>112</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-    <show_units>false</show_units>
-    <actions>
-    </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_58</name>
     <actions>
@@ -1688,27 +1479,16 @@ time/point</text>
       </action>
     </actions>
     <text>More..</text>
-    <x>298</x>
-    <y>734</y>
-    <width>49</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>890</x>
+    <y>660</y>
+    <width>60</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_9</name>
     <pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks_RBV</pv_name>
-    <x>132</x>
-    <y>736</y>
-    <width>16</width>
-    <height>16</height>
+    <x>700</x>
+    <y>662</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -1717,14 +1497,6 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -1738,18 +1510,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks</pv_name>
     <text>Enable</text>
-    <x>149</x>
-    <y>734</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>750</x>
+    <y>660</y>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_60</name>
@@ -1761,67 +1524,17 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks</pv_name>
     <text>Disable</text>
-    <x>208</x>
-    <y>734</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_298</name>
-    <text>HDF5 file save</text>
-    <x>8</x>
-    <y>715</y>
-    <width>142</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
+    <x>820</x>
+    <y>660</y>
+    <width>60</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_299</name>
     <text>Control</text>
-    <x>8</x>
-    <y>734</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <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_302</name>
-    <text>PCIe start</text>
-    <x>2</x>
-    <y>194</y>
-    <width>116</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>550</x>
+    <y>660</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1832,80 +1545,4 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_80</name>
-    <pv_name>$(P)$(R)$(CH)PcieStartTimeR</pv_name>
-    <x>141</x>
-    <y>195</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_303</name>
-    <text>PCIe time</text>
-    <x>2</x>
-    <y>214</y>
-    <width>116</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <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_81</name>
-    <pv_name>$(P)$(R)$(CH)PcieTransferTimeR</pv_name>
-    <x>141</x>
-    <y>215</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
 </display>
diff --git a/99-Shared/adsis8300bpm/bpmChannelAverage.bob b/99-Shared/adsis8300bpm/bpmChannelAverage.bob
index eb36c2864cd68405e0a95d888388c6f4c8198b4d..e7dd16057071336b9cd49ff6dd50c2881130c3f7 100644
--- a/99-Shared/adsis8300bpm/bpmChannelAverage.bob
+++ b/99-Shared/adsis8300bpm/bpmChannelAverage.bob
@@ -3,70 +3,415 @@
   <name>BPM Ch $(CH)</name>
   <x>470</x>
   <y>197</y>
-  <width>1247</width>
-  <height>812</height>
-  <background_color>
-    <color red="240" green="240" blue="240">
-    </color>
-  </background_color>
+  <width>1960</width>
+  <height>1070</height>
   <actions>
   </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>445</x>
-    <y>11</y>
-    <width>741</width>
-    <height>25</height>
+    <name>BGGrey03-titlebar_9</name>
+    <x>1020</x>
+    <y>640</y>
+    <width>920</width>
+    <height>410</height>
     <line_width>0</line_width>
-    <line_color>
-      <color red="128" green="0" blue="255">
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
-    </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>PV prefix: $(P)$(R)$(CH)</text>
-    <x>445</x>
-    <y>12</y>
-    <width>741</width>
-    <height>25</height>
+    <name>BGGrey02-title_30</name>
+    <text>Average Value History</text>
+    <x>1020</x>
+    <y>640</y>
+    <width>920</width>
+    <height>50</height>
     <font>
-      <font family="Sans" style="REGULAR" size="14.851485148514852">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
       </font>
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <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>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_20</name>
+    <x>1040</x>
+    <y>690</y>
+    <width>880</width>
+    <height>340</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
-    </border_color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_7</name>
+    <x>1020</x>
+    <y>70</y>
+    <width>920</width>
+    <height>550</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_19</name>
+    <x>1040</x>
+    <y>120</y>
+    <width>880</width>
+    <height>480</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_6</name>
+    <x>520</x>
+    <y>70</y>
+    <width>470</width>
+    <height>980</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>540</x>
+    <y>960</y>
+    <width>430</width>
+    <height>70</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_4</name>
+    <x>20</x>
+    <y>70</y>
+    <width>480</width>
+    <height>980</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>440</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="label" version="2.0.0">
+    <name>BGGrey02-title_19</name>
+    <text>Status</text>
+    <x>20</x>
+    <y>70</y>
+    <width>480</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_25</name>
+    <text>Circular buffer trace</text>
+    <x>520</x>
+    <y>790</y>
+    <width>470</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_16</name>
+    <x>540</x>
+    <y>840</y>
+    <width>430</width>
+    <height>70</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_24</name>
+    <text>Circular buffer</text>
+    <x>520</x>
+    <y>670</y>
+    <width>470</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_15</name>
+    <x>540</x>
+    <y>720</y>
+    <width>430</width>
+    <height>70</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_23</name>
+    <text>Trace</text>
+    <x>520</x>
+    <y>270</y>
+    <width>470</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_14</name>
+    <x>540</x>
+    <y>320</y>
+    <width>430</width>
+    <height>230</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_22</name>
+    <text>Averaging</text>
+    <x>20</x>
+    <y>750</y>
+    <width>480</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_13</name>
+    <x>40</x>
+    <y>800</y>
+    <width>440</width>
+    <height>230</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_21</name>
+    <text>Scaling</text>
+    <x>20</x>
+    <y>510</y>
+    <width>480</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_12</name>
+    <x>40</x>
+    <y>560</y>
+    <width>440</width>
+    <height>190</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_20</name>
+    <text>Converting</text>
+    <x>520</x>
+    <y>550</y>
+    <width>470</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_11</name>
+    <x>540</x>
+    <y>600</y>
+    <width>430</width>
+    <height>70</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1960</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)$(CH)Name</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1920</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>
+    <rules>
+      <rule name="text" prop_id="text" out_exp="true">
+        <exp bool_exp="pv0">
+          <expression>pvStr0</expression>
+        </exp>
+        <pv_name>$(P)$(CH)Name</pv_name>
+      </rule>
+    </rules>
+    <tooltip>Prefix: $(P)$(R)$(CH)</tooltip>
   </widget>
   <widget type="xyplot" version="2.0.0">
     <name>XY Graph</name>
-    <x>400</x>
-    <y>55</y>
-    <width>847</width>
-    <height>358</height>
+    <x>1050</x>
+    <y>130</y>
+    <width>860</width>
+    <height>460</height>
     <background_color>
-      <color red="240" green="240" blue="240">
+      <color name="Transparent" red="255" green="255" blue="255" alpha="0">
       </color>
     </background_color>
     <title_font>
       <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
       </font>
     </title_font>
-    <show_toolbar>true</show_toolbar>
     <actions>
     </actions>
     <rules>
@@ -159,16 +504,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_1</name>
-    <text>Time link or
-time/point</text>
-    <x>22</x>
-    <y>75</y>
-    <width>94</width>
-    <height>36</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <text>Time-link/point:</text>
+    <x>60</x>
+    <y>260</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -182,17 +522,10 @@ time/point</text>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)$(CH)TR1-TimePerPointLink.DOL</pv_name>
-    <x>138</x>
-    <y>83</y>
-    <width>217</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
+    <x>330</x>
+    <y>260</y>
+    <width>130</width>
+    <height>30</height>
     <format>6</format>
     <show_units>false</show_units>
     <actions>
@@ -203,44 +536,13 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_2</name>
-    <text>Time/point</text>
-    <x>20</x>
-    <y>119</y>
-    <width>96</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <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</name>
     <pv_name>$(P)$(R)$(CH)TR1-TimePerPoint</pv_name>
-    <x>139</x>
-    <y>120</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>260</y>
+    <width>130</width>
+    <height>30</height>
     <format>2</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -255,10 +557,8 @@ time/point</text>
   <widget type="led" version="2.0.0">
     <name>LED_1</name>
     <pv_name>$(P)$(R)$(CH)DoneR</pv_name>
-    <x>147</x>
-    <y>240</y>
-    <width>16</width>
-    <height>16</height>
+    <x>210</x>
+    <y>185</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -267,26 +567,16 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_3</name>
     <text>Num bytes</text>
-    <y>143</y>
-    <width>116</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>300</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -300,21 +590,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_1</name>
     <pv_name>$(P)$(R)$(CH)NumBytesR</pv_name>
-    <x>139</x>
-    <y>144</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>300</y>
+    <width>130</width>
+    <height>30</height>
     <precision>0</precision>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -329,13 +608,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_4</name>
     <text>Done</text>
-    <x>23</x>
-    <y>240</y>
-    <width>96</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>180</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -349,10 +625,8 @@ time/point</text>
   <widget type="led" version="2.0.0">
     <name>LED_1</name>
     <pv_name>$(P)$(R)$(CH)ActiveR</pv_name>
-    <x>340</x>
-    <y>240</y>
-    <width>16</width>
-    <height>16</height>
+    <x>210</x>
+    <y>225</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -361,27 +635,16 @@ time/point</text>
       <color name="Major" red="250" green="12" blue="14">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_5</name>
     <text>Active</text>
-    <x>215</x>
-    <y>240</y>
-    <width>96</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>220</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -395,10 +658,8 @@ time/point</text>
   <widget type="led" version="2.0.0">
     <name>LED_2</name>
     <pv_name>$(P)$(R)$(CH)ConvStatus</pv_name>
-    <x>142</x>
-    <y>315</y>
-    <width>16</width>
-    <height>16</height>
+    <x>690</x>
+    <y>625</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -407,14 +668,6 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -428,18 +681,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)ConvControl</pv_name>
     <text>Enable</text>
-    <x>159</x>
-    <y>313</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>740</x>
+    <y>620</y>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_8</name>
@@ -451,49 +695,17 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)ConvControl</pv_name>
     <text>Disable</text>
-    <x>218</x>
-    <y>313</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_6</name>
-    <text>Converting</text>
-    <x>18</x>
-    <y>284</y>
-    <width>80</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <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>
+    <x>820</x>
+    <y>620</y>
+    <width>60</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_7</name>
     <text>Scale</text>
-    <x>48</x>
-    <y>387</y>
-    <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>620</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -507,17 +719,10 @@ time/point</text>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_1</name>
     <pv_name>$(P)$(R)$(CH)ScalingFactor</pv_name>
-    <x>140</x>
-    <y>387</y>
-    <width>112</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
+    <x>330</x>
+    <y>620</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -530,21 +735,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_2</name>
     <pv_name>$(P)$(R)$(CH)ScalingFactorR</pv_name>
-    <x>257</x>
-    <y>388</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>620</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -558,13 +752,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_8</name>
     <text>Offset</text>
-    <x>48</x>
-    <y>408</y>
-    <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>660</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -578,21 +769,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_3</name>
     <pv_name>$(P)$(R)$(CH)ScalingOffsetR</pv_name>
-    <x>257</x>
-    <y>409</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>660</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -606,17 +786,10 @@ time/point</text>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_2</name>
     <pv_name>$(P)$(R)$(CH)ScalingOffset</pv_name>
-    <x>140</x>
-    <y>408</y>
-    <width>112</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
+    <x>330</x>
+    <y>660</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -629,13 +802,9 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_9</name>
     <text>Control</text>
-    <x>48</x>
-    <y>313</y>
-    <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>560</x>
+    <y>620</y>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -646,38 +815,11 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_4</name>
-    <pv_name>$(P)$(CH)Name</pv_name>
-    <x>95</x>
-    <y>8</y>
-    <width>336</width>
-    <height>31</height>
-    <font>
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
   <widget type="led" version="2.0.0">
     <name>LED_3</name>
     <pv_name>$(P)$(R)$(CH)Status</pv_name>
-    <x>140</x>
-    <y>47</y>
-    <width>16</width>
-    <height>16</height>
+    <x>210</x>
+    <y>145</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -686,14 +828,6 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -707,18 +841,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)Control</pv_name>
     <text>Enable</text>
-    <x>157</x>
-    <y>45</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>260</x>
+    <y>140</y>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_10</name>
@@ -730,37 +855,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)Control</pv_name>
     <text>Disable</text>
-    <x>216</x>
-    <y>45</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_10</name>
-    <text>Control</text>
-    <x>16</x>
-    <y>45</y>
-    <width>70</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
+    <x>330</x>
+    <y>140</y>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_42</name>
@@ -775,27 +872,16 @@ time/point</text>
       </action>
     </actions>
     <text>More..</text>
-    <x>306</x>
-    <y>589</y>
-    <width>49</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>340</y>
+    <width>70</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_4</name>
     <pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks_RBV</pv_name>
-    <x>140</x>
-    <y>591</y>
-    <width>16</width>
-    <height>16</height>
+    <x>690</x>
+    <y>345</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -804,14 +890,6 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -825,69 +903,30 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks</pv_name>
     <text>Enable</text>
-    <x>157</x>
-    <y>589</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>740</x>
+    <y>340</y>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_44</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(pv_name)</pv_name>
-        <value>0</value>
-      </action>
-    </actions>
-    <pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks</pv_name>
-    <text>Disable</text>
-    <x>216</x>
-    <y>589</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_11</name>
-    <text>Trace</text>
-    <x>16</x>
-    <y>570</y>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
+        <value>0</value>
+      </action>
     </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
+    <pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks</pv_name>
+    <text>Disable</text>
+    <x>810</x>
+    <y>340</y>
+    <width>60</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_13</name>
     <text>Array Size</text>
-    <x>16</x>
-    <y>664</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>560</x>
+    <y>460</y>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -901,22 +940,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_6</name>
     <pv_name>$(P)$(R)$(CH)TR1-ArraySize0_RBV</pv_name>
-    <x>139</x>
-    <y>665</y>
-    <width>65</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>670</x>
+    <y>460</y>
+    <width>230</width>
+    <height>30</height>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -931,13 +958,9 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_14</name>
     <text>Data type</text>
-    <x>26</x>
-    <y>689</y>
-    <width>90</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>560</x>
+    <y>500</y>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -951,22 +974,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_8</name>
     <pv_name>$(P)$(R)$(CH)TR1-DataType_RBV</pv_name>
-    <x>139</x>
-    <y>690</y>
-    <width>79</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>670</x>
+    <y>500</y>
+    <width>230</width>
+    <height>30</height>
     <format>6</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -981,21 +992,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_9</name>
     <pv_name>$(P)$(R)$(CH)TR1-ArrayCounter_RBV</pv_name>
-    <x>139</x>
-    <y>616</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>670</x>
+    <y>380</y>
+    <width>230</width>
+    <height>30</height>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -1010,13 +1010,9 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_15</name>
     <text>Array counter</text>
-    <x>5</x>
-    <y>615</y>
-    <width>111</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>560</x>
+    <y>380</y>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1030,12 +1026,9 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_16</name>
     <text>Array rate</text>
-    <x>16</x>
-    <y>640</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>560</x>
+    <y>420</y>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1049,21 +1042,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_10</name>
     <pv_name>$(P)$(R)$(CH)TR1-ArrayRate_RBV</pv_name>
-    <x>139</x>
-    <y>641</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>670</x>
+    <y>420</y>
+    <width>230</width>
+    <height>30</height>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -1078,12 +1060,9 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_17</name>
     <text>Control</text>
-    <x>16</x>
-    <y>589</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>560</x>
+    <y>340</y>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1094,55 +1073,13 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_18</name>
-    <text>BPM channel</text>
-    <x>16</x>
-    <y>15</y>
-    <width>188</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <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_19</name>
-    <text>Averaging</text>
-    <x>18</x>
-    <y>445</y>
-    <width>80</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <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_20</name>
     <text>Start</text>
-    <x>48</x>
-    <y>463</y>
-    <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>860</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1156,21 +1093,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_11</name>
     <pv_name>$(P)$(R)$(CH)AvgStartR</pv_name>
-    <x>257</x>
-    <y>464</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>860</y>
+    <width>130</width>
+    <height>30</height>
     <precision>0</precision>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -1185,17 +1111,10 @@ time/point</text>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_3</name>
     <pv_name>$(P)$(R)$(CH)AvgStart</pv_name>
-    <x>140</x>
-    <y>463</y>
-    <width>112</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
+    <x>330</x>
+    <y>860</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -1208,13 +1127,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_21</name>
     <text>Count</text>
-    <x>48</x>
-    <y>484</y>
-    <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>900</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1228,21 +1144,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_12</name>
     <pv_name>$(P)$(R)$(CH)AvgCountR</pv_name>
-    <x>257</x>
-    <y>485</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>900</y>
+    <width>130</width>
+    <height>30</height>
     <precision>0</precision>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -1257,17 +1162,10 @@ time/point</text>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_4</name>
     <pv_name>$(P)$(R)$(CH)AvgCount</pv_name>
-    <x>140</x>
-    <y>484</y>
-    <width>112</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
+    <x>330</x>
+    <y>900</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -1280,13 +1178,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_22</name>
     <text>Value</text>
-    <x>48</x>
-    <y>538</y>
-    <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>980</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1300,21 +1195,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_13</name>
     <pv_name>$(P)$(R)$(CH)AvgValue</pv_name>
-    <x>257</x>
-    <y>539</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>980</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1328,13 +1212,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_30</name>
     <text>Decimation</text>
-    <x>26</x>
-    <y>426</y>
-    <width>92</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>700</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1348,21 +1229,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_18</name>
     <pv_name>$(P)$(R)$(CH)DecimFactorR</pv_name>
-    <x>257</x>
-    <y>427</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>700</y>
+    <width>130</width>
+    <height>30</height>
     <precision>0</precision>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -1377,10 +1247,8 @@ time/point</text>
   <widget type="led" version="2.0.0">
     <name>LED_6</name>
     <pv_name>$(P)$(R)$(CH)ScalingControlR</pv_name>
-    <x>142</x>
-    <y>370</y>
-    <width>16</width>
-    <height>16</height>
+    <x>210</x>
+    <y>585</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -1389,31 +1257,16 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_6</name>
     <pv_name>$(P)$(R)$(CH)DecimFactor</pv_name>
-    <x>140</x>
-    <y>426</y>
-    <width>112</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
+    <x>330</x>
+    <y>700</y>
+    <width>130</width>
+    <height>30</height>
     <precision>0</precision>
     <show_units>false</show_units>
     <actions>
@@ -1434,18 +1287,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)ScalingControl</pv_name>
     <text>Enable</text>
-    <x>159</x>
-    <y>368</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>260</x>
+    <y>580</y>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_51</name>
@@ -1457,49 +1301,17 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)ScalingControl</pv_name>
     <text>Disable</text>
-    <x>218</x>
-    <y>368</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_31</name>
-    <text>Scaling</text>
-    <x>18</x>
-    <y>339</y>
-    <width>80</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <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>
+    <x>330</x>
+    <y>580</y>
+    <width>60</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_32</name>
     <text>Control</text>
-    <x>48</x>
-    <y>368</y>
-    <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>580</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1513,12 +1325,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_33</name>
     <text>Num samples</text>
-    <y>169</y>
-    <width>116</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>340</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1532,21 +1342,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_19</name>
     <pv_name>$(P)$(R)$(CH)NumSamplesR</pv_name>
-    <x>139</x>
-    <y>170</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>341</y>
+    <width>130</width>
+    <height>30</height>
     <precision>0</precision>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -1571,27 +1370,16 @@ time/point</text>
       </action>
     </actions>
     <text>More..</text>
-    <x>299</x>
-    <y>733</y>
-    <width>49</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>740</y>
+    <width>70</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_7</name>
     <pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks_RBV</pv_name>
-    <x>133</x>
-    <y>735</y>
-    <width>16</width>
-    <height>16</height>
+    <x>690</x>
+    <y>745</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -1600,14 +1388,6 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -1618,72 +1398,33 @@ time/point</text>
         <pv_name>$(pv_name)</pv_name>
         <value>1</value>
       </action>
-    </actions>
-    <pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks</pv_name>
-    <text>Enable</text>
-    <x>150</x>
-    <y>733</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_54</name>
-    <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>0</value>
-      </action>
-    </actions>
-    <pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks</pv_name>
-    <text>Disable</text>
-    <x>209</x>
-    <y>733</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_34</name>
-    <text>Circular buffer</text>
-    <x>9</x>
-    <y>714</y>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+    </actions>
+    <pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks</pv_name>
+    <text>Enable</text>
+    <x>740</x>
+    <y>740</y>
+    <width>60</width>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_54</name>
     <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
     </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
+    <pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks</pv_name>
+    <text>Disable</text>
+    <x>810</x>
+    <y>740</y>
+    <width>60</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_35</name>
     <text>Control</text>
-    <x>9</x>
-    <y>733</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>560</x>
+    <y>740</y>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1707,27 +1448,16 @@ time/point</text>
       </action>
     </actions>
     <text>More..</text>
-    <x>299</x>
-    <y>784</y>
-    <width>49</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>860</y>
+    <width>70</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_8</name>
     <pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks_RBV</pv_name>
-    <x>133</x>
-    <y>786</y>
-    <width>16</width>
-    <height>16</height>
+    <x>690</x>
+    <y>865</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -1736,14 +1466,6 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -1757,18 +1479,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks</pv_name>
     <text>Enable</text>
-    <x>150</x>
-    <y>784</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>740</x>
+    <y>860</y>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_57</name>
@@ -1780,28 +1493,16 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks</pv_name>
     <text>Disable</text>
-    <x>209</x>
-    <y>784</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>810</x>
+    <y>860</y>
+    <width>60</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_37</name>
     <text>Control</text>
-    <x>9</x>
-    <y>784</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>560</x>
+    <y>860</y>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1815,12 +1516,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_38</name>
     <text>Num. averaged</text>
-    <y>501</y>
-    <width>118</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>940</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1834,21 +1533,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_20</name>
     <pv_name>$(P)$(CH)AvgNumSamplesR</pv_name>
-    <x>257</x>
-    <y>502</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>940</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1862,10 +1550,8 @@ time/point</text>
   <widget type="led" version="2.0.0">
     <name>LED_9</name>
     <pv_name>$(P)$(R)$(CH)AvgBusyR</pv_name>
-    <x>148</x>
-    <y>520</y>
-    <width>16</width>
-    <height>16</height>
+    <x>210</x>
+    <y>825</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -1874,27 +1560,16 @@ time/point</text>
       <color name="Major" red="250" green="12" blue="14">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_39</name>
     <text>Busy</text>
-    <x>23</x>
-    <y>520</y>
-    <width>96</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>820</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1907,18 +1582,19 @@ time/point</text>
   </widget>
   <widget type="stripchart" version="2.0.0">
     <name>XY Graph_2</name>
-    <x>400</x>
-    <y>481</y>
-    <width>847</width>
-    <height>250</height>
+    <x>1050</x>
+    <y>700</y>
+    <width>860</width>
+    <height>320</height>
     <background_color>
-      <color red="240" green="240" blue="240">
+      <color name="Transparent" red="255" green="255" blue="255" alpha="0">
       </color>
     </background_color>
     <title_font>
       <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
       </font>
     </title_font>
+    <show_toolbar>false</show_toolbar>
     <show_legend>true</show_legend>
     <actions>
     </actions>
@@ -1950,35 +1626,13 @@ time/point</text>
       </trace>
     </traces>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_40</name>
-    <text>Circular buffer trace</text>
-    <x>12</x>
-    <y>765</y>
-    <width>142</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <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_297</name>
     <text>Memory addr.</text>
-    <x>9</x>
-    <y>266</y>
-    <width>106</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>461</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1992,21 +1646,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_79</name>
     <pv_name>$(P)$(R)$(CH)MemoryAddressR</pv_name>
-    <x>257</x>
-    <y>267</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>462</y>
+    <width>130</width>
+    <height>30</height>
     <format>1</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
@@ -2021,17 +1664,10 @@ time/point</text>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_7</name>
     <pv_name>$(P)$(R)$(CH)MemoryAddress</pv_name>
-    <x>138</x>
-    <y>266</y>
-    <width>112</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
+    <x>330</x>
+    <y>460</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
     <actions>
     </actions>
@@ -2054,27 +1690,16 @@ time/point</text>
       </action>
     </actions>
     <text>More..</text>
-    <x>685</x>
-    <y>775</y>
-    <width>49</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>980</y>
+    <width>70</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_10</name>
     <pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks_RBV</pv_name>
-    <x>519</x>
-    <y>777</y>
-    <width>16</width>
-    <height>16</height>
+    <x>690</x>
+    <y>985</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -2083,14 +1708,6 @@ time/point</text>
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -2104,18 +1721,9 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks</pv_name>
     <text>Enable</text>
-    <x>536</x>
-    <y>775</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>740</x>
+    <y>980</y>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_60</name>
@@ -2127,47 +1735,16 @@ time/point</text>
     </actions>
     <pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks</pv_name>
     <text>Disable</text>
-    <x>595</x>
-    <y>775</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_298</name>
-    <text>HDF5 file save</text>
-    <x>395</x>
-    <y>756</y>
-    <width>142</width>
-    <font>
-      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
+    <x>810</x>
+    <y>980</y>
+    <width>60</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_299</name>
     <text>Control</text>
-    <x>395</x>
-    <y>775</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>560</x>
+    <y>980</y>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2181,12 +1758,10 @@ time/point</text>
   <widget type="label" version="2.0.0">
     <name>Label_302</name>
     <text>PCIe start</text>
-    <y>194</y>
-    <width>116</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>60</x>
+    <y>380</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2200,21 +1775,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_80</name>
     <pv_name>$(P)$(R)$(CH)PcieStartTimeR</pv_name>
-    <x>139</x>
-    <y>195</y>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>381</y>
+    <width>130</width>
+    <height>30</height>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2225,17 +1789,31 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_124</name>
-    <pv_name>$(P)$(R)$(CH)RoiSampleCountR</pv_name>
-    <x>660</x>
+  <widget type="label" version="2.0.0">
+    <name>Label_303</name>
+    <text>PCIe time</text>
+    <x>60</x>
     <y>420</y>
-    <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_81</name>
+    <pv_name>$(P)$(R)$(CH)PcieTransferTimeR</pv_name>
+    <x>190</x>
+    <y>421</y>
+    <width>130</width>
+    <height>30</height>
+    <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2246,11 +1824,12 @@ time/point</text>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_338</name>
-    <text>ROI sample count</text>
-    <x>404</x>
-    <y>420</y>
-    <width>124</width>
+    <name>Label_10</name>
+    <text>Control</text>
+    <x>60</x>
+    <y>140</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2261,19 +1840,67 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_129</name>
-    <pv_name>$(P)$(R)$(CH)RoiFirstSampleR</pv_name>
-    <x>660</x>
-    <y>439</y>
-    <width>88</width>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_26</name>
+    <text>HDF5 file save</text>
+    <x>520</x>
+    <y>910</y>
+    <width>470</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <x>540</x>
+    <y>120</y>
+    <width>430</width>
+    <height>150</height>
+    <line_width>0</line_width>
     <background_color>
-      <color red="255" green="255" blue="255">
+      <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_27</name>
+    <text>ROI</text>
+    <x>520</x>
+    <y>70</y>
+    <width>470</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_353</name>
+    <text>Last sample</text>
+    <x>560</x>
+    <y>220</y>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
     </actions>
     <border_color>
@@ -2283,10 +1910,26 @@ time/point</text>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_352</name>
-    <text>ROI first sample</text>
-    <x>404</x>
-    <y>439</y>
-    <width>124</width>
+    <text>First sample</text>
+    <x>560</x>
+    <y>180</y>
+    <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_338</name>
+    <text>Sample count</text>
+    <x>560</x>
+    <y>140</y>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2300,13 +1943,10 @@ time/point</text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_130</name>
     <pv_name>$(P)$(R)$(CH)RoiLastSampleR</pv_name>
-    <x>660</x>
-    <y>458</y>
-    <width>88</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>670</x>
+    <y>220</y>
+    <width>230</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2317,13 +1957,14 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_353</name>
-    <text>ROI last sample</text>
-    <x>404</x>
-    <y>458</y>
-    <width>124</width>
-    <horizontal_alignment>2</horizontal_alignment>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_129</name>
+    <pv_name>$(P)$(R)$(CH)RoiFirstSampleR</pv_name>
+    <x>670</x>
+    <y>180</y>
+    <width>230</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2333,16 +1974,14 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_303</name>
-    <text>PCIe time</text>
-    <y>214</y>
-    <width>116</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_124</name>
+    <pv_name>$(P)$(R)$(CH)RoiSampleCountR</pv_name>
+    <x>670</x>
+    <y>140</y>
+    <width>230</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2352,32 +1991,23 @@ time/point</text>
       </color>
     </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_81</name>
-    <pv_name>$(P)$(R)$(CH)PcieTransferTimeR</pv_name>
-    <x>139</x>
-    <y>215</y>
-    <height>18</height>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_28</name>
+    <text>ArrayData</text>
+    <x>1020</x>
+    <y>70</y>
+    <width>920</width>
+    <height>50</height>
     <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
       </font>
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="WHITE" red="255" green="255" blue="255">
       </color>
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <show_units>false</show_units>
+    <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>
 </display>
diff --git a/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob b/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob
index 64b6f5d222e26db82c61d412840f80e418850319..9c5ce225a478165806736bc1414efda5214146f4 100644
--- a/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob
+++ b/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <width>420</width>
-  <height>20</height>
+  <width>470</width>
+  <height>30</height>
   <background_color>
-    <color red="240" green="240" blue="240">
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
   </background_color>
   <actions>
@@ -12,10 +12,7 @@
     <name>Text Update_75</name>
     <pv_name>$(P)$(R)$(CH)Name</pv_name>
     <width>230</width>
-    <font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-      </font>
-    </font>
+    <height>30</height>
     <background_color>
       <color red="255" green="255" blue="255">
       </color>
@@ -34,9 +31,7 @@
     <name>LED_1</name>
     <pv_name>$(P)$(R)$(CH)Status</pv_name>
     <x>240</x>
-    <y>2</y>
-    <width>16</width>
-    <height>16</height>
+    <y>5</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -45,14 +40,6 @@
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -66,17 +53,8 @@
     </actions>
     <pv_name>$(P)$(R)$(CH)Control</pv_name>
     <text>Enable</text>
-    <x>257</x>
-    <width>50</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>270</x>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_8</name>
@@ -88,17 +66,8 @@
     </actions>
     <pv_name>$(P)$(R)$(CH)Control</pv_name>
     <text>Disable</text>
-    <x>310</x>
-    <width>50</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>340</x>
+    <width>60</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_9</name>
@@ -109,17 +78,8 @@
       </action>
     </actions>
     <text>More..</text>
-    <x>370</x>
-    <width>50</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>410</x>
+    <width>60</width>
     <tooltip>$(actions)</tooltip>
   </widget>
 </display>
diff --git a/99-Shared/adsis8300bpm/bpmChannelItem.bob b/99-Shared/adsis8300bpm/bpmChannelItem.bob
index bbea349bd0457a0d8fe73531ba7a82cb7b21311a..9ad7749d6f9a14334b83537bb3fb5df92cca4592 100644
--- a/99-Shared/adsis8300bpm/bpmChannelItem.bob
+++ b/99-Shared/adsis8300bpm/bpmChannelItem.bob
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <width>420</width>
-  <height>20</height>
+  <width>470</width>
+  <height>30</height>
   <background_color>
-    <color red="240" green="240" blue="240">
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
   </background_color>
   <actions>
@@ -12,10 +12,7 @@
     <name>Text Update_75</name>
     <pv_name>$(P)$(R)$(CH)Name</pv_name>
     <width>230</width>
-    <font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-      </font>
-    </font>
+    <height>30</height>
     <background_color>
       <color red="255" green="255" blue="255">
       </color>
@@ -34,9 +31,7 @@
     <name>LED_1</name>
     <pv_name>$(P)$(R)$(CH)Status</pv_name>
     <x>240</x>
-    <y>2</y>
-    <width>16</width>
-    <height>16</height>
+    <y>5</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -45,14 +40,6 @@
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -66,13 +53,8 @@
     </actions>
     <pv_name>$(P)$(R)$(CH)Control</pv_name>
     <text>Enable</text>
-    <x>257</x>
-    <width>50</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
+    <x>270</x>
+    <width>60</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -88,13 +70,8 @@
     </actions>
     <pv_name>$(P)$(R)$(CH)Control</pv_name>
     <text>Disable</text>
-    <x>310</x>
-    <width>50</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
+    <x>340</x>
+    <width>60</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -109,13 +86,8 @@
       </action>
     </actions>
     <text>More..</text>
-    <x>370</x>
-    <width>50</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
+    <x>410</x>
+    <width>60</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
diff --git a/99-Shared/adsis8300bpm/bpmFilter.bob b/99-Shared/adsis8300bpm/bpmFilter.bob
index 80e46f9b337351d8362f00ffc0a230063dabb042..842e22696298cff24d8369612a53345fbfef13e1 100644
--- a/99-Shared/adsis8300bpm/bpmFilter.bob
+++ b/99-Shared/adsis8300bpm/bpmFilter.bob
@@ -1,18 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>$(TITLE) : Main</name>
-  <width>356</width>
-  <height>153</height>
-  <background_color>
-    <color red="240" green="240" blue="240">
-    </color>
-  </background_color>
+  <width>470</width>
+  <height>490</height>
   <actions>
   </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_4</name>
+    <width>470</width>
+    <height>490</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>20</x>
+    <y>160</y>
+    <width>430</width>
+    <height>310</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_15</name>
+    <x>20</x>
+    <y>40</y>
+    <width>430</width>
+    <height>70</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_23</name>
+    <text>Filter</text>
+    <width>470</width>
+    <height>40</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
   <widget type="label" version="2.0.0">
     <name>Label_65</name>
     <text>Filter Control</text>
-    <width>108</width>
+    <x>40</x>
+    <y>60</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -26,8 +82,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_66</name>
     <text>Filter Coeff 0</text>
-    <y>20</y>
-    <width>108</width>
+    <x>40</x>
+    <y>180</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -41,8 +99,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_67</name>
     <text>Filter Coeff 1</text>
-    <y>39</y>
-    <width>108</width>
+    <x>40</x>
+    <y>220</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -56,8 +116,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_68</name>
     <text>Filter Coeff 2</text>
-    <y>58</y>
-    <width>108</width>
+    <x>40</x>
+    <y>260</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -71,8 +133,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_69</name>
     <text>Filter Coeff 3</text>
-    <y>77</y>
-    <width>108</width>
+    <x>40</x>
+    <y>300</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -86,8 +150,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_70</name>
     <text>Filter Coeff 4</text>
-    <y>96</y>
-    <width>108</width>
+    <x>40</x>
+    <y>340</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -101,8 +167,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_71</name>
     <text>Filter Coeff 5</text>
-    <y>114</y>
-    <width>108</width>
+    <x>40</x>
+    <y>380</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -116,8 +184,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_72</name>
     <text>Filter Gain</text>
-    <y>133</y>
-    <width>108</width>
+    <x>40</x>
+    <y>420</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -138,13 +208,9 @@
     </actions>
     <pv_name>$(P)$(R)FilterControl</pv_name>
     <text>Enable</text>
-    <x>148</x>
-    <width>79</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>210</x>
+    <y>60</y>
+    <width>80</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_38</name>
@@ -156,21 +222,15 @@
     </actions>
     <pv_name>$(P)$(R)FilterControl</pv_name>
     <text>Disable</text>
-    <x>244</x>
-    <width>79</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>310</x>
+    <y>60</y>
+    <width>80</width>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_10</name>
     <pv_name>$(P)$(R)FilterControlR</pv_name>
-    <x>127</x>
-    <y>2</y>
-    <width>16</width>
-    <height>16</height>
+    <x>170</x>
+    <y>65</y>
     <off_color>
       <color name="Major" red="250" green="12" blue="14">
       </color>
@@ -179,27 +239,16 @@
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)FilterCoeff4</pv_name>
-    <x>127</x>
-    <y>20</y>
-    <width>109</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>310</x>
+    <y>180</y>
+    <width>120</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -211,13 +260,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_76</name>
     <pv_name>$(P)$(R)FilterCoeff4R</pv_name>
-    <x>244</x>
-    <y>20</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>170</x>
+    <y>180</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -231,13 +277,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_1</name>
     <pv_name>$(P)$(R)FilterCoeff5</pv_name>
-    <x>127</x>
-    <y>39</y>
-    <width>109</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>310</x>
+    <y>220</y>
+    <width>120</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -249,13 +292,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_77</name>
     <pv_name>$(P)$(R)FilterCoeff5R</pv_name>
-    <x>244</x>
-    <y>39</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>170</x>
+    <y>220</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -269,13 +309,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_2</name>
     <pv_name>$(P)$(R)FilterCoeff2</pv_name>
-    <x>127</x>
-    <y>58</y>
-    <width>109</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>310</x>
+    <y>260</y>
+    <width>120</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -287,13 +324,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_78</name>
     <pv_name>$(P)$(R)FilterCoeff2R</pv_name>
-    <x>244</x>
-    <y>58</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>170</x>
+    <y>260</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -307,13 +341,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_3</name>
     <pv_name>$(P)$(R)FilterCoeff3</pv_name>
-    <x>127</x>
-    <y>77</y>
-    <width>109</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>310</x>
+    <y>300</y>
+    <width>120</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -325,13 +356,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_79</name>
     <pv_name>$(P)$(R)FilterCoeff3R</pv_name>
-    <x>244</x>
-    <y>77</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>170</x>
+    <y>300</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -345,13 +373,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_4</name>
     <pv_name>$(P)$(R)FilterCoeff0</pv_name>
-    <x>127</x>
-    <y>96</y>
-    <width>109</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>310</x>
+    <y>340</y>
+    <width>120</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -363,13 +388,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_80</name>
     <pv_name>$(P)$(R)FilterCoeff0R</pv_name>
-    <x>244</x>
-    <y>96</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>170</x>
+    <y>340</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -383,13 +405,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_5</name>
     <pv_name>$(P)$(R)FilterCoeff1</pv_name>
-    <x>127</x>
-    <y>114</y>
-    <width>109</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>310</x>
+    <y>380</y>
+    <width>120</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -401,13 +420,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_81</name>
     <pv_name>$(P)$(R)FilterCoeff1R</pv_name>
-    <x>244</x>
-    <y>114</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>170</x>
+    <y>380</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -421,13 +437,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_82</name>
     <pv_name>$(P)$(R)FilterGainR</pv_name>
-    <x>244</x>
-    <y>133</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>170</x>
+    <y>420</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -438,4 +451,22 @@
       </color>
     </border_color>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_24</name>
+    <text>Filter Coefficients</text>
+    <y>120</y>
+    <width>470</width>
+    <height>40</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/adsis8300bpm/bpmInstance.bob b/99-Shared/adsis8300bpm/bpmInstance.bob
index 583fdb0058780d9562c26360943f167a01a52e1d..4fc6019e0dc499ae554b5f6b771c444407f89e33 100644
--- a/99-Shared/adsis8300bpm/bpmInstance.bob
+++ b/99-Shared/adsis8300bpm/bpmInstance.bob
@@ -1,117 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>$(P)$(R) instance</name>
-  <width>1200</width>
-  <height>1100</height>
-  <background_color>
-    <color red="240" green="240" blue="240">
-    </color>
-  </background_color>
+  <width>1000</width>
+  <height>940</height>
   <actions>
   </actions>
-  <widget type="label" version="2.0.0">
-    <name>Label_330</name>
-    <text>CHANNEL OVERVIEW</text>
-    <x>14</x>
-    <y>533</y>
-    <width>448</width>
-    <height>73</height>
-    <font>
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
-      </font>
-    </font>
-    <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
-      </color>
-    </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_276</name>
-    <text>  $(P)$(R)</text>
-    <x>14</x>
-    <y>8</y>
-    <width>914</width>
-    <height>32</height>
-    <font>
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
-      </font>
-    </font>
-    <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
-      </color>
-    </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_25</name>
-    <actions>
-      <action type="open_display">
-        <file>bpmInstanceOverview.opi</file>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>Overview</text>
-    <x>24</x>
-    <y>572</y>
-    <width>80</width>
-    <height>25</height>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_4</name>
+    <x>20</x>
+    <y>70</y>
+    <width>960</width>
+    <height>850</height>
+    <line_width>0</line_width>
     <background_color>
-      <color red="240" green="240" blue="240">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_274</name>
-    <text>INTERLOCK</text>
-    <x>480</x>
-    <y>60</y>
-    <width>448</width>
-    <height>285</height>
-    <font>
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
-      </font>
-    </font>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_11</name>
+    <x>550</x>
+    <y>110</y>
+    <width>410</width>
+    <height>410</height>
+    <line_width>0</line_width>
     <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_66</name>
     <text>X Low</text>
-    <x>490</x>
-    <y>156</y>
-    <width>108</width>
+    <x>570</x>
+    <y>220</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -125,13 +53,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)ThrXPosLow</pv_name>
-    <x>616</x>
-    <y>156</y>
-    <width>109</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>700</x>
+    <y>220</y>
+    <width>120</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -143,13 +68,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_76</name>
     <pv_name>$(P)$(R)ThrXPosLowR</pv_name>
-    <x>742</x>
-    <y>156</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>830</x>
+    <y>220</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -163,9 +85,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_278</name>
     <text>X High</text>
-    <x>490</x>
-    <y>175</y>
-    <width>108</width>
+    <x>570</x>
+    <y>260</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -179,13 +102,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_1</name>
     <pv_name>$(P)$(R)ThrXPosHigh</pv_name>
-    <x>616</x>
-    <y>175</y>
-    <width>109</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>700</x>
+    <y>260</y>
+    <width>120</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -197,13 +117,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_1</name>
     <pv_name>$(P)$(R)ThrXPosHighR</pv_name>
-    <x>742</x>
-    <y>175</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>830</x>
+    <y>260</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -217,9 +134,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_279</name>
     <text>Y Low</text>
-    <x>490</x>
-    <y>193</y>
-    <width>108</width>
+    <x>570</x>
+    <y>300</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -233,13 +151,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_2</name>
     <pv_name>$(P)$(R)ThrYPosLow</pv_name>
-    <x>616</x>
-    <y>193</y>
-    <width>109</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>700</x>
+    <y>300</y>
+    <width>120</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -251,13 +166,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_2</name>
     <pv_name>$(P)$(R)ThrYPosLowR</pv_name>
-    <x>742</x>
-    <y>193</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>830</x>
+    <y>300</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -271,9 +183,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_280</name>
     <text>Y High</text>
-    <x>490</x>
-    <y>212</y>
-    <width>108</width>
+    <x>570</x>
+    <y>340</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -287,13 +200,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_3</name>
     <pv_name>$(P)$(R)ThrYPosHigh</pv_name>
-    <x>616</x>
-    <y>212</y>
-    <width>109</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>700</x>
+    <y>340</y>
+    <width>120</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -305,13 +215,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_3</name>
     <pv_name>$(P)$(R)ThrYPosHighR</pv_name>
-    <x>742</x>
-    <y>212</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>830</x>
+    <y>340</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -325,9 +232,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_281</name>
     <text>Magnitude</text>
-    <x>490</x>
-    <y>306</y>
-    <width>108</width>
+    <x>570</x>
+    <y>480</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -341,13 +249,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_4</name>
     <pv_name>$(P)$(R)ThrMagnitude</pv_name>
-    <x>616</x>
-    <y>306</y>
-    <width>109</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>700</x>
+    <y>480</y>
+    <width>120</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -359,13 +264,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_4</name>
     <pv_name>$(P)$(R)ThrMagnitudeR</pv_name>
-    <x>742</x>
-    <y>306</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>830</x>
+    <y>480</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -379,10 +281,12 @@
   <widget type="label" version="2.0.0">
     <name>Label_11</name>
     <text>Magnitude</text>
-    <x>483</x>
-    <y>249</y>
+    <x>560</x>
+    <y>380</y>
+    <width>120</width>
+    <height>30</height>
     <font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
       </font>
     </font>
     <vertical_alignment>1</vertical_alignment>
@@ -397,9 +301,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_322</name>
     <text>Control</text>
-    <x>486</x>
-    <y>118</y>
-    <width>112</width>
+    <x>570</x>
+    <y>140</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -413,10 +318,8 @@
   <widget type="led" version="2.0.0">
     <name>LED_4</name>
     <pv_name>$(P)$(R)IlkPositionControlR</pv_name>
-    <x>619</x>
-    <y>120</y>
-    <width>16</width>
-    <height>16</height>
+    <x>696</x>
+    <y>142</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -425,14 +328,6 @@
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
@@ -446,18 +341,9 @@
     </actions>
     <pv_name>$(P)$(R)IlkPositionControl</pv_name>
     <text>Enable</text>
-    <x>670</x>
-    <y>118</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>747</x>
+    <y>140</y>
+    <width>80</width>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_44</name>
@@ -469,25 +355,17 @@
     </actions>
     <pv_name>$(P)$(R)IlkPositionControl</pv_name>
     <text>Disable</text>
-    <x>754</x>
-    <y>118</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>831</x>
+    <y>140</y>
+    <width>80</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_323</name>
     <text>Status</text>
-    <x>486</x>
-    <y>137</y>
-    <width>112</width>
+    <x>570</x>
+    <y>180</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -508,26 +386,19 @@
     </actions>
     <pv_name>$(P)$(R)IlkPositionClear</pv_name>
     <text>Clear</text>
-    <x>670</x>
-    <y>137</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>747</x>
+    <y>180</y>
+    <width>80</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_325</name>
     <text>Position</text>
-    <x>483</x>
-    <y>104</y>
+    <x>560</x>
+    <y>120</y>
+    <width>120</width>
+    <height>30</height>
     <font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
       </font>
     </font>
     <vertical_alignment>1</vertical_alignment>
@@ -539,61 +410,32 @@
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_329</name>
-    <text>CHANNELS</text>
-    <x>14</x>
-    <y>60</y>
-    <width>448</width>
-    <height>453</height>
-    <font>
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
-      </font>
-    </font>
-    <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
+  <widget type="led" version="2.0.0">
+    <name>LED_3</name>
+    <pv_name>$(P)$(R)IlkPositionStatusR</pv_name>
+    <x>696</x>
+    <y>182</y>
+    <off_color>
+      <color name="IO Background" red="235" green="235" blue="235">
       </color>
-    </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
+    </off_color>
+    <on_color>
+      <color name="Major" red="250" green="12" blue="14">
       </color>
-    </border_color>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>Linking Container</name>
-    <macros>
-      <CH>A-</CH>
-    </macros>
-    <file>aiChannelItem.opi</file>
-    <x>24</x>
-    <y>414</y>
-    <width>420</width>
-    <height>20</height>
-    <resize>2</resize>
+    </on_color>
     <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_1</name>
-    <macros>
-      <CH>B-</CH>
-    </macros>
-    <file>aiChannelItem.opi</file>
-    <x>24</x>
-    <y>436</y>
-    <width>420</width>
-    <height>20</height>
-    <resize>2</resize>
+  <widget type="label" version="2.0.0">
+    <name>Label_344</name>
+    <text>Control</text>
+    <x>570</x>
+    <y>399</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
     </actions>
     <border_color>
@@ -601,71 +443,60 @@
       </color>
     </border_color>
   </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>Linking Container_2</name>
-    <macros>
-      <CH>C-</CH>
-    </macros>
-    <file>aiChannelItem.opi</file>
-    <x>24</x>
-    <y>458</y>
-    <width>420</width>
-    <height>20</height>
-    <resize>2</resize>
+  <widget type="led" version="2.0.0">
+    <name>LED_5</name>
+    <pv_name>$(P)$(R)IlkMagnitudeControlR</pv_name>
+    <x>696</x>
+    <y>401</y>
+    <off_color>
+      <color name="IO Background" red="235" green="235" blue="235">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+      </color>
+    </on_color>
     <actions>
     </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
   </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>Linking Container_3</name>
-    <macros>
-      <CH>D-</CH>
-    </macros>
-    <file>aiChannelItem.opi</file>
-    <x>24</x>
-    <y>480</y>
-    <width>420</width>
-    <height>20</height>
-    <resize>2</resize>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_48</name>
     <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
     </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
+    <pv_name>$(P)$(R)IlkMagnitudeControl</pv_name>
+    <text>Enable</text>
+    <x>747</x>
+    <y>399</y>
+    <width>80</width>
   </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>Linking Container_9</name>
-    <macros>
-      <CH>AM-</CH>
-    </macros>
-    <file>bpmChannelItem.opi</file>
-    <x>24</x>
-    <y>157</y>
-    <width>420</width>
-    <height>20</height>
-    <resize>2</resize>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_49</name>
     <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
     </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
+    <pv_name>$(P)$(R)IlkMagnitudeControl</pv_name>
+    <text>Disable</text>
+    <x>831</x>
+    <y>399</y>
+    <width>80</width>
   </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>Linking Container_10</name>
-    <macros>
-      <CH>BM-</CH>
-    </macros>
-    <file>bpmChannelItem.opi</file>
-    <x>24</x>
-    <y>179</y>
-    <width>420</width>
-    <height>20</height>
-    <resize>2</resize>
+  <widget type="label" version="2.0.0">
+    <name>Label_345</name>
+    <text>Status</text>
+    <x>570</x>
+    <y>440</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
     </actions>
     <border_color>
@@ -673,34 +504,164 @@
       </color>
     </border_color>
   </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>Linking Container_11</name>
-    <macros>
-      <CH>CM-</CH>
-    </macros>
-    <file>bpmChannelItem.opi</file>
-    <x>24</x>
-    <y>201</y>
-    <width>420</width>
-    <height>20</height>
-    <resize>2</resize>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_50</name>
     <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
     </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
+    <pv_name>$(P)$(R)IlkMagnitudeClear</pv_name>
+    <text>Clear</text>
+    <x>747</x>
+    <y>440</y>
+    <width>80</width>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_6</name>
+    <pv_name>$(P)$(R)IlkMagnitudeStatusR</pv_name>
+    <x>696</x>
+    <y>442</y>
+    <off_color>
+      <color name="IO Background" red="235" green="235" blue="235">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="Major" red="250" green="12" blue="14">
+      </color>
+    </on_color>
+    <actions>
+    </actions>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_12</name>
+    <x>40</x>
+    <y>110</y>
+    <width>490</width>
+    <height>490</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_13</name>
+    <x>40</x>
+    <y>650</y>
+    <width>490</width>
+    <height>170</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_14</name>
+    <x>550</x>
+    <y>570</y>
+    <width>410</width>
+    <height>330</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_20</name>
+    <text>Channels (IQ)</text>
+    <x>40</x>
+    <y>70</y>
+    <width>490</width>
+    <height>40</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>Interlock</text>
+    <x>550</x>
+    <y>70</y>
+    <width>410</width>
+    <height>40</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>Channels (raw)</text>
+    <x>40</x>
+    <y>610</y>
+    <width>490</width>
+    <height>40</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_23</name>
+    <text>Various</text>
+    <x>550</x>
+    <y>530</y>
+    <width>410</width>
+    <height>40</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="embedded" version="2.0.0">
-    <name>Linking Container_12</name>
+    <name>Linking Container_32</name>
+    <file>bpmChannelAverageItem.opi</file>
     <macros>
-      <CH>DM-</CH>
+      <CH>SA-</CH>
     </macros>
-    <file>bpmChannelItem.opi</file>
-    <x>24</x>
-    <y>223</y>
-    <width>420</width>
-    <height>20</height>
+    <x>50</x>
+    <y>560</y>
+    <width>470</width>
+    <height>30</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -710,15 +671,15 @@
     </border_color>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>Linking Container_13</name>
+    <name>Linking Container_31</name>
+    <file>bpmChannelAverageItem.opi</file>
     <macros>
-      <CH>AA-</CH>
+      <CH>SM-</CH>
     </macros>
-    <file>bpmChannelItem.opi</file>
-    <x>24</x>
-    <y>265</y>
-    <width>420</width>
-    <height>20</height>
+    <x>50</x>
+    <y>360</y>
+    <width>470</width>
+    <height>30</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -728,15 +689,15 @@
     </border_color>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>Linking Container_14</name>
+    <name>Linking Container_28</name>
+    <file>bpmChannelAverageItem.opi</file>
     <macros>
-      <CH>BA-</CH>
+      <CH>YP-</CH>
     </macros>
-    <file>bpmChannelItem.opi</file>
-    <x>24</x>
-    <y>287</y>
-    <width>420</width>
-    <height>20</height>
+    <x>50</x>
+    <y>160</y>
+    <width>470</width>
+    <height>30</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -746,15 +707,15 @@
     </border_color>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>Linking Container_15</name>
+    <name>Linking Container_27</name>
+    <file>bpmChannelAverageItem.opi</file>
     <macros>
-      <CH>CA-</CH>
+      <CH>XP-</CH>
     </macros>
-    <file>bpmChannelItem.opi</file>
-    <x>24</x>
-    <y>309</y>
-    <width>420</width>
-    <height>20</height>
+    <x>50</x>
+    <y>120</y>
+    <width>470</width>
+    <height>30</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -765,14 +726,14 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_16</name>
+    <file>bpmChannelItem.opi</file>
     <macros>
       <CH>DA-</CH>
     </macros>
-    <file>bpmChannelItem.opi</file>
-    <x>24</x>
-    <y>331</y>
-    <width>420</width>
-    <height>20</height>
+    <x>50</x>
+    <y>520</y>
+    <width>470</width>
+    <height>30</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -782,15 +743,15 @@
     </border_color>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>Linking Container_27</name>
+    <name>Linking Container_15</name>
+    <file>bpmChannelItem.opi</file>
     <macros>
-      <CH>XP-</CH>
+      <CH>CA-</CH>
     </macros>
-    <file>bpmChannelAverageItem.opi</file>
-    <x>24</x>
-    <y>115</y>
-    <width>420</width>
-    <height>20</height>
+    <x>50</x>
+    <y>480</y>
+    <width>470</width>
+    <height>30</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -800,15 +761,15 @@
     </border_color>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>Linking Container_28</name>
+    <name>Linking Container_14</name>
+    <file>bpmChannelItem.opi</file>
     <macros>
-      <CH>YP-</CH>
+      <CH>BA-</CH>
     </macros>
-    <file>bpmChannelAverageItem.opi</file>
-    <x>24</x>
-    <y>137</y>
-    <width>420</width>
-    <height>20</height>
+    <x>50</x>
+    <y>440</y>
+    <width>470</width>
+    <height>30</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -818,15 +779,15 @@
     </border_color>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>Linking Container_31</name>
+    <name>Linking Container_13</name>
+    <file>bpmChannelItem.opi</file>
     <macros>
-      <CH>SM-</CH>
+      <CH>AA-</CH>
     </macros>
-    <file>bpmChannelAverageItem.opi</file>
-    <x>24</x>
-    <y>245</y>
-    <width>420</width>
-    <height>20</height>
+    <x>50</x>
+    <y>400</y>
+    <width>470</width>
+    <height>30</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -836,15 +797,15 @@
     </border_color>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>Linking Container_32</name>
+    <name>Linking Container_12</name>
+    <file>bpmChannelItem.opi</file>
     <macros>
-      <CH>SA-</CH>
+      <CH>DM-</CH>
     </macros>
-    <file>bpmChannelAverageItem.opi</file>
-    <x>24</x>
-    <y>353</y>
-    <width>420</width>
-    <height>20</height>
+    <x>50</x>
+    <y>320</y>
+    <width>470</width>
+    <height>30</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -853,19 +814,17 @@
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_4</name>
-    <text>IQ</text>
-    <x>24</x>
-    <y>85</y>
-    <width>80</width>
-    <height>15</height>
-    <font>
-      <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container_11</name>
+    <file>bpmChannelItem.opi</file>
+    <macros>
+      <CH>CM-</CH>
+    </macros>
+    <x>50</x>
+    <y>280</y>
+    <width>470</width>
+    <height>30</height>
+    <resize>2</resize>
     <actions>
     </actions>
     <border_color>
@@ -873,41 +832,35 @@
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_334</name>
-    <text>VARIOUS</text>
-    <x>480</x>
-    <y>354</y>
-    <width>448</width>
-    <height>249</height>
-    <font>
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
-      </font>
-    </font>
-    <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
-      </color>
-    </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container_10</name>
+    <file>bpmChannelItem.opi</file>
+    <macros>
+      <CH>BM-</CH>
+    </macros>
+    <x>50</x>
+    <y>240</y>
+    <width>470</width>
+    <height>30</height>
+    <resize>2</resize>
     <actions>
     </actions>
-    <border_width>2</border_width>
     <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
+      <color red="0" green="128" blue="255">
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_1</name>
-    <text>Reference line</text>
-    <x>490</x>
-    <y>394</y>
-    <width>108</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container_9</name>
+    <file>bpmChannelItem.opi</file>
+    <macros>
+      <CH>AM-</CH>
+    </macros>
+    <x>50</x>
+    <y>200</y>
+    <width>470</width>
+    <height>30</height>
+    <resize>2</resize>
     <actions>
     </actions>
     <border_color>
@@ -915,19 +868,31 @@
       </color>
     </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_111</name>
-    <pv_name>$(P)$(R)ReferenceLineR</pv_name>
-    <x>742</x>
-    <y>394</y>
-    <width>111</width>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_15</name>
+    <x>40</x>
+    <y>840</y>
+    <width>490</width>
+    <height>60</height>
+    <line_width>0</line_width>
     <background_color>
-      <color red="255" green="255" blue="255">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container_3</name>
+    <file>aiChannelItem.opi</file>
+    <macros>
+      <CH>D-</CH>
+    </macros>
+    <x>50</x>
+    <y>780</y>
+    <width>470</width>
+    <height>30</height>
+    <resize>2</resize>
     <actions>
     </actions>
     <border_color>
@@ -935,126 +900,53 @@
       </color>
     </border_color>
   </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Menu Button_3</name>
-    <pv_name>$(P)$(R)ReferenceLine</pv_name>
-    <x>616</x>
-    <y>394</y>
-    <width>110</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_3</name>
-    <pv_name>$(P)$(R)IlkPositionStatusR</pv_name>
-    <x>619</x>
-    <y>139</y>
-    <width>16</width>
-    <height>16</height>
-    <off_color>
-      <color name="IO Background" red="235" green="235" blue="235">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_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>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_4</name>
-    <pv_name>$(P)$(R)PhaseUnwrapControlR</pv_name>
-    <x>619</x>
-    <y>438</y>
-    <width>16</width>
-    <height>16</height>
-    <off_color>
-      <color name="IO Background" red="235" green="235" blue="235">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
-      </color>
-    </on_color>
-    <foreground_color>
-      <color red="192" green="192" blue="192">
-      </color>
-    </foreground_color>
-    <line_color>
-      <color red="150" green="150" blue="150">
-      </color>
-    </line_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_46</name>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container_2</name>
+    <file>aiChannelItem.opi</file>
+    <macros>
+      <CH>C-</CH>
+    </macros>
+    <x>50</x>
+    <y>740</y>
+    <width>470</width>
+    <height>30</height>
+    <resize>2</resize>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
-      </action>
     </actions>
-    <pv_name>$(P)$(R)PhaseUnwrapControl</pv_name>
-    <text>Enable</text>
-    <x>670</x>
-    <y>436</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
+    </border_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_47</name>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container_1</name>
+    <file>aiChannelItem.opi</file>
+    <macros>
+      <CH>B-</CH>
+    </macros>
+    <x>50</x>
+    <y>700</y>
+    <width>470</width>
+    <height>30</height>
+    <resize>2</resize>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>0</value>
-      </action>
     </actions>
-    <pv_name>$(P)$(R)PhaseUnwrapControl</pv_name>
-    <text>Disable</text>
-    <x>754</x>
-    <y>436</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
+    </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_337</name>
-    <text>Control</text>
-    <x>483</x>
-    <y>436</y>
-    <width>114</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>aiChannelItem.opi</file>
+    <macros>
+      <CH>A-</CH>
+    </macros>
+    <x>50</x>
+    <y>660</y>
+    <width>470</width>
+    <height>30</height>
+    <resize>2</resize>
     <actions>
     </actions>
     <border_color>
@@ -1062,13 +954,31 @@
       </color>
     </border_color>
   </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_25</name>
+    <actions>
+      <action type="open_display">
+        <file>bpmInstanceOverview.opi</file>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Overview</text>
+    <x>365</x>
+    <y>854</y>
+    <width>150</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_338</name>
-    <text>Threshold</text>
-    <x>483</x>
-    <y>457</y>
-    <width>114</width>
-    <horizontal_alignment>2</horizontal_alignment>
+    <name>Label_343</name>
+    <text>FBIS region of interest</text>
+    <x>560</x>
+    <y>750</y>
+    <width>160</width>
+    <height>30</height>
+    <font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1078,34 +988,33 @@
       </color>
     </border_color>
   </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_6</name>
-    <pv_name>$(P)$(R)PhaseUnwrap</pv_name>
-    <x>616</x>
-    <y>457</y>
-    <width>109</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+  <widget type="label" version="2.0.0">
+    <name>Label_342</name>
+    <text>Phase unwrap</text>
+    <x>560</x>
+    <y>640</y>
+    <width>160</width>
+    <height>30</height>
+    <font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
     </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
     <border_color>
       <color red="0" green="128" blue="255">
       </color>
     </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>Text Update_112</name>
-    <pv_name>$(P)$(R)PhaseUnwrapR</pv_name>
-    <x>742</x>
-    <y>457</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <name>Text Update_115</name>
+    <pv_name>$(P)$(R)FbisRoiCountR</pv_name>
+    <x>830</x>
+    <y>860</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1117,11 +1026,12 @@
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_339</name>
-    <text>Start</text>
-    <x>483</x>
-    <y>514</y>
-    <width>114</width>
+    <name>Label_341</name>
+    <text>Num samples</text>
+    <x>570</x>
+    <y>860</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1132,39 +1042,33 @@
       </color>
     </border_color>
   </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_7</name>
-    <pv_name>$(P)$(R)FbisRoiStart</pv_name>
-    <x>616</x>
-    <y>514</y>
-    <width>109</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_114</name>
+    <pv_name>$(P)$(R)FbisRoiCountR</pv_name>
+    <x>830</x>
+    <y>820</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
     </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
     <border_color>
       <color red="0" green="128" blue="255">
       </color>
     </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_113</name>
-    <pv_name>$(P)$(R)FbisRoiStartR</pv_name>
-    <x>742</x>
-    <y>514</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_8</name>
+    <pv_name>$(P)$(R)FbisRoiCount</pv_name>
+    <x>700</x>
+    <y>820</y>
+    <width>120</width>
+    <height>30</height>
     <actions>
     </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
     <border_color>
       <color red="0" green="128" blue="255">
       </color>
@@ -1173,9 +1077,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_340</name>
     <text>Count</text>
-    <x>483</x>
-    <y>533</y>
-    <width>114</width>
+    <x>570</x>
+    <y>820</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1186,50 +1091,45 @@
       </color>
     </border_color>
   </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_8</name>
-    <pv_name>$(P)$(R)FbisRoiCount</pv_name>
-    <x>616</x>
-    <y>533</y>
-    <width>109</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_113</name>
+    <pv_name>$(P)$(R)FbisRoiStartR</pv_name>
+    <x>830</x>
+    <y>780</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
     </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
     <border_color>
       <color red="0" green="128" blue="255">
       </color>
     </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_114</name>
-    <pv_name>$(P)$(R)FbisRoiCountR</pv_name>
-    <x>742</x>
-    <y>533</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_7</name>
+    <pv_name>$(P)$(R)FbisRoiStart</pv_name>
+    <x>700</x>
+    <y>780</y>
+    <width>120</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_341</name>
-    <text>Num samples</text>
-    <x>483</x>
-    <y>552</y>
-    <width>114</width>
+    <name>Label_339</name>
+    <text>Start</text>
+    <x>570</x>
+    <y>780</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1241,15 +1141,12 @@
     </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>Text Update_115</name>
-    <pv_name>$(P)$(R)FbisRoiCountR</pv_name>
-    <x>742</x>
-    <y>552</y>
-    <width>112</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <name>Text Update_112</name>
+    <pv_name>$(P)$(R)PhaseUnwrapR</pv_name>
+    <x>830</x>
+    <y>710</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1260,34 +1157,29 @@
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_342</name>
-    <text>Phase unwrap</text>
-    <x>483</x>
-    <y>417</y>
-    <font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_6</name>
+    <pv_name>$(P)$(R)PhaseUnwrap</pv_name>
+    <x>700</x>
+    <y>710</y>
+    <width>120</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_343</name>
-    <text>FBIS region of interest</text>
-    <x>483</x>
-    <y>495</y>
-    <width>154</width>
-    <font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-      </font>
-    </font>
+    <name>Label_338</name>
+    <text>Threshold</text>
+    <x>570</x>
+    <y>710</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1298,11 +1190,12 @@
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_344</name>
+    <name>Label_337</name>
     <text>Control</text>
-    <x>486</x>
-    <y>268</y>
-    <width>112</width>
+    <x>570</x>
+    <y>670</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1313,13 +1206,39 @@
       </color>
     </border_color>
   </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_47</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)PhaseUnwrapControl</pv_name>
+    <text>Disable</text>
+    <x>830</x>
+    <y>670</y>
+    <width>80</width>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_46</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)PhaseUnwrapControl</pv_name>
+    <text>Enable</text>
+    <x>740</x>
+    <y>670</y>
+    <width>80</width>
+  </widget>
   <widget type="led" version="2.0.0">
-    <name>LED_5</name>
-    <pv_name>$(P)$(R)IlkMagnitudeControlR</pv_name>
-    <x>619</x>
-    <y>270</y>
-    <width>16</width>
-    <height>16</height>
+    <name>LED_4</name>
+    <pv_name>$(P)$(R)PhaseUnwrapControlR</pv_name>
+    <x>706</x>
+    <y>675</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -1328,69 +1247,45 @@
       <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
       </color>
     </on_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>
     <actions>
     </actions>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_48</name>
-    <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
-      </action>
-    </actions>
-    <pv_name>$(P)$(R)IlkMagnitudeControl</pv_name>
-    <text>Enable</text>
-    <x>670</x>
-    <y>268</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
+  <widget type="combo" version="2.0.0">
+    <name>Menu Button_3</name>
+    <pv_name>$(P)$(R)ReferenceLine</pv_name>
+    <x>700</x>
+    <y>590</y>
+    <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_49</name>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_111</name>
+    <pv_name>$(P)$(R)ReferenceLineR</pv_name>
+    <x>830</x>
+    <y>590</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>0</value>
-      </action>
     </actions>
-    <pv_name>$(P)$(R)IlkMagnitudeControl</pv_name>
-    <text>Disable</text>
-    <x>754</x>
-    <y>268</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_345</name>
-    <text>Status</text>
-    <x>486</x>
-    <y>287</y>
-    <width>112</width>
+    <name>Label_1</name>
+    <text>Reference line</text>
+    <x>570</x>
+    <y>590</y>
+    <width>120</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1401,73 +1296,54 @@
       </color>
     </border_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_50</name>
+  <widget type="label" version="2.0.0">
+    <name>Label_346</name>
+    <text>Channel Overview</text>
+    <x>55</x>
+    <y>854</y>
+    <width>260</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
-      </action>
     </actions>
-    <pv_name>$(P)$(R)IlkMagnitudeClear</pv_name>
-    <text>Clear</text>
-    <x>670</x>
-    <y>287</y>
-    <width>43</width>
-    <height>20</height>
-    <font>
-      <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
+    </border_color>
   </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_6</name>
-    <pv_name>$(P)$(R)IlkMagnitudeStatusR</pv_name>
-    <x>619</x>
-    <y>289</y>
-    <width>16</width>
-    <height>16</height>
-    <off_color>
-      <color name="IO Background" red="235" green="235" blue="235">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </on_color>
-    <foreground_color>
-      <color red="192" green="192" blue="192">
-      </color>
-    </foreground_color>
-    <line_color>
-      <color red="150" green="150" blue="150">
+  <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>1000</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>
-    </line_color>
-    <actions>
-    </actions>
+    </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_5</name>
-    <text>RAW</text>
-    <x>24</x>
-    <y>385</y>
-    <width>80</width>
-    <height>15</height>
-    <font>
-      <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>$(P)$(R)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>960</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>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
       </color>
-    </border_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>
 </display>
diff --git a/99-Shared/adsis8300bpm/bpmInstanceOverview.bob b/99-Shared/adsis8300bpm/bpmInstanceOverview.bob
index d458ad188bf06f9591373d89f16f1abd7e656341..24c5f6607456b44c754401400ab751256ddbc3f2 100644
--- a/99-Shared/adsis8300bpm/bpmInstanceOverview.bob
+++ b/99-Shared/adsis8300bpm/bpmInstanceOverview.bob
@@ -1,49 +1,136 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>channel overview $(P)$(R)</name>
-  <width>1200</width>
+  <width>1270</width>
   <height>1000</height>
-  <background_color>
-    <color red="240" green="240" blue="240">
-    </color>
-  </background_color>
   <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>1270</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>Label_23</name>
-    <text>$(P)$(R)</text>
-    <x>7</x>
-    <y>7</y>
-    <width>1187</width>
-    <height>29</height>
-    <font>
+    <name>title</name>
+    <class>TITLE</class>
+    <text>Channel Overview: $(P)$(R)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>960</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>BGGrey03-titlebar_4</name>
+    <x>20</x>
+    <y>70</y>
+    <width>1230</width>
+    <height>910</height>
+    <line_width>0</line_width>
     <background_color>
-      <color name="IO Focus Entry" red="198" green="217" blue="241">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>1</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_14</name>
+    <x>40</x>
+    <y>890</y>
+    <width>590</width>
+    <height>70</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
-    </border_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>640</x>
+    <y>90</y>
+    <width>590</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_12</name>
+    <x>40</x>
+    <y>490</y>
+    <width>590</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_13</name>
+    <x>640</x>
+    <y>490</y>
+    <width>590</width>
+    <height>470</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_10</name>
+    <x>40</x>
+    <y>90</y>
+    <width>590</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="xyplot" version="2.0.0">
     <name>XY Graph</name>
-    <x>12</x>
-    <y>84</y>
+    <x>50</x>
+    <y>100</y>
     <width>571</width>
     <height>367</height>
     <background_color>
-      <color red="240" green="240" blue="240">
+      <color name="Transparent" red="255" green="255" blue="255" alpha="0">
       </color>
     </background_color>
     <title_font>
@@ -210,12 +297,12 @@
   </widget>
   <widget type="xyplot" version="2.0.0">
     <name>XY Graph_1</name>
-    <x>600</x>
-    <y>84</y>
+    <x>648</x>
+    <y>100</y>
     <width>571</width>
     <height>367</height>
     <background_color>
-      <color red="240" green="240" blue="240">
+      <color name="Transparent" red="255" green="255" blue="255" alpha="0">
       </color>
     </background_color>
     <title_font>
@@ -300,12 +387,12 @@
   </widget>
   <widget type="xyplot" version="2.0.0">
     <name>XY Graph_2</name>
-    <x>12</x>
-    <y>486</y>
+    <x>50</x>
+    <y>502</y>
     <width>571</width>
     <height>367</height>
     <background_color>
-      <color red="240" green="240" blue="240">
+      <color name="Transparent" red="255" green="255" blue="255" alpha="0">
       </color>
     </background_color>
     <title_font>
@@ -489,12 +576,12 @@
   </widget>
   <widget type="xyplot" version="2.0.0">
     <name>XY Graph_3</name>
-    <x>600</x>
-    <y>486</y>
+    <x>648</x>
+    <y>502</y>
     <width>571</width>
-    <height>367</height>
+    <height>448</height>
     <background_color>
-      <color red="240" green="240" blue="240">
+      <color name="Transparent" red="255" green="255" blue="255" alpha="0">
       </color>
     </background_color>
     <title_font>
@@ -680,9 +767,10 @@
     <name>Check Box</name>
     <pv_name>loc://ref1_visible(1)</pv_name>
     <label>Reference 1 visible</label>
-    <x>12</x>
-    <y>48</y>
-    <width>169</width>
+    <x>60</x>
+    <y>910</y>
+    <width>180</width>
+    <height>30</height>
     <actions>
     </actions>
   </widget>
@@ -690,9 +778,10 @@
     <name>Check Box_1</name>
     <pv_name>loc://ref2_visible(1)</pv_name>
     <label>Reference 2 visible</label>
-    <x>246</x>
-    <y>48</y>
-    <width>169</width>
+    <x>260</x>
+    <y>910</y>
+    <width>180</width>
+    <height>30</height>
     <actions>
     </actions>
   </widget>
diff --git a/99-Shared/adsis8300bpm/bpmReference.bob b/99-Shared/adsis8300bpm/bpmReference.bob
index 11182a32e2733f0c64ca959cb9426128e681f427..886e8125e3cd4d8672f682b5cf2ff8c6da13c279 100644
--- a/99-Shared/adsis8300bpm/bpmReference.bob
+++ b/99-Shared/adsis8300bpm/bpmReference.bob
@@ -1,49 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <width>450</width>
-  <height>125</height>
-  <background_color>
-    <color red="240" green="240" blue="240">
-    </color>
-  </background_color>
+  <width>570</width>
+  <height>260</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>570</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="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_4</name>
+    <x>20</x>
+    <y>70</y>
+    <width>530</width>
+    <height>170</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>90</y>
+    <width>490</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="label" version="2.0.0">
-    <name>Label_276</name>
+    <name>BGGrey02-title_19</name>
     <text>Reference line $(I)</text>
-    <x>2</x>
-    <y>2</y>
-    <width>448</width>
-    <height>123</height>
+    <x>20</x>
+    <width>530</width>
+    <height>50</height>
     <font>
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
-    <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
-      </color>
-    </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_8</name>
+    <file>aiChannelItem.opi</file>
     <macros>
       <CH>RL$(I)-</CH>
     </macros>
-    <file>aiChannelItem.opi</file>
-    <x>18</x>
-    <y>42</y>
-    <width>420</width>
-    <height>20</height>
+    <x>50</x>
+    <y>100</y>
+    <width>470</width>
+    <height>30</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -54,14 +78,14 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_17</name>
+    <file>bpmChannelItem.opi</file>
     <macros>
       <CH>RL$(I)-M-</CH>
     </macros>
-    <file>bpmChannelItem.opi</file>
-    <x>18</x>
-    <y>64</y>
-    <width>420</width>
-    <height>20</height>
+    <x>50</x>
+    <y>140</y>
+    <width>470</width>
+    <height>30</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -72,14 +96,14 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_18</name>
+    <file>bpmChannelItem.opi</file>
     <macros>
       <CH>RL$(I)-A-</CH>
     </macros>
-    <file>bpmChannelItem.opi</file>
-    <x>18</x>
-    <y>86</y>
-    <width>420</width>
-    <height>20</height>
+    <x>50</x>
+    <y>180</y>
+    <width>470</width>
+    <height>30</height>
     <resize>2</resize>
     <actions>
     </actions>
diff --git a/99-Shared/adsis8300bpm/instance.bob b/99-Shared/adsis8300bpm/instance.bob
index f4d13fc1858d8077a79d501e3b36b49c1e9a5f58..826266111da7e96170b076d8cb8a9875e1f71e87 100644
--- a/99-Shared/adsis8300bpm/instance.bob
+++ b/99-Shared/adsis8300bpm/instance.bob
@@ -1,31 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
+  <width>430</width>
+  <height>120</height>
   <background_color>
-    <color red="240" green="240" blue="240">
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
   </background_color>
   <actions>
   </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_4</name>
+    <width>450</width>
+    <height>140</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>20</x>
+    <y>50</y>
+    <width>410</width>
+    <height>70</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</name>
+    <name>BGGrey02-title_19</name>
     <text>$(SYSTEM)</text>
-    <x>7</x>
-    <y>85</y>
-    <width>398</width>
-    <height>101</height>
+    <width>450</width>
+    <height>50</height>
     <font>
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
+      <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>
-    <actions>
-    </actions>
-    <border_width>1</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Menu Button_5</name>
@@ -50,18 +74,9 @@
       </action>
     </actions>
     <text>sis8300</text>
-    <x>108</x>
-    <y>132</y>
-    <width>111</width>
-    <height>20</height>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
+    <x>40</x>
+    <y>70</y>
+    <width>110</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -76,44 +91,11 @@
       </action>
     </actions>
     <text>BPM</text>
-    <x>228</x>
-    <y>132</y>
-    <width>111</width>
-    <height>20</height>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
+    <x>170</x>
+    <y>70</y>
+    <width>110</width>
     <tooltip>$(actions)</tooltip>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_6</name>
-    <text>Screens:</text>
-    <x>18</x>
-    <y>126</y>
-    <width>85</width>
-    <height>31</height>
-    <font>
-      <font name="Header 2" family="Liberation Sans" style="BOLD" size="18.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="Gray_14" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <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>Menu Button_4</name>
     <actions>
@@ -127,18 +109,9 @@
       </action>
     </actions>
     <text>mrfioc2</text>
-    <x>108</x>
-    <y>156</y>
-    <width>111</width>
-    <height>20</height>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
-      </color>
-    </background_color>
+    <x>300</x>
+    <y>70</y>
+    <width>110</width>
     <tooltip>$(actions)</tooltip>
   </widget>
 </display>