diff --git a/10-Top/bcmioc/top.bob b/10-Top/bcmioc/top.bob
index 18506d8085dd1581c805d594eb5f79c303f8ea82..8976d2d3c8f0fd442b63c4786078abec1558be93 100644
--- a/10-Top/bcmioc/top.bob
+++ b/10-Top/bcmioc/top.bob
@@ -53,7 +53,7 @@
       <wrap_words use_class="true">false</wrap_words>
     </widget>
     <widget type="action_button" version="3.0.0">
-      <name>Operator</name>
+      <name>Operator_1</name>
       <actions>
         <action type="open_display">
           <file>../../../../../30-Operator/10-ACC/99-PBI/10-Top/BCM.bob</file>
@@ -68,7 +68,7 @@
       <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="action_button" version="3.0.0">
-      <name>MachineExpert</name>
+      <name>MachineExpert_1</name>
       <actions>
         <action type="open_display">
           <file>../../../../../20-SystemExpert/10-ACC/99-PBI/10-Top/BCM.bob</file>
diff --git a/10-Top/fcioc/instance.bob b/10-Top/fcioc/instance.bob
index 4ef1f42ff5131e5f9588c8e0658bcda5915b7642..9a0318236a150f7886f0f97ce188dbc9fea1b6b7 100644
--- a/10-Top/fcioc/instance.bob
+++ b/10-Top/fcioc/instance.bob
@@ -1,214 +1,167 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
+  <width>320</width>
+  <height>380</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="action_button" version="3.0.0">
-    <name>Menu Button_3</name>
-    <actions>
-      <action type="open_display">
-        <file>../../99-Shared/adsis8300/system.opi</file>
-        <macros>
-          <P>$(CONTROL_GROUP):$(AMC_NAME):</P>
-          <R></R>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>CG OPI</text>
-    <x>324</x>
-    <y>135</y>
-    <width>67</width>
-    <height>20</height>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_3</name>
+    <width>320</width>
+    <height>380</height>
+    <line_width>0</line_width>
     <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </background_color>
-    <tooltip>$(actions)</tooltip>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_1</name>
-    <text>$(CONTROL_GROUP)</text>
-    <x>25</x>
-    <y>133</y>
-    <width>133</width>
-    <height>23</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">
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_9</name>
+    <x>20</x>
+    <y>50</y>
+    <width>280</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_2</name>
-    <text>$(AMC_NAME)</text>
-    <x>175</x>
-    <y>133</y>
-    <width>133</width>
-    <height>23</height>
+    <name>BGGrey02-title_18</name>
+    <text>$(CONTROL_GROUP)$(AMC_NAME)</text>
+    <width>320</width>
+    <height>50</height>
     <font>
-      <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.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 Area Background" red="221" green="223" blue="229">
-      </color>
-    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Menu Button_1</name>
+    <name>Menu Button_3</name>
     <actions>
       <action type="open_display">
-        <file>../../99-Shared/adsis8300fc/fc.opi</file>
+        <file>../../99-Shared/adsis8300/system_top.bob</file>
         <macros>
-          <CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
-          <P>$(SYSTEM1)</P>
-          <R></R>
+          <Name>FC</Name>
+          <P>$(CONTROL_GROUP):</P>
+          <R>$(AMC_NAME):</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
-    <text>$(SYSTEM1)</text>
-    <x>396</x>
-    <y>135</y>
-    <width>187</width>
-    <height>20</height>
-    <foreground_color>
-      <color name="IO TextButton" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
+    <text>CG OPI</text>
+    <x>40</x>
+    <y>70</y>
+    <width>240</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_10</name>
+    <x>20</x>
+    <y>140</y>
+    <width>280</width>
+    <height>220</height>
+    <line_width>0</line_width>
     <background_color>
-      <color name="IO Button" red="178" green="178" blue="178">
+      <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>Menu Button_2</name>
+    <name>Menu Button_10</name>
     <actions>
       <action type="open_display">
-        <file>../../99-Shared/adsis8300fc/fc.opi</file>
+        <file>$(FCscreen)</file>
         <macros>
-          <P>$(SYSTEM2)</P>
-          <R></R>
+          <AMC>$(AMC_NAME)</AMC>
+          <CG>$(CONTROL_GROUP)</CG>
+          <P>$(P1)</P>
+          <R>$(R1)</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
-    <text>$(SYSTEM2)</text>
-    <x>396</x>
-    <y>155</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>
+    <text>$(P1)$(R1)</text>
+    <x>40</x>
+    <y>160</y>
+    <width>240</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Menu Button_3</name>
+    <name>Menu Button_11</name>
     <actions>
       <action type="open_display">
-        <file>../../99-Shared/adsis8300fc/fc.opi</file>
+        <file>$(FCscreen)</file>
         <macros>
-          <P>$(SYSTEM3)</P>
-          <R></R>
+          <AMC>$(AMC_NAME)</AMC>
+          <CG>$(CONTROL_GROUP)</CG>
+          <P>$(P2)</P>
+          <R>$(R2)</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
-    <text>$(SYSTEM3)</text>
-    <x>396</x>
-    <y>175</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>
+    <text>$(P2)$(R2)</text>
+    <x>40</x>
+    <y>210</y>
+    <width>240</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Menu Button_4</name>
+    <name>Menu Button_12</name>
     <actions>
       <action type="open_display">
-        <file>../../99-Shared/adsis8300fc/fc.opi</file>
+        <file>$(FCscreen)</file>
         <macros>
-          <P>$(SYSTEM4)</P>
-          <R></R>
+          <AMC>$(AMC_NAME)</AMC>
+          <CG>$(CONTROL_GROUP)</CG>
+          <P>$(P3)</P>
+          <R>$(R3)</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
-    <text>$(SYSTEM4)</text>
-    <x>396</x>
-    <y>195</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>
+    <text>$(P3)$(R3)</text>
+    <x>40</x>
+    <y>260</y>
+    <width>240</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Menu Button_5</name>
+    <name>Menu Button_13</name>
     <actions>
       <action type="open_display">
-        <file>../../99-Shared/adsis8300fc/fc.opi</file>
+        <file>$(FCscreen)</file>
         <macros>
-          <P>$(SYSTEM5)</P>
-          <R></R>
+          <AMC>$(AMC_NAME)</AMC>
+          <CG>$(CONTROL_GROUP)</CG>
+          <P>$(P4)</P>
+          <R>$(R4)</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
-    <text>$(SYSTEM5)</text>
-    <x>396</x>
-    <y>215</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>
+    <text>$(P4)$(R4)</text>
+    <x>40</x>
+    <y>310</y>
+    <width>240</width>
     <tooltip>$(actions)</tooltip>
   </widget>
 </display>
diff --git a/10-Top/fcioc/top.bob b/10-Top/fcioc/top.bob
index 985002e7a3b505e879368b06f05d7527f8833eb2..3d077894761ebdfbb27c4696a8cd8f5886316cb2 100644
--- a/10-Top/fcioc/top.bob
+++ b/10-Top/fcioc/top.bob
@@ -2,31 +2,31 @@
 <display version="2.0.0">
   <name>$(TITLE)</name>
   <macros>
+    <FCscreen>../../99-Shared/adsis8300fc/channel.bob</FCscreen>
     <TITLE>FC IOCs</TITLE>
   </macros>
-  <width>600</width>
-  <background_color>
-    <color red="240" green="240" blue="240">
-    </color>
-  </background_color>
+  <height>470</height>
   <actions>
   </actions>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container</name>
-    <file>instance.opi</file>
     <macros>
       <AMC_NAME>Ctrl-AMC-003</AMC_NAME>
       <CONTROL_GROUP>LAB-FC05</CONTROL_GROUP>
-      <SYSTEM1>LAB-010:PBI-FC-001:</SYSTEM1>
-      <SYSTEM2>LAB-010:PBI-FC-002:</SYSTEM2>
-      <SYSTEM3>LAB-010:PBI-FC-003:</SYSTEM3>
-      <SYSTEM4>LAB-010:PBI-FC-004:</SYSTEM4>
-      <SYSTEM5>LAB-010:PBI-FC-005:</SYSTEM5>
+      <P1>LEBT-010:</P1>
+      <P2>MEBT-010:</P2>
+      <P3>DTL-020:</P3>
+      <P4>DTL-040:</P4>
+      <R1>PBI-FC-001:</R1>
+      <R2>PBI-FC-001:</R2>
+      <R3>PBI-FC-001:</R3>
+      <R4>PBI-FC-001:</R4>
     </macros>
-    <x>18</x>
-    <y>114</y>
-    <width>560</width>
-    <height>104</height>
+    <file>instance.bob</file>
+    <x>240</x>
+    <y>70</y>
+    <width>320</width>
+    <height>380</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -35,89 +35,74 @@
       </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>
+  <widget type="group" version="2.0.0">
+    <name>Titlebar_1</name>
+    <width>800</width>
     <height>50</height>
-    <font>
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>titleBar_1</name>
+      <class>TITLE-BAR</class>
+      <x use_class="true">0</x>
+      <y use_class="true">0</y>
+      <width>800</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_1</name>
+      <class>TITLE</class>
+      <text>FC : Engineering Screen (IOC)</text>
+      <x use_class="true">20</x>
+      <y use_class="true">0</y>
+      <width>770</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>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <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>Label_3</name>
-    <text>CONTROL GROUP</text>
-    <x>19</x>
-    <y>79</y>
-    <width>133</width>
-    <height>23</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 Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_4</name>
-    <text>AMC NAME</text>
-    <x>169</x>
-    <y>79</y>
-    <width>131</width>
-    <height>23</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 Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_5</name>
-    <text>OPI</text>
-    <x>319</x>
-    <y>79</y>
-    <width>258</width>
-    <height>23</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 Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
+      <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_4</name>
+      <actions>
+        <action type="open_display">
+          <file>../../../../../30-Operator/10-ACC/99-PBI/10-Top/FC.bob</file>
+          <target>replace</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text>Operator</text>
+      <x>530</x>
+      <y>10</y>
+      <width>120</width>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>MachineExpert_2</name>
+      <actions>
+        <action type="open_display">
+          <file>../../../../../20-SystemExpert/10-ACC/99-PBI/10-Top/FC.bob</file>
+          <target>replace</target>
+        </action>
+      </actions>
+      <text>Machine Expert</text>
+      <x>660</x>
+      <y>10</y>
+      <width>120</width>
+      <tooltip>$(actions)</tooltip>
+    </widget>
   </widget>
 </display>
diff --git a/99-Shared/adsis8300/system_top.bob b/99-Shared/adsis8300/system_top.bob
index 253bdb534b10f015d73666543cfd8719e38e3c16..809215ebba438aa433fc77ec7c9b44f3094df993 100644
--- a/99-Shared/adsis8300/system_top.bob
+++ b/99-Shared/adsis8300/system_top.bob
@@ -2,7 +2,7 @@
 <display version="2.0.0">
   <name>$(P)$(R) System</name>
   <width>1470</width>
-  <height>930</height>
+  <height>1130</height>
   <actions>
   </actions>
   <widget type="rectangle" version="2.0.0">
@@ -21,7 +21,7 @@
   <widget type="label" version="2.0.0">
     <name>title</name>
     <class>TITLE</class>
-    <text>BCM IOC : $(P) System</text>
+    <text>$(Name) IOC : $(P) System</text>
     <x use_class="true">20</x>
     <y use_class="true">0</y>
     <width>1430</width>
@@ -48,4 +48,18 @@
     <height>1040</height>
     <resize>2</resize>
   </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>MachineExpert_3</name>
+    <actions>
+      <action type="open_display">
+        <file>../../10-Top/fcioc/top.bob</file>
+        <target>replace</target>
+      </action>
+    </actions>
+    <text>Overview</text>
+    <x>1330</x>
+    <y>10</y>
+    <width>120</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
 </display>
diff --git a/99-Shared/adsis8300fc/channel.bob b/99-Shared/adsis8300fc/channel.bob
index 4ed7a0976fdc12f41e46ee56a9a2ae51ed4d478a..a5dcd87afb1d19ca426bc6eeb51b43f0befd9b39 100644
--- a/99-Shared/adsis8300fc/channel.bob
+++ b/99-Shared/adsis8300fc/channel.bob
@@ -1,242 +1,370 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>$(TITLE) : $(CH)</name>
-  <width>2000</width>
-  <height>2200</height>
-  <background_color>
-    <color red="240" green="240" blue="240">
-    </color>
-  </background_color>
+  <name>$(TITLE) : $(P)$(R)</name>
+  <macros>
+    <FCscreen>channel.bob</FCscreen>
+    <P1>LEBT-010:</P1>
+    <P2>MEBT-010:</P2>
+    <P3>DTL-020:</P3>
+    <P4>DTL-040:</P4>
+    <R1>PBI-FC-001:</R1>
+    <R2>PBI-FC-001:</R2>
+    <R3>PBI-FC-001:</R3>
+    <R4>PBI-FC-001:</R4>
+  </macros>
+  <width>2160</width>
+  <height>1210</height>
   <actions>
   </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>BGGrey02-background_10</name>
-    <x>1319</x>
-    <y>62</y>
-    <width>558</width>
-    <height>837</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
-      </color>
-    </line_color>
+    <name>BGGrey03-titlebar_10</name>
+    <x>1540</x>
+    <y>70</y>
+    <width>600</width>
+    <height>1140</height>
+    <line_width>0</line_width>
     <background_color>
-      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      <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>BGGrey02-background_9</name>
-    <x>865</x>
-    <y>514</y>
-    <width>446</width>
-    <height>385</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
-      </color>
-    </line_color>
+    <name>BGGrey03-background_21</name>
+    <x>1560</x>
+    <y>1080</y>
+    <width>560</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_height>10</corner_height>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>BGGrey02-background_7</name>
-    <x>443</x>
-    <y>515</y>
-    <width>406</width>
-    <height>385</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
-      </color>
-    </line_color>
+    <name>BGGrey03-background_20</name>
+    <x>1560</x>
+    <y>590</y>
+    <width>560</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_height>10</corner_height>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_11</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
-    <width>1870</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">
+    <name>BGGrey03-background_19</name>
+    <x>1560</x>
+    <y>90</y>
+    <width>560</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>Rectangle_10</name>
-    <x>865</x>
-    <y>515</y>
-    <width>444</width>
-    <height>30</height>
+    <name>BGGrey03-titlebar_9</name>
+    <x>560</x>
+    <y>70</y>
+    <width>960</width>
+    <height>620</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>Rectangle_9</name>
-    <x>443</x>
-    <y>515</y>
-    <width>406</width>
-    <height>30</height>
+    <name>BGGrey03-background_18</name>
+    <x>580</x>
+    <y>90</y>
+    <width>920</width>
+    <height>580</height>
     <line_width>0</line_width>
     <background_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      <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>BGGrey02-background_2</name>
-    <x>13</x>
-    <y>673</y>
-    <width>406</width>
-    <height>135</height>
-    <line_width>2</line_width>
-    <line_color>
+    <name>BGGrey03-titlebar_8</name>
+    <x>1050</x>
+    <y>710</y>
+    <width>470</width>
+    <height>500</height>
+    <line_width>0</line_width>
+    <background_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
-    </line_color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_14</name>
+    <x>1070</x>
+    <y>760</y>
+    <width>430</width>
+    <height>270</height>
+    <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
-    <corner_height>10</corner_height>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>BGGrey02-background_1</name>
-    <x>13</x>
-    <y>512</y>
-    <width>406</width>
-    <height>135</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
-      </color>
-    </line_color>
+    <name>BGGrey03-background_17</name>
+    <x>1070</x>
+    <y>1050</y>
+    <width>430</width>
+    <height>140</height>
+    <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
-    <corner_height>10</corner_height>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_6</name>
-    <x>13</x>
-    <y>673</y>
-    <width>406</width>
-    <height>30</height>
+    <name>BGGrey03-titlebar_6</name>
+    <x>560</x>
+    <y>710</y>
+    <width>470</width>
+    <height>500</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>BGGrey02-background</name>
-    <x>13</x>
-    <y>106</y>
-    <width>406</width>
-    <height>384</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+    <name>BGGrey03-background_15</name>
+    <x>580</x>
+    <y>1050</y>
+    <width>430</width>
+    <height>140</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
-    </line_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>Flat top ROI (cursors)</text>
+    <x>560</x>
+    <y>710</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>580</x>
+    <y>760</y>
+    <width>430</width>
+    <height>270</height>
+    <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
-    <corner_height>10</corner_height>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_4</name>
-    <x>13</x>
-    <y>76</y>
-    <width>406</width>
-    <height>30</height>
+    <name>BGGrey03-titlebar_5</name>
+    <x>20</x>
+    <y>990</y>
+    <width>520</width>
+    <height>220</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_39</name>
-    <pv_name>$(P)$(R)$(CH)-ROI3-MinX_RBV</pv_name>
-    <x>650</x>
-    <y>590</y>
-    <width>70</width>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_20</name>
+    <text>Flat top current</text>
+    <x>20</x>
+    <y>990</y>
+    <width>520</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
     <foreground_color>
-      <color red="0" green="0" blue="0">
+      <color name="WHITE" red="255" green="255" blue="255">
       </color>
     </foreground_color>
-    <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_2</name>
-    <pv_name>$(P)$(R)Acquire</pv_name>
-    <x>197</x>
-    <y>130</y>
-    <width>21</width>
-    <height>21</height>
-    <off_color>
-      <color name="IO Background" red="235" green="235" blue="235">
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_11</name>
+    <x>40</x>
+    <y>1040</y>
+    <width>480</width>
+    <height>150</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
-    </off_color>
-    <on_color>
-      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+    </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>790</y>
+    <width>520</width>
+    <height>180</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
-    </on_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>Charge</text>
+    <x>20</x>
+    <y>790</y>
+    <width>520</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
     <foreground_color>
-      <color red="192" green="192" blue="192">
+      <color name="WHITE" red="255" green="255" blue="255">
       </color>
     </foreground_color>
-    <line_color>
-      <color red="150" green="150" blue="150">
+    <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>840</y>
+    <width>480</width>
+    <height>110</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
-    </line_color>
-    <actions>
-    </actions>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_41</name>
-    <pv_name>$(P)$(R)Acquire_RBV</pv_name>
-    <x>241</x>
-    <y>130</y>
-    <width>121</width>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_3</name>
+    <x>20</x>
+    <y>70</y>
+    <width>520</width>
+    <height>420</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_18</name>
+    <text>General</text>
+    <x>20</x>
+    <y>70</y>
+    <width>520</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
     <foreground_color>
-      <color red="0" green="0" blue="0">
+      <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_9</name>
+    <x>40</x>
+    <y>120</y>
+    <width>480</width>
+    <height>350</height>
+    <line_width>0</line_width>
     <background_color>
-      <color name="BLACK-TEXT" 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="rectangle" version="2.0.0">
+    <name>Rectangle_11</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>2160</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>
-    <transparent>true</transparent>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_39</name>
+    <pv_name>$(P)$(R)ROI3-MinX_RBV</pv_name>
+    <x>800</x>
+    <y>820</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -249,17 +377,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_45</name>
     <pv_name>$(P)$(R)NumSamplesR</pv_name>
-    <x>197</x>
-    <y>210</y>
-    <width>155</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>390</x>
+    <y>180</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -273,9 +394,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_131</name>
     <text>Start:</text>
-    <x>410</x>
-    <y>590</y>
-    <width>98</width>
+    <x>600</x>
+    <y>820</y>
+    <width>80</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -297,17 +419,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_51</name>
     <pv_name>$(P)$(R)ArrayCounter_RBV</pv_name>
-    <x>197</x>
-    <y>252</y>
-    <width>154</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>260</x>
+    <y>220</y>
+    <width>240</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -346,16 +461,16 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="xyplot" version="2.0.0">
     <name>XY Graph_2</name>
-    <x>443</x>
-    <y>76</y>
-    <width>836</width>
-    <height>436</height>
+    <x>600</x>
+    <y>110</y>
+    <width>880</width>
+    <height>546</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <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>
@@ -370,13 +485,13 @@ $(pv_value)</tooltip>
         <exp bool_exp="true">
           <expression>pv0</expression>
         </exp>
-        <pv_name>$(P)$(R)$(CH)-TRC2-ArraySize0_RBV</pv_name>
+        <pv_name>$(P)$(R)TRC2-ArraySize0_RBV</pv_name>
       </rule>
       <rule name="y_max" prop_id="axis_1_maximum" out_exp="true">
         <exp bool_exp="true">
           <expression>pv0</expression>
         </exp>
-        <pv_name>$(P)$(R)$(CH)-TRC2-ArraySize1_RBV</pv_name>
+        <pv_name>$(P)$(R)TRC2-ArraySize1_RBV</pv_name>
       </rule>
       <rule name="Y title" prop_id="axis_1_axis_title" out_exp="true">
         <exp bool_exp="pv0==1">
@@ -385,37 +500,37 @@ $(pv_value)</tooltip>
         <exp bool_exp="pv0==0">
           <expression>"ADC counts"</expression>
         </exp>
-        <pv_name>$(P)$(R)$(CH)-PROC1-EnableOffsetScale_RBV</pv_name>
+        <pv_name>$(P)$(R)PROC1-EnableOffsetScale_RBV</pv_name>
       </rule>
       <rule name="samples_x_max" prop_id="axis_0_maximum" out_exp="true">
         <exp bool_exp="true">
           <expression>pv0</expression>
         </exp>
-        <pv_name>$(P)$(R)$(CH)-ROI2-ArraySizeX_RBV</pv_name>
+        <pv_name>$(P)$(R)ROI2-ArraySizeX_RBV</pv_name>
       </rule>
       <rule name="time_x_min" prop_id="axis_2_minimum" out_exp="true">
         <exp bool_exp="true">
           <expression>pv0</expression>
         </exp>
-        <pv_name>$(P)$(R)$(CH)-ROI2-TickFirstUsR</pv_name>
+        <pv_name>$(P)$(R)ROI2-TickFirstUsR</pv_name>
       </rule>
       <rule name="time_x_max" prop_id="axis_2_maximum" out_exp="true">
         <exp bool_exp="true">
           <expression>pv0</expression>
         </exp>
-        <pv_name>$(P)$(R)$(CH)-ROI2-TickLastUsR</pv_name>
+        <pv_name>$(P)$(R)ROI2-TickLastUsR</pv_name>
       </rule>
     </rules>
     <scripts>
       <script file="handleCursors.js">
-        <pv_name>$(P)$(R)$(CH)-ROI3-MinX_RBV</pv_name>
-        <pv_name>$(P)$(R)$(CH)-ROI3-SizeX_RBV</pv_name>
-        <pv_name>$(P)$(R)$(CH)-ROI3-BinX_RBV</pv_name>
-        <pv_name>$(P)$(R)$(CH)-ROI2-MinX_RBV</pv_name>
-        <pv_name>$(P)$(R)$(CH)-ROI2-ArraySizeX_RBV</pv_name>
-        <pv_name>$(P)$(R)$(CH)-ROI2-BinX_RBV</pv_name>
-        <pv_name trigger="false">$(P)$(R)$(CH)-STAT3-MaxValue_RBV</pv_name>
-        <pv_name>$(P)$(R)$(CH)-ROI3-ArraySizeX_RBV</pv_name>
+        <pv_name>$(P)$(R)ROI3-MinX_RBV</pv_name>
+        <pv_name>$(P)$(R)ROI3-SizeX_RBV</pv_name>
+        <pv_name>$(P)$(R)ROI3-BinX_RBV</pv_name>
+        <pv_name>$(P)$(R)ROI2-MinX_RBV</pv_name>
+        <pv_name>$(P)$(R)ROI2-ArraySizeX_RBV</pv_name>
+        <pv_name>$(P)$(R)ROI2-BinX_RBV</pv_name>
+        <pv_name trigger="false">$(P)$(R)STAT3-MaxValue_RBV</pv_name>
+        <pv_name>$(P)$(R)ROI3-ArraySizeX_RBV</pv_name>
       </script>
     </scripts>
     <x_axis>
@@ -492,7 +607,7 @@ $(pv_value)</tooltip>
       <trace>
         <name>Pulse</name>
         <x_pv></x_pv>
-        <y_pv>$(P)$(R)$(CH)-TRC2-ArrayData</y_pv>
+        <y_pv>$(P)$(R)TRC2-ArrayData</y_pv>
         <err_pv></err_pv>
         <axis>0</axis>
         <trace_type>1</trace_type>
@@ -510,18 +625,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_52</name>
-    <pv_name>$(P)$(R)$(CH)-TRC2-ArrayCounter_RBV</pv_name>
-    <x>463</x>
-    <y>800</y>
-    <width>74</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)TRC2-ArrayCounter_RBV</pv_name>
+    <x>601</x>
+    <y>1100</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -535,9 +643,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_148</name>
     <text>Counter</text>
-    <x>462</x>
-    <y>774</y>
-    <width>72</width>
+    <x>600</x>
+    <y>1070</y>
+    <width>90</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -559,18 +668,10 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_60</name>
     <pv_name>$(P)$(R)ArrayRate_RBV</pv_name>
-    <x>197</x>
-    <y>169</y>
-    <width>155</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
+    <x>260</x>
+    <y>140</y>
+    <width>240</width>
+    <height>30</height>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -583,33 +684,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_157</name>
     <text>Rate:</text>
-    <x>54</x>
-    <y>169</y>
-    <width>119</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <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_158</name>
-    <text>Status:</text>
-    <x>53</x>
-    <y>130</y>
-    <width>119</width>
+    <x>60</x>
+    <y>140</y>
+    <width>140</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -630,18 +708,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_62</name>
-    <pv_name>$(P)$(R)$(CH)-TRC2-ArrayRate_RBV</pv_name>
-    <x>654</x>
-    <y>800</y>
-    <width>74</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)TRC2-ArrayRate_RBV</pv_name>
+    <x>800</x>
+    <y>1100</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -655,9 +726,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_160</name>
     <text>Rate</text>
-    <x>650</x>
-    <y>774</y>
-    <width>72</width>
+    <x>800</x>
+    <y>1070</y>
+    <width>90</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -678,18 +750,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_64</name>
-    <pv_name>$(P)$(R)$(CH)-TRC2-EnableCallbacks_RBV</pv_name>
-    <x>558</x>
-    <y>800</y>
-    <width>74</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)TRC2-EnableCallbacks_RBV</pv_name>
+    <x>700</x>
+    <y>1100</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -703,9 +768,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_162</name>
     <text>Status</text>
-    <x>559</x>
-    <y>774</y>
-    <width>72</width>
+    <x>700</x>
+    <y>1070</y>
+    <width>90</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -727,9 +793,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_163</name>
     <text>Pulse counter:</text>
-    <x>54</x>
-    <y>252</y>
-    <width>119</width>
+    <x>60</x>
+    <y>220</y>
+    <width>140</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -750,18 +817,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_66</name>
-    <pv_name>$(P)$(R)$(CH)-TRC2-DroppedArrays_RBV</pv_name>
-    <x>747</x>
-    <y>800</y>
-    <width>74</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)TRC2-DroppedArrays_RBV</pv_name>
+    <x>900</x>
+    <y>1100</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -775,9 +835,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_165</name>
     <text>Dropped</text>
-    <x>746</x>
-    <y>774</y>
-    <width>72</width>
+    <x>900</x>
+    <y>1070</y>
+    <width>90</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -799,9 +860,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_166</name>
     <text>Sample number:</text>
-    <x>54</x>
-    <y>210</y>
-    <width>119</width>
+    <x>60</x>
+    <y>180</y>
+    <width>140</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -822,16 +884,16 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="xyplot" version="2.0.0">
     <name>XY Graph_3</name>
-    <x>1340</x>
-    <y>450</y>
-    <width>522</width>
-    <height>283</height>
+    <x>1580</x>
+    <y>610</y>
+    <width>520</width>
+    <height>430</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <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>
@@ -879,13 +941,13 @@ $(pv_value)</tooltip>
         <exp bool_exp="pv0==0">
           <expression>"ADC counts"</expression>
         </exp>
-        <pv_name>$(P)$(R)$(CH)-PROC1-EnableOffsetScale_RBV</pv_name>
+        <pv_name>$(P)$(R)PROC1-EnableOffsetScale_RBV</pv_name>
       </rule>
       <rule name="trace1_buffer_size" prop_id="trace_0_buffer_size" out_exp="true">
         <exp bool_exp="true">
           <expression>pv0</expression>
         </exp>
-        <pv_name>$(P)$(R)$(CH)-STAT3-TSTimestamp.NELM</pv_name>
+        <pv_name>$(P)$(R)STAT3-TSTimestamp.NELM</pv_name>
       </rule>
     </rules>
     <x_axis>
@@ -896,7 +958,7 @@ $(pv_value)</tooltip>
       <maximum>1000.0</maximum>
       <show_grid>true</show_grid>
       <title_font>
-        <font family="Arial" style="BOLD" size="8.910891089108912">
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
         </font>
       </title_font>
       <scale_font>
@@ -914,7 +976,7 @@ $(pv_value)</tooltip>
         <maximum>60000.0</maximum>
         <show_grid>true</show_grid>
         <title_font>
-          <font family="Arial" style="BOLD" size="8.910891089108912">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
@@ -927,8 +989,8 @@ $(pv_value)</tooltip>
     <traces>
       <trace>
         <name>Mean</name>
-        <x_pv>$(P)$(R)$(CH)-STAT3-TSTimestamp</x_pv>
-        <y_pv>$(P)$(R)$(CH)-STAT3-TSMeanValue</y_pv>
+        <x_pv>$(P)$(R)STAT3-TSTimestamp</x_pv>
+        <y_pv>$(P)$(R)STAT3-TSMeanValue</y_pv>
         <err_pv></err_pv>
         <axis>0</axis>
         <trace_type>1</trace_type>
@@ -944,8 +1006,8 @@ $(pv_value)</tooltip>
       </trace>
       <trace>
         <name>Max</name>
-        <x_pv>$(P)$(R)$(CH)-STAT3-TSTimestamp</x_pv>
-        <y_pv>$(P)$(R)$(CH)-STAT3-TSMaxValue</y_pv>
+        <x_pv>$(P)$(R)STAT3-TSTimestamp</x_pv>
+        <y_pv>$(P)$(R)STAT3-TSMaxValue</y_pv>
         <err_pv></err_pv>
         <axis>0</axis>
         <trace_type>1</trace_type>
@@ -961,8 +1023,8 @@ $(pv_value)</tooltip>
       </trace>
       <trace>
         <name>Min</name>
-        <x_pv>$(P)$(R)$(CH)-STAT3-TSTimestamp</x_pv>
-        <y_pv>$(P)$(R)$(CH)-STAT3-TSMinValue</y_pv>
+        <x_pv>$(P)$(R)STAT3-TSTimestamp</x_pv>
+        <y_pv>$(P)$(R)STAT3-TSMinValue</y_pv>
         <err_pv></err_pv>
         <axis>0</axis>
         <trace_type>1</trace_type>
@@ -980,18 +1042,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_71</name>
-    <pv_name>$(P)$(R)$(CH)-ROI3-TickFirstUsR</pv_name>
-    <x>738</x>
-    <y>590</y>
-    <width>94</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI3-TickFirstUsR</pv_name>
+    <x>900</x>
+    <y>820</y>
+    <width>90</width>
+    <height>30</height>
     <format>1</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -1005,18 +1060,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_73</name>
-    <pv_name>$(P)$(R)$(CH)-STAT3-TS-TSCurrentPoint</pv_name>
-    <x>1762</x>
-    <y>768</y>
-    <width>86</width>
+    <pv_name>$(P)$(R)STAT3-TS-TSCurrentPoint</pv_name>
+    <x>2010</x>
+    <y>1100</y>
+    <width>90</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <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>
@@ -1029,10 +1081,10 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_206</name>
-    <text>Current Point</text>
-    <x>1657</x>
-    <y>770</y>
-    <width>91</width>
+    <text>Current Point:</text>
+    <x>1900</x>
+    <y>1100</y>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -1041,7 +1093,7 @@ $(pv_value)</tooltip>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1055,9 +1107,9 @@ $(pv_value)</tooltip>
     <name>Check Box</name>
     <pv_name>loc://Min(1)</pv_name>
     <label>Min</label>
-    <x>1701</x>
-    <y>819</y>
-    <width>68</width>
+    <x>1945</x>
+    <y>1140</y>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -1069,9 +1121,9 @@ $(pv_value)</tooltip>
     <name>Check Box_1</name>
     <pv_name>loc://Mean(1)</pv_name>
     <label>Average</label>
-    <x>1610</x>
-    <y>819</y>
-    <width>77</width>
+    <x>1845</x>
+    <y>1140</y>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -1083,9 +1135,9 @@ $(pv_value)</tooltip>
     <name>Check Box_2</name>
     <pv_name>loc://Max(1)</pv_name>
     <label>Max</label>
-    <x>1532</x>
-    <y>819</y>
-    <width>68</width>
+    <x>1770</x>
+    <y>1140</y>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -1095,10 +1147,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_207</name>
-    <text>Trace visibility</text>
-    <x>1415</x>
-    <y>819</y>
+    <text>Trace visibility:</text>
+    <x>1650</x>
+    <y>1140</y>
     <width>105</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -1119,18 +1172,15 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_74</name>
-    <pv_name>$(P)$(R)$(CH)-STAT3-TS-TSAcquiring</pv_name>
-    <x>1541</x>
-    <y>770</y>
-    <width>86</width>
+    <pv_name>$(P)$(R)STAT3-TS-TSAcquiring</pv_name>
+    <x>1780</x>
+    <y>1100</y>
+    <width>90</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <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>
@@ -1144,9 +1194,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_258</name>
     <text>Binning:</text>
-    <x>412</x>
-    <y>680</y>
-    <width>98</width>
+    <x>600</x>
+    <y>940</y>
+    <width>80</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -1167,18 +1218,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_81</name>
-    <pv_name>$(P)$(R)$(CH)-ROI3-BinX_RBV</pv_name>
-    <x>650</x>
-    <y>681</y>
-    <width>70</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI3-BinX_RBV</pv_name>
+    <x>800</x>
+    <y>940</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1191,18 +1235,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_82</name>
-    <pv_name>$(P)$(R)$(CH)-ROI3-BinXTimeUsR</pv_name>
-    <x>738</x>
-    <y>681</y>
-    <width>94</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI3-BinXTimeUsR</pv_name>
+    <x>900</x>
+    <y>940</y>
+    <width>90</width>
+    <height>30</height>
     <format>1</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -1217,9 +1254,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_259</name>
     <text>Total:</text>
-    <x>410</x>
-    <y>710</y>
-    <width>98</width>
+    <x>600</x>
+    <y>980</y>
+    <width>80</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -1240,18 +1278,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_83</name>
-    <pv_name>$(P)$(R)$(CH)-ROI3-ArraySizeX_RBV</pv_name>
-    <x>650</x>
-    <y>713</y>
-    <width>70</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI3-ArraySizeX_RBV</pv_name>
+    <x>800</x>
+    <y>980</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1270,20 +1301,15 @@ $(pv_value)</tooltip>
         <value>1</value>
       </action>
     </actions>
-    <pv_name>$(P)$(R)$(CH)-STAT3-TS-TSAcquire</pv_name>
+    <pv_name>$(P)$(R)STAT3-TS-TSAcquire</pv_name>
     <text>(Re)start</text>
-    <x>1343</x>
-    <y>768</y>
-    <width>79</width>
-    <height>24</height>
+    <x>1580</x>
+    <y>1100</y>
+    <width>90</width>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_35</name>
@@ -1293,33 +1319,28 @@ $(pv_value)</tooltip>
         <value>0</value>
       </action>
     </actions>
-    <pv_name>$(P)$(R)$(CH)-STAT3-TS-TSAcquire</pv_name>
+    <pv_name>$(P)$(R)STAT3-TS-TSAcquire</pv_name>
     <text>Stop</text>
-    <x>1438</x>
-    <y>768</y>
-    <width>79</width>
-    <height>24</height>
+    <x>1680</x>
+    <y>1100</y>
+    <width>90</width>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
   </widget>
   <widget type="xyplot" version="2.0.0">
     <name>XY Graph_4</name>
-    <x>1340</x>
-    <y>74</y>
-    <width>514</width>
-    <height>355</height>
+    <x>1580</x>
+    <y>110</y>
+    <width>520</width>
+    <height>440</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <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>
@@ -1334,19 +1355,19 @@ $(pv_value)</tooltip>
         <exp bool_exp="true">
           <expression>pv0</expression>
         </exp>
-        <pv_name>$(P)$(R)$(CH)-TRC3-ArraySize0_RBV</pv_name>
+        <pv_name>$(P)$(R)TRC3-ArraySize0_RBV</pv_name>
       </rule>
       <rule name="data_y_max" prop_id="axis_1_maximum" out_exp="true">
         <exp bool_exp="true">
           <expression>pv0</expression>
         </exp>
-        <pv_name>$(P)$(R)$(CH)-TRC3-ArraySize1_RBV</pv_name>
+        <pv_name>$(P)$(R)TRC3-ArraySize1_RBV</pv_name>
       </rule>
       <rule name="data_x_max" prop_id="axis_0_maximum" out_exp="true">
         <exp bool_exp="true">
           <expression>pv0</expression>
         </exp>
-        <pv_name>$(P)$(R)$(CH)-ROI3-ArraySizeX_RBV</pv_name>
+        <pv_name>$(P)$(R)ROI3-ArraySizeX_RBV</pv_name>
       </rule>
       <rule name="Y title" prop_id="axis_1_axis_title" out_exp="true">
         <exp bool_exp="pv0==1">
@@ -1355,7 +1376,7 @@ $(pv_value)</tooltip>
         <exp bool_exp="pv0==0">
           <expression>"ADC counts"</expression>
         </exp>
-        <pv_name>$(P)$(R)$(CH)-PROC1-EnableOffsetScale_RBV</pv_name>
+        <pv_name>$(P)$(R)PROC1-EnableOffsetScale_RBV</pv_name>
       </rule>
     </rules>
     <x_axis>
@@ -1397,8 +1418,8 @@ $(pv_value)</tooltip>
     <traces>
       <trace>
         <name>Flat top</name>
-        <x_pv>$(P)$(R)$(CH)-TRC3-ArrayTimeUs</x_pv>
-        <y_pv>$(P)$(R)$(CH)-TRC3-ArrayData</y_pv>
+        <x_pv>$(P)$(R)TRC3-ArrayTimeUs</x_pv>
+        <y_pv>$(P)$(R)TRC3-ArrayData</y_pv>
         <err_pv></err_pv>
         <axis>0</axis>
         <trace_type>1</trace_type>
@@ -1417,9 +1438,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_298</name>
     <text>Size:</text>
-    <x>410</x>
-    <y>621</y>
-    <width>98</width>
+    <x>600</x>
+    <y>860</y>
+    <width>80</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -1440,18 +1462,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_91</name>
-    <pv_name>$(P)$(R)$(CH)-ROI3-SizeX_RBV</pv_name>
-    <x>650</x>
-    <y>623</y>
-    <width>70</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI3-SizeX_RBV</pv_name>
+    <x>800</x>
+    <y>860</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1464,18 +1479,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_92</name>
-    <pv_name>$(P)$(R)$(CH)-ROI3-TickCountUsR</pv_name>
-    <x>738</x>
-    <y>623</y>
-    <width>94</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI3-TickCountUsR</pv_name>
+    <x>900</x>
+    <y>860</y>
+    <width>90</width>
+    <height>30</height>
     <format>1</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -1489,18 +1497,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_93</name>
-    <pv_name>$(P)$(R)$(CH)-ROI3-TotalXTimeUsR</pv_name>
-    <x>738</x>
-    <y>713</y>
-    <width>94</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI3-TotalXTimeUsR</pv_name>
+    <x>900</x>
+    <y>980</y>
+    <width>90</width>
+    <height>30</height>
     <format>1</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -1515,9 +1516,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_306</name>
     <text>Sample no.</text>
-    <x>531</x>
-    <y>558</y>
-    <width>174</width>
+    <x>690</x>
+    <y>780</y>
+    <width>200</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -1539,9 +1541,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_308</name>
     <text>Time</text>
-    <x>738</x>
-    <y>558</y>
-    <width>93</width>
+    <x>900</x>
+    <y>780</y>
+    <width>90</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -1563,9 +1566,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_309</name>
     <text>End:</text>
-    <x>411</x>
-    <y>651</y>
-    <width>98</width>
+    <x>600</x>
+    <y>900</y>
+    <width>80</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -1586,18 +1590,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_94</name>
-    <pv_name>$(P)$(R)$(CH)-ROI3-EndXR</pv_name>
-    <x>650</x>
-    <y>653</y>
-    <width>70</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI3-EndXR</pv_name>
+    <x>800</x>
+    <y>900</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1610,18 +1607,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_95</name>
-    <pv_name>$(P)$(R)$(CH)-ROI3-TickLastUsR</pv_name>
-    <x>738</x>
-    <y>653</y>
-    <width>94</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI3-TickLastUsR</pv_name>
+    <x>900</x>
+    <y>900</y>
+    <width>90</width>
+    <height>30</height>
     <format>1</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -1635,18 +1625,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_96</name>
-    <pv_name>$(P)$(R)$(CH)-PulseChargeUcR</pv_name>
-    <x>199</x>
-    <y>568</y>
-    <width>128</width>
-    <foreground_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)PulseChargeUcR</pv_name>
+    <x>260</x>
+    <y>860</y>
+    <width>240</width>
+    <height>30</height>
     <format>1</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -1660,18 +1643,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_97</name>
-    <pv_name>$(P)$(R)$(CH)-STAT3-MinValueR</pv_name>
-    <x>199</x>
-    <y>774</y>
-    <width>128</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)STAT3-MinValueR</pv_name>
+    <x>260</x>
+    <y>1140</y>
+    <width>240</width>
+    <height>30</height>
     <format>1</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -1680,7 +1656,7 @@ $(pv_value)</tooltip>
     </actions>
     <scripts>
       <script file="change_stats_units.js">
-        <pv_name>$(P)$(R)$(CH)-PROC1-EnableOffsetScale_RBV</pv_name>
+        <pv_name>$(P)$(R)PROC1-EnableOffsetScale_RBV</pv_name>
         <pv_name trigger="false">$(pv_name).EGU</pv_name>
       </script>
     </scripts>
@@ -1692,9 +1668,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_311</name>
     <text>Maximum:</text>
-    <x>80</x>
-    <y>720</y>
-    <width>72</width>
+    <x>60</x>
+    <y>1060</y>
+    <width>120</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -1715,18 +1692,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_98</name>
-    <pv_name>$(P)$(R)$(CH)-STAT3-MeanValueR</pv_name>
-    <x>199</x>
-    <y>746</y>
-    <width>128</width>
-    <foreground_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)STAT3-MeanValueR</pv_name>
+    <x>260</x>
+    <y>1100</y>
+    <width>240</width>
+    <height>30</height>
     <format>1</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -1735,7 +1705,7 @@ $(pv_value)</tooltip>
     </actions>
     <scripts>
       <script file="change_stats_units.js">
-        <pv_name>$(P)$(R)$(CH)-PROC1-EnableOffsetScale_RBV</pv_name>
+        <pv_name>$(P)$(R)PROC1-EnableOffsetScale_RBV</pv_name>
         <pv_name trigger="false">$(pv_name).EGU</pv_name>
       </script>
     </scripts>
@@ -1747,9 +1717,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_312</name>
     <text>Average:</text>
-    <x>86</x>
-    <y>746</y>
-    <width>72</width>
+    <x>60</x>
+    <y>1100</y>
+    <width>120</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -1758,7 +1729,7 @@ $(pv_value)</tooltip>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1770,18 +1741,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_99</name>
-    <pv_name>$(P)$(R)$(CH)-STAT3-MaxValueR</pv_name>
-    <x>199</x>
-    <y>720</y>
-    <width>128</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)STAT3-MaxValueR</pv_name>
+    <x>260</x>
+    <y>1060</y>
+    <width>240</width>
+    <height>30</height>
     <format>1</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -1790,7 +1754,7 @@ $(pv_value)</tooltip>
     </actions>
     <scripts>
       <script file="change_stats_units.js">
-        <pv_name>$(P)$(R)$(CH)-PROC1-EnableOffsetScale_RBV</pv_name>
+        <pv_name>$(P)$(R)PROC1-EnableOffsetScale_RBV</pv_name>
         <pv_name trigger="false">$(pv_name).EGU</pv_name>
       </script>
     </scripts>
@@ -1802,9 +1766,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_313</name>
     <text>Minimum:</text>
-    <x>79</x>
-    <y>774</y>
-    <width>72</width>
+    <x>60</x>
+    <y>1140</y>
+    <width>120</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -1813,7 +1778,7 @@ $(pv_value)</tooltip>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1825,18 +1790,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_101</name>
-    <pv_name>$(P)$(R)$(CH)-FlatTopChargeUcR</pv_name>
-    <x>199</x>
-    <y>605</y>
-    <width>128</width>
-    <foreground_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)FlatTopChargeUcR</pv_name>
+    <x>260</x>
+    <y>900</y>
+    <width>240</width>
+    <height>30</height>
     <format>1</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -1850,18 +1808,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_102</name>
-    <pv_name>$(P)$(R)$(CH)-ROI2-MinX_RBV</pv_name>
-    <x>1093</x>
-    <y>589</y>
-    <width>70</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI2-MinX_RBV</pv_name>
+    <x>1290</x>
+    <y>820</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1874,18 +1825,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_103</name>
-    <pv_name>$(P)$(R)$(CH)-ROI2-TickFirstUsR</pv_name>
-    <x>1176</x>
-    <y>589</y>
-    <width>94</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI2-TickFirstUsR</pv_name>
+    <x>1390</x>
+    <y>820</y>
+    <width>90</width>
+    <height>30</height>
     <format>1</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -1899,18 +1843,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_104</name>
-    <pv_name>$(P)$(R)$(CH)-ROI2-BinX_RBV</pv_name>
-    <x>1092</x>
-    <y>680</y>
-    <width>70</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI2-BinX_RBV</pv_name>
+    <x>1290</x>
+    <y>940</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1923,18 +1860,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_105</name>
-    <pv_name>$(P)$(R)$(CH)-ROI2-BinXTimeUsR</pv_name>
-    <x>1176</x>
-    <y>680</y>
-    <width>94</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI2-BinXTimeUsR</pv_name>
+    <x>1390</x>
+    <y>940</y>
+    <width>90</width>
+    <height>30</height>
     <format>1</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -1948,18 +1878,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_106</name>
-    <pv_name>$(P)$(R)$(CH)-ROI2-ArraySizeX_RBV</pv_name>
-    <x>1092</x>
-    <y>710</y>
-    <width>70</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI2-ArraySizeX_RBV</pv_name>
+    <x>1290</x>
+    <y>980</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1972,18 +1895,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_107</name>
-    <pv_name>$(P)$(R)$(CH)-ROI2-SizeX_RBV</pv_name>
-    <x>1093</x>
-    <y>618</y>
-    <width>70</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI2-SizeX_RBV</pv_name>
+    <x>1290</x>
+    <y>860</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1996,18 +1912,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_108</name>
-    <pv_name>$(P)$(R)$(CH)-ROI2-TickCountUsR</pv_name>
-    <x>1176</x>
-    <y>618</y>
-    <width>94</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI2-TickCountUsR</pv_name>
+    <x>1390</x>
+    <y>860</y>
+    <width>90</width>
+    <height>30</height>
     <format>1</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -2021,18 +1930,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_109</name>
-    <pv_name>$(P)$(R)$(CH)-ROI2-TotalXTimeUsR</pv_name>
-    <x>1176</x>
-    <y>710</y>
-    <width>94</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI2-TotalXTimeUsR</pv_name>
+    <x>1390</x>
+    <y>980</y>
+    <width>90</width>
+    <height>30</height>
     <format>1</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -2046,18 +1948,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_110</name>
-    <pv_name>$(P)$(R)$(CH)-ROI2-EndXR</pv_name>
-    <x>1092</x>
-    <y>648</y>
-    <width>70</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI2-EndXR</pv_name>
+    <x>1290</x>
+    <y>900</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2070,18 +1965,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_111</name>
-    <pv_name>$(P)$(R)$(CH)-ROI2-TickLastUsR</pv_name>
-    <x>1176</x>
-    <y>648</y>
-    <width>94</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)ROI2-TickLastUsR</pv_name>
+    <x>1390</x>
+    <y>900</y>
+    <width>90</width>
+    <height>30</height>
     <format>1</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -2099,24 +1987,19 @@ $(pv_value)</tooltip>
       <action type="open_display">
         <file>../adcore/NDROI.opi</file>
         <macros>
-          <R>$(CH)-ROI2-</R>
+          <R>ROI2-</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
     <text>ROI 2</text>
-    <x>462</x>
-    <y>838</y>
-    <width>77</width>
-    <height>20</height>
+    <x>600</x>
+    <y>1140</y>
+    <width>90</width>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -2125,24 +2008,19 @@ $(pv_value)</tooltip>
       <action type="open_display">
         <file>../admisc/NDTrace.opi</file>
         <macros>
-          <R>$(CH)-TRC2-</R>
+          <R>TRC2-</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
     <text>Trace 2</text>
-    <x>651</x>
-    <y>838</y>
-    <width>77</width>
-    <height>20</height>
+    <x>800</x>
+    <y>1140</y>
+    <width>90</width>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -2151,51 +2029,20 @@ $(pv_value)</tooltip>
       <action type="open_display">
         <file>../admisc/NDStats.opi</file>
         <macros>
-          <R>$(CH)-STAT3-</R>
-          <S>$(CH)-TS3-</S>
+          <R>STAT3-</R>
+          <S>TS3-</S>
         </macros>
         <target>tab</target>
       </action>
     </actions>
     <text>Statistics 3</text>
-    <x>1136</x>
-    <y>838</y>
-    <width>77</width>
-    <height>20</height>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <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_52</name>
-    <actions>
-      <action type="open_display">
-        <file>../adcore/NDPluginTimeSeries.opi</file>
-        <macros>
-          <R>$(CH)-STAT3-TS-</R>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>Trends 3</text>
-    <x>1226</x>
-    <y>838</y>
-    <width>77</width>
-    <height>20</height>
+    <x>1390</x>
+    <y>1140</y>
+    <width>90</width>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -2204,24 +2051,19 @@ $(pv_value)</tooltip>
       <action type="open_display">
         <file>../admisc/NDProcess.opi</file>
         <macros>
-          <R>$(CH)-PROC2-</R>
+          <R>PROC2-</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
     <text>Process 2</text>
-    <x>556</x>
-    <y>838</y>
-    <width>77</width>
-    <height>20</height>
+    <x>700</x>
+    <y>1140</y>
+    <width>90</width>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -2230,24 +2072,15 @@ $(pv_value)</tooltip>
       <action type="open_display">
         <file>../adcore/NDCircularBuff.opi</file>
         <macros>
-          <R>$(CH)-CB1-</R>
+          <R>CB1-</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
     <text>Circ Buff 1</text>
-    <x>197</x>
-    <y>420</y>
-    <width>79</width>
-    <height>20</height>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>260</x>
+    <y>380</y>
+    <width>240</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -2256,24 +2089,19 @@ $(pv_value)</tooltip>
       <action type="open_display">
         <file>../adcore/NDROI.opi</file>
         <macros>
-          <R>$(CH)-ROI3-</R>
+          <R>ROI3-</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
     <text>ROI 3</text>
-    <x>875</x>
-    <y>838</y>
-    <width>77</width>
-    <height>20</height>
+    <x>1090</x>
+    <y>1140</y>
+    <width>90</width>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -2282,24 +2110,19 @@ $(pv_value)</tooltip>
       <action type="open_display">
         <file>../admisc/NDTrace.opi</file>
         <macros>
-          <R>$(CH)-TRC3-</R>
+          <R>TRC3-</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
     <text>Trace 3</text>
-    <x>1049</x>
-    <y>838</y>
-    <width>77</width>
-    <height>20</height>
+    <x>1290</x>
+    <y>1140</y>
+    <width>90</width>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -2308,24 +2131,19 @@ $(pv_value)</tooltip>
       <action type="open_display">
         <file>../admisc/NDProcess.opi</file>
         <macros>
-          <R>$(CH)-PROC3-</R>
+          <R>PROC3-</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
     <text>Process 3</text>
-    <x>962</x>
-    <y>838</y>
-    <width>77</width>
-    <height>20</height>
+    <x>1190</x>
+    <y>1140</y>
+    <width>90</width>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -2334,24 +2152,15 @@ $(pv_value)</tooltip>
       <action type="open_display">
         <file>../admisc/NDTrace.opi</file>
         <macros>
-          <R>$(CH)-TRC1-</R>
+          <R>TRC1-</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
     <text>Trace 1</text>
-    <x>197</x>
-    <y>390</y>
-    <width>79</width>
-    <height>20</height>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>260</x>
+    <y>340</y>
+    <width>240</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -2360,32 +2169,24 @@ $(pv_value)</tooltip>
       <action type="open_display">
         <file>../admisc/NDProcess.opi</file>
         <macros>
-          <R>$(CH)-PROC1-</R>
+          <R>PROC1-</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
     <text>Process 1</text>
-    <x>197</x>
-    <y>345</y>
-    <width>79</width>
-    <height>20</height>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>260</x>
+    <y>300</y>
+    <width>240</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_327</name>
     <text>Debug:</text>
-    <x>92</x>
-    <y>390</y>
-    <width>104</width>
+    <x>60</x>
+    <y>340</y>
+    <width>140</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -2394,7 +2195,7 @@ $(pv_value)</tooltip>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2410,42 +2211,25 @@ $(pv_value)</tooltip>
       <action type="open_display">
         <file>../adcore/NDFileHDF5.opi</file>
         <macros>
-          <R>$(CH)-HDF1-</R>
+          <R>HDF1-</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
     <text>HDF5 1</text>
-    <x>197</x>
-    <y>450</y>
-    <width>79</width>
-    <height>20</height>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>260</x>
+    <y>420</y>
+    <width>240</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="spinner" version="2.0.0">
     <name>Spinner_5</name>
-    <pv_name>$(P)$(R)$(CH)-ROI3-MinX</pv_name>
-    <x>525</x>
-    <y>590</y>
-    <width>99</width>
+    <pv_name>$(P)$(R)ROI3-MinX</pv_name>
+    <x>690</x>
+    <y>820</y>
+    <height>30</height>
     <format>0</format>
     <precision>3</precision>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <actions>
     </actions>
     <minimum>-1.7976931348623157E308</minimum>
@@ -2453,20 +2237,12 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="spinner" version="2.0.0">
     <name>Spinner_6</name>
-    <pv_name>$(P)$(R)$(CH)-ROI3-SizeX</pv_name>
-    <x>525</x>
-    <y>622</y>
-    <width>99</width>
+    <pv_name>$(P)$(R)ROI3-SizeX</pv_name>
+    <x>690</x>
+    <y>860</y>
+    <height>30</height>
     <format>0</format>
     <precision>3</precision>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <actions>
     </actions>
     <minimum>-1.7976931348623157E308</minimum>
@@ -2474,20 +2250,12 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="spinner" version="2.0.0">
     <name>Spinner_7</name>
-    <pv_name>$(P)$(R)$(CH)-ROI3-BinX</pv_name>
-    <x>525</x>
-    <y>680</y>
-    <width>99</width>
+    <pv_name>$(P)$(R)ROI3-BinX</pv_name>
+    <x>690</x>
+    <y>940</y>
+    <height>30</height>
     <format>0</format>
     <precision>3</precision>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <actions>
     </actions>
     <minimum>-1.7976931348623157E308</minimum>
@@ -2496,20 +2264,12 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="spinner" version="2.0.0">
     <name>Spinner_8</name>
-    <pv_name>$(P)$(R)$(CH)-ROI2-MinX</pv_name>
-    <x>986</x>
-    <y>589</y>
-    <width>99</width>
+    <pv_name>$(P)$(R)ROI2-MinX</pv_name>
+    <x>1180</x>
+    <y>820</y>
+    <height>30</height>
     <format>0</format>
     <precision>3</precision>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <actions>
     </actions>
     <minimum>-1.7976931348623157E308</minimum>
@@ -2517,20 +2277,12 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="spinner" version="2.0.0">
     <name>Spinner_9</name>
-    <pv_name>$(P)$(R)$(CH)-ROI2-SizeX</pv_name>
-    <x>985</x>
-    <y>621</y>
-    <width>99</width>
+    <pv_name>$(P)$(R)ROI2-SizeX</pv_name>
+    <x>1180</x>
+    <y>860</y>
+    <height>30</height>
     <format>0</format>
     <precision>3</precision>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <actions>
     </actions>
     <minimum>-1.7976931348623157E308</minimum>
@@ -2538,20 +2290,12 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="spinner" version="2.0.0">
     <name>Spinner_10</name>
-    <pv_name>$(P)$(R)$(CH)-ROI2-BinX</pv_name>
-    <x>985</x>
-    <y>680</y>
-    <width>99</width>
+    <pv_name>$(P)$(R)ROI2-BinX</pv_name>
+    <x>1180</x>
+    <y>940</y>
+    <height>30</height>
     <format>0</format>
     <precision>3</precision>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <actions>
     </actions>
     <minimum>-1.7976931348623157E308</minimum>
@@ -2564,32 +2308,28 @@ $(pv_value)</tooltip>
       <action type="open_display">
         <file>../admisc/NDStats.opi</file>
         <macros>
-          <R>$(CH)-STAT2-</R>
+          <R>STAT2-</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
     <text>Statistics 2</text>
-    <x>746</x>
-    <y>838</y>
-    <width>77</width>
-    <height>20</height>
+    <x>900</x>
+    <y>1140</y>
+    <width>90</width>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_334</name>
     <text>Channel control:</text>
-    <x>33</x>
-    <y>292</y>
-    <width>141</width>
+    <x>60</x>
+    <y>260</y>
+    <width>140</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -2616,20 +2356,10 @@ $(pv_value)</tooltip>
         <value>1</value>
       </action>
     </actions>
-    <pv_name>$(P)$(R)$(CH)-Control</pv_name>
+    <pv_name>$(P)$(R)Control</pv_name>
     <text>Enable</text>
-    <x>241</x>
-    <y>292</y>
-    <width>61</width>
-    <height>20</height>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>260</x>
+    <y>260</y>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_66</name>
@@ -2639,53 +2369,31 @@ $(pv_value)</tooltip>
         <value>0</value>
       </action>
     </actions>
-    <pv_name>$(P)$(R)$(CH)-Control</pv_name>
+    <pv_name>$(P)$(R)Control</pv_name>
     <text>Disable</text>
-    <x>319</x>
-    <y>292</y>
-    <width>67</width>
-    <height>20</height>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
+    <x>380</x>
+    <y>260</y>
+    <width>120</width>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_2</name>
-    <pv_name>$(P)$(R)$(CH)-ControlR</pv_name>
-    <x>197</x>
-    <y>292</y>
-    <width>21</width>
-    <height>21</height>
+    <pv_name>$(P)$(R)ControlR</pv_name>
+    <x>215</x>
+    <y>265</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
     </off_color>
-    <on_color>
-      <color 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_335</name>
     <text>Common:</text>
-    <x>46</x>
-    <y>344</y>
-    <width>126</width>
+    <x>60</x>
+    <y>300</y>
+    <width>140</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -2706,18 +2414,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_112</name>
-    <pv_name>$(P)$(R)$(CH)-TRC3-ArrayCounter_RBV</pv_name>
-    <x>875</x>
-    <y>800</y>
-    <width>74</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)TRC3-ArrayCounter_RBV</pv_name>
+    <x>1090</x>
+    <y>1100</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2731,9 +2432,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_365</name>
     <text>Counter</text>
-    <x>875</x>
-    <y>774</y>
-    <width>72</width>
+    <x>1090</x>
+    <y>1070</y>
+    <width>90</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -2754,18 +2456,11 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_113</name>
-    <pv_name>$(P)$(R)$(CH)-TRC3-ArrayRate_RBV</pv_name>
-    <x>1050</x>
-    <y>800</y>
-    <width>74</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <pv_name>$(P)$(R)TRC3-ArrayRate_RBV</pv_name>
+    <x>1290</x>
+    <y>1100</y>
+    <width>90</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2779,9 +2474,10 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label_366</name>
     <text>Rate</text>
-    <x>1049</x>
-    <y>774</y>
-    <width>72</width>
+    <x>1290</x>
+    <y>1070</y>
+    <width>90</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -2802,10 +2498,28 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_114</name>
-    <pv_name>$(P)$(R)$(CH)-TRC3-EnableCallbacks_RBV</pv_name>
-    <x>964</x>
-    <y>800</y>
-    <width>74</width>
+    <pv_name>$(P)$(R)TRC3-EnableCallbacks_RBV</pv_name>
+    <x>1190</x>
+    <y>1100</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_367</name>
+    <text>Status</text>
+    <x>1190</x>
+    <y>1070</y>
+    <width>90</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -2824,12 +2538,30 @@ $(pv_value)</tooltip>
       </color>
     </border_color>
   </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_115</name>
+    <pv_name>$(P)$(R)TRC3-DroppedArrays_RBV</pv_name>
+    <x>1390</x>
+    <y>1100</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_367</name>
-    <text>Status</text>
-    <x>962</x>
-    <y>774</y>
-    <width>72</width>
+    <name>Label_368</name>
+    <text>Dropped</text>
+    <x>1390</x>
+    <y>1070</y>
+    <width>90</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -2848,12 +2580,13 @@ $(pv_value)</tooltip>
       </color>
     </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_115</name>
-    <pv_name>$(P)$(R)$(CH)-TRC3-DroppedArrays_RBV</pv_name>
-    <x>1136</x>
-    <y>800</y>
-    <width>74</width>
+  <widget type="label" version="2.0.0">
+    <name>Label_167</name>
+    <text>Pulse charge: </text>
+    <x>60</x>
+    <y>860</y>
+    <width>120</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -2862,7 +2595,7 @@ $(pv_value)</tooltip>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2873,11 +2606,12 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_368</name>
-    <text>Dropped</text>
-    <x>1136</x>
-    <y>774</y>
-    <width>72</width>
+    <name>Label_168</name>
+    <text>Flat top charge:</text>
+    <x>60</x>
+    <y>900</y>
+    <width>120</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -2886,7 +2620,7 @@ $(pv_value)</tooltip>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2897,103 +2631,83 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <class>GROUP-TITLE</class>
-    <text>General</text>
-    <x>13</x>
-    <y>76</y>
-    <width>406</width>
-    <height use_class="true">30</height>
+    <name>Label_175</name>
+    <class>TITLE</class>
+    <text>$(TITLE) : $(P)$(R)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1840</width>
+    <height use_class="true">50</height>
     <font use_class="true">
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
     <foreground_color use_class="true">
-      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment use_class="true">1</horizontal_alignment>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
     <vertical_alignment use_class="true">1</vertical_alignment>
     <wrap_words use_class="true">false</wrap_words>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_1</name>
-    <class>GROUP-TITLE</class>
-    <text>General</text>
-    <x>13</x>
-    <y>512</y>
-    <width>406</width>
-    <height use_class="true">30</height>
-    <font use_class="true">
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <foreground_color use_class="true">
-      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+    <name>Label_132</name>
+    <text>Start:</text>
+    <x>1090</x>
+    <y>820</y>
+    <width>80</width>
+    <height>30</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment use_class="true">1</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <wrap_words use_class="true">false</wrap_words>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_5</name>
-    <x>13</x>
-    <y>512</y>
-    <width>406</width>
-    <height>30</height>
-    <line_width>0</line_width>
     <background_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_2</name>
-    <class>GROUP-TITLE</class>
-    <text>Charge</text>
-    <x>13</x>
-    <y>512</y>
-    <width>406</width>
-    <height use_class="true">30</height>
-    <font use_class="true">
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <foreground_color use_class="true">
-      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+    <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>
-    <horizontal_alignment use_class="true">1</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <wrap_words use_class="true">false</wrap_words>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_3</name>
-    <class>GROUP-TITLE</class>
-    <text>Flat top current</text>
-    <x>13</x>
-    <y>673</y>
-    <width>406</width>
-    <height use_class="true">30</height>
-    <font use_class="true">
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <foreground_color use_class="true">
-      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+    <name>Label_299</name>
+    <text>Size:</text>
+    <x>1090</x>
+    <y>860</y>
+    <width>80</width>
+    <height>30</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment use_class="true">1</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <wrap_words use_class="true">false</wrap_words>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <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_167</name>
-    <text>Pulse charge: </text>
-    <x>38</x>
-    <y>568</y>
-    <width>119</width>
+    <name>Label_310</name>
+    <text>End:</text>
+    <x>1090</x>
+    <y>900</y>
+    <width>80</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -3013,11 +2727,12 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_168</name>
-    <text>Flat top charge:</text>
-    <x>38</x>
-    <y>605</y>
-    <width>119</width>
+    <name>Label_314</name>
+    <text>Binning:</text>
+    <x>1090</x>
+    <y>940</y>
+    <width>80</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -3037,71 +2752,37 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_173</name>
-    <class>GROUP-TITLE</class>
-    <text>Flat top ROI (cursors)</text>
-    <x>443</x>
-    <y>515</y>
-    <width>406</width>
-    <height use_class="true">30</height>
-    <font use_class="true">
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <foreground_color use_class="true">
-      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+    <name>Label_315</name>
+    <text>Total:</text>
+    <x>1090</x>
+    <y>980</y>
+    <width>80</width>
+    <height>30</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment use_class="true">1</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <wrap_words use_class="true">false</wrap_words>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_174</name>
-    <class>GROUP-TITLE</class>
-    <text>Pulse ROI (limits)</text>
-    <x>865</x>
-    <y>515</y>
-    <width>443</width>
-    <height use_class="true">30</height>
-    <font use_class="true">
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <foreground_color use_class="true">
-      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+    <background_color>
+      <color red="255" green="255" blue="255">
       </color>
-    </foreground_color>
-    <horizontal_alignment use_class="true">1</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <wrap_words use_class="true">false</wrap_words>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_175</name>
-    <class>GROUP-TITLE</class>
-    <text>$(TITLE) // $(SYSTEM)</text>
-    <x>30</x>
-    <y>10</y>
-    <width>1840</width>
-    <height use_class="true">30</height>
-    <font use_class="true">
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <foreground_color use_class="true">
-      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+    </background_color>
+    <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>
-    <horizontal_alignment use_class="true">1</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <wrap_words use_class="true">false</wrap_words>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_132</name>
-    <text>Start:</text>
-    <x>870</x>
-    <y>591</y>
-    <width>98</width>
+    <name>Label_316</name>
+    <text>Sample no.</text>
+    <x>1180</x>
+    <y>780</y>
+    <width>200</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -3110,7 +2791,7 @@ $(pv_value)</tooltip>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>2</horizontal_alignment>
+    <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -3121,11 +2802,12 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_299</name>
-    <text>Size:</text>
-    <x>870</x>
-    <y>622</y>
-    <width>98</width>
+    <name>Label_317</name>
+    <text>Time</text>
+    <x>1390</x>
+    <y>780</y>
+    <width>90</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -3134,7 +2816,7 @@ $(pv_value)</tooltip>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>2</horizontal_alignment>
+    <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -3145,22 +2827,132 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_310</name>
-    <text>End:</text>
-    <x>871</x>
-    <y>652</y>
-    <width>98</width>
+    <name>BGGrey02-title_23</name>
+    <text>Pulse ROI (limits)</text>
+    <x>1050</x>
+    <y>710</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="action_button" version="3.0.0">
+    <name>Action Button_52</name>
+    <actions>
+      <action type="open_display">
+        <file>../adcore/NDPluginTimeSeries.opi</file>
+        <macros>
+          <R>STAT3-TS-</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Trends 3</text>
+    <x>1420</x>
+    <y>720</y>
+    <width>80</width>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_11</name>
+    <x>20</x>
+    <y>510</y>
+    <width>520</width>
+    <height>260</height>
+    <line_width>0</line_width>
     <background_color>
-      <color red="255" green="255" blue="255">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </background_color>
-    <horizontal_alignment>2</horizontal_alignment>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_22</name>
+    <x>40</x>
+    <y>560</y>
+    <width>480</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_25</name>
+    <text>Acquisition</text>
+    <x>20</x>
+    <y>510</y>
+    <width>520</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <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)Acquire</pv_name>
+    <text>Start</text>
+    <x>260</x>
+    <y>620</y>
+    <width>110</width>
+  </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>
+    </actions>
+    <pv_name>$(P)$(R)Acquire</pv_name>
+    <text>Stop</text>
+    <x>390</x>
+    <y>620</y>
+    <width>110</width>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_69</name>
+    <pv_name>$(P)$(R)MessageR</pv_name>
+    <x>260</x>
+    <y>700</y>
+    <width>240</width>
+    <height>30</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <format>6</format>
     <actions>
     </actions>
     <border_color>
@@ -3169,11 +2961,12 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_314</name>
-    <text>Binning:</text>
-    <x>872</x>
-    <y>681</y>
-    <width>98</width>
+    <name>Label_271</name>
+    <text>Acquisition control:</text>
+    <x>60</x>
+    <y>620</y>
+    <width>140</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -3193,11 +2986,12 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_315</name>
-    <text>Total:</text>
-    <x>870</x>
-    <y>711</y>
-    <width>98</width>
+    <name>Label_273</name>
+    <text>Acquisition status:</text>
+    <x>60</x>
+    <y>700</y>
+    <width>140</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -3216,12 +3010,30 @@ $(pv_value)</tooltip>
       </color>
     </border_color>
   </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_47</name>
+    <actions>
+      <action type="open_display">
+        <file>../adsis8300/system_top.bob</file>
+        <macros>
+          <Name>FC</Name>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>System</text>
+    <x>260</x>
+    <y>660</y>
+    <width>110</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_316</name>
-    <text>Sample no.</text>
-    <x>991</x>
-    <y>559</y>
-    <width>174</width>
+    <name>Label_307</name>
+    <text>System settings:</text>
+    <x>60</x>
+    <y>660</y>
+    <width>140</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -3230,7 +3042,54 @@ $(pv_value)</tooltip>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <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="spinner" version="2.0.0">
+    <name>Spinner_4</name>
+    <pv_name>$(P)$(R)NumSamples</pv_name>
+    <x>260</x>
+    <y>180</y>
+    <width>110</width>
+    <height>30</height>
+    <format>0</format>
+    <precision>3</precision>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <actions>
+    </actions>
+    <minimum>-1.7976931348623157E308</minimum>
+    <maximum>1.7976931348623157E308</maximum>
+    <increment>100.0</increment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(P)$(R)Acquire</pv_name>
+    <x>215</x>
+    <y>585</y>
+    <off_color>
+      <color name="IO Background" red="235" green="235" blue="235">
+      </color>
+    </off_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>260</x>
+    <y>580</y>
+    <width>240</width>
+    <height>30</height>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -3241,11 +3100,12 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_317</name>
-    <text>Time</text>
-    <x>1198</x>
-    <y>559</y>
-    <width>93</width>
+    <name>Label_158</name>
+    <text>Status:</text>
+    <x>60</x>
+    <y>580</y>
+    <width>140</width>
+    <height>30</height>
     <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
@@ -3254,7 +3114,7 @@ $(pv_value)</tooltip>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -3264,4 +3124,18 @@ $(pv_value)</tooltip>
       </color>
     </border_color>
   </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>MachineExpert_2</name>
+    <actions>
+      <action type="open_display">
+        <file>../../10-Top/fcioc/top.bob</file>
+        <target>replace</target>
+      </action>
+    </actions>
+    <text>Overview</text>
+    <x>2020</x>
+    <y>10</y>
+    <width>120</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
 </display>
diff --git a/99-Shared/adsis8300fc/fc.bob b/99-Shared/adsis8300fc/fc.bob
deleted file mode 100644
index 7741dcea144498c0af3649bfd679eb980e173976..0000000000000000000000000000000000000000
--- a/99-Shared/adsis8300fc/fc.bob
+++ /dev/null
@@ -1,765 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
-  <name>$(TITLE) : Main</name>
-  <class>TITLE-BAR</class>
-  <height>800</height>
-  <background_color>
-    <color red="240" green="240" blue="240">
-    </color>
-  </background_color>
-  <actions>
-  </actions>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey02-background_1</name>
-    <x>50</x>
-    <y>440</y>
-    <width>680</width>
-    <height>330</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-      </color>
-    </background_color>
-    <corner_height>10</corner_height>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey02-background</name>
-    <x>50</x>
-    <y>90</y>
-    <width>680</width>
-    <height>330</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
-      </color>
-    </line_color>
-    <background_color>
-      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-      </color>
-    </background_color>
-    <corner_height>10</corner_height>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_4</name>
-    <x>50</x>
-    <y>90</y>
-    <width>680</width>
-    <height>30</height>
-    <line_width>0</line_width>
-    <background_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_1</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
-    <width>800</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="action_button" version="3.0.0">
-    <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)Acquire</pv_name>
-    <text>Start</text>
-    <x>272</x>
-    <y>285</y>
-    <width>79</width>
-    <height>20</height>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_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>
-    </actions>
-    <pv_name>$(P)$(R)Acquire</pv_name>
-    <text>Stop</text>
-    <x>391</x>
-    <y>284</y>
-    <width>79</width>
-    <height>20</height>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_2</name>
-    <pv_name>$(P)$(R)Acquire</pv_name>
-    <x>240</x>
-    <y>130</y>
-    <width>21</width>
-    <height>21</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="textupdate" version="2.0.0">
-    <name>Text Update_41</name>
-    <pv_name>$(P)$(R)Acquire_RBV</pv_name>
-    <x>285</x>
-    <y>130</y>
-    <width>259</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
-    <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_45</name>
-    <pv_name>$(P)$(R)NumSamplesR</pv_name>
-    <x>480</x>
-    <y>209</y>
-    <width>208</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <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="spinner" version="2.0.0">
-    <name>Spinner_3</name>
-    <pv_name>$(P)$(R)NumSamples</pv_name>
-    <x>275</x>
-    <y>210</y>
-    <width>180</width>
-    <format>0</format>
-    <precision>3</precision>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <actions>
-    </actions>
-    <minimum>-1.7976931348623157E308</minimum>
-    <maximum>1.7976931348623157E308</maximum>
-    <increment>100.0</increment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_51</name>
-    <pv_name>$(P)$(R)ArrayCounter_RBV</pv_name>
-    <x>275</x>
-    <y>248</y>
-    <width>232</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <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="polyline" version="2.0.0">
-    <name>Polyline</name>
-    <height>100</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="30" green="144" blue="255">
-      </color>
-    </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-  </widget>
-  <widget type="polyline" version="2.0.0">
-    <name>Polyline_1</name>
-    <height>100</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="30" green="144" blue="255">
-      </color>
-    </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_60</name>
-    <pv_name>$(P)$(R)ArrayRate_RBV</pv_name>
-    <x>285</x>
-    <y>165</y>
-    <width>209</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
-    <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_157</name>
-    <text>Rate:</text>
-    <x>165</x>
-    <y>172</y>
-    <width>54</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <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_158</name>
-    <text>Status:</text>
-    <x>99</x>
-    <y>130</y>
-    <width>119</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <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_163</name>
-    <text>Pulse counter:</text>
-    <x>100</x>
-    <y>253</y>
-    <width>119</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <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_166</name>
-    <text>Samples number:</text>
-    <x>100</x>
-    <y>213</y>
-    <width>119</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <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="textupdate" version="2.0.0">
-    <name>Text Update_69</name>
-    <pv_name>$(P)$(R)MessageR</pv_name>
-    <x>272</x>
-    <y>377</y>
-    <width>119</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="BLACK-TEXT" red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <format>6</format>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_271</name>
-    <text>Acquisition control:</text>
-    <x>77</x>
-    <y>292</y>
-    <width>145</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <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_273</name>
-    <text>Acquisition status:</text>
-    <x>60</x>
-    <y>377</y>
-    <width>155</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_47</name>
-    <actions>
-      <action type="open_display">
-        <file>../adsis8300/system.opi</file>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>System</text>
-    <x>273</x>
-    <y>331</y>
-    <width>80</width>
-    <height>20</height>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_307</name>
-    <text>System settings:</text>
-    <x>60</x>
-    <y>332</y>
-    <width>160</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_48</name>
-    <actions>
-      <action type="open_display">
-        <file>channel.opi</file>
-        <macros>
-          <CH>CH1</CH>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>LEBT FC</text>
-    <x>99</x>
-    <y>509</y>
-    <width>152</width>
-    <height>20</height>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <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_49</name>
-    <actions>
-      <action type="open_display">
-        <file>channel.opi</file>
-        <macros>
-          <CH>CH2</CH>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>MEBT FC</text>
-    <x>100</x>
-    <y>561</y>
-    <width>152</width>
-    <height>20</height>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <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>channel.opi</file>
-        <macros>
-          <CH>CH3</CH>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>DTL FC2</text>
-    <x>100</x>
-    <y>609</y>
-    <width>152</width>
-    <height>20</height>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <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>
-      <action type="open_display">
-        <file>channel.opi</file>
-        <macros>
-          <CH>CH4</CH>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>DTL FC4</text>
-    <x>101</x>
-    <y>659</y>
-    <width>151</width>
-    <height>20</height>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_309</name>
-    <text>LEBT-010:PBI-FC-001</text>
-    <x>320</x>
-    <y>514</y>
-    <width>234</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_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="label" version="2.0.0">
-    <name>Label_310</name>
-    <text>MEBT-010:PBI-FC-001</text>
-    <x>320</x>
-    <y>560</y>
-    <width>212</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_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="label" version="2.0.0">
-    <name>Label_311</name>
-    <text>DTL-020:PBI-FC-001</text>
-    <x>320</x>
-    <y>610</y>
-    <width>212</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_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="label" version="2.0.0">
-    <name>Label_312</name>
-    <text>DTL-040:PBI-FC-001</text>
-    <x>320</x>
-    <y>659</y>
-    <width>171</width>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_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="label" version="2.0.0">
-    <name>title</name>
-    <text>$(TITLE) // $(SYSTEM)</text>
-    <x>25</x>
-    <width>775</width>
-    <height>50</height>
-    <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="HEADER-TEXT" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <class>GROUP-TITLE</class>
-    <text>Acquisition</text>
-    <x>50</x>
-    <y>90</y>
-    <width>680</width>
-    <height use_class="true">30</height>
-    <font use_class="true">
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <foreground_color use_class="true">
-      <color name="GROUP-TEXT" red="25" green="25" blue="25">
-      </color>
-    </foreground_color>
-    <horizontal_alignment use_class="true">1</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <wrap_words use_class="true">false</wrap_words>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_5</name>
-    <x>50</x>
-    <y>440</y>
-    <width>680</width>
-    <height>30</height>
-    <line_width>0</line_width>
-    <background_color>
-      <color name="GROUP-BORDER" red="150" green="155" blue="151">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_313</name>
-    <class>GROUP-TITLE</class>
-    <text>Channels</text>
-    <x>50</x>
-    <y>440</y>
-    <width>680</width>
-    <height use_class="true">30</height>
-    <font use_class="true">
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <foreground_color use_class="true">
-      <color name="GROUP-TEXT" red="25" green="25" blue="25">
-      </color>
-    </foreground_color>
-    <horizontal_alignment use_class="true">1</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <wrap_words use_class="true">false</wrap_words>
-  </widget>
-</display>