diff --git a/10-Top/bcmioc/instance.bob b/10-Top/bcmioc/instance.bob
index ed83002bc466bea9a144ddb306704d7c4899254b..2f2cd284e863dbac674a8070308f2f6f63211f9b 100644
--- a/10-Top/bcmioc/instance.bob
+++ b/10-Top/bcmioc/instance.bob
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
+  <name>BCM IOC systems</name>
   <width>320</width>
   <height>640</height>
   <background_color>
diff --git a/10-Top/bcmioc/top.bob b/10-Top/bcmioc/top.bob
index 837df441de2543a59439872db450a08b94dc0210..97bd9379adcbb4d5d7c55c962fabc031ea387688 100644
--- a/10-Top/bcmioc/top.bob
+++ b/10-Top/bcmioc/top.bob
@@ -85,7 +85,7 @@
   <widget type="embedded" version="2.0.0">
     <name>Linking Container</name>
     <class></class>
-    <file>instance.opi</file>
+    <file>instance.bob</file>
     <macros>
       <AMC_NAME>Ctrl-AMC-005</AMC_NAME>
       <CONTROL_GROUP>LAB-BCM08</CONTROL_GROUP>
@@ -114,7 +114,7 @@
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_1</name>
     <class></class>
-    <file>instance.opi</file>
+    <file>instance.bob</file>
     <macros>
       <AMC_NAME>Ctrl-AMC-004</AMC_NAME>
       <CONTROL_GROUP>LAB-BCM09</CONTROL_GROUP>
diff --git a/99-Shared/adsis8300/channel.bob b/99-Shared/adsis8300/channel.bob
index 28f96b4e962ad93ff8bf4d6411159909280ff804..2704377f1480dbd4527aae534d1325af72818285 100644
--- a/99-Shared/adsis8300/channel.bob
+++ b/99-Shared/adsis8300/channel.bob
@@ -1,122 +1,326 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>Channel $(CH)</name>
+  <width>1890</width>
+  <height>1210</height>
   <background_color>
-    <color red="240" green="240" blue="240">
+    <color name="BACKGROUND" red="220" green="225" blue="221">
     </color>
   </background_color>
   <actions>
   </actions>
-  <widget type="led" version="2.0.0">
-    <name>LED</name>
-    <pv_name>$(P)$(R)ControlR</pv_name>
-    <x>404</x>
-    <y>13</y>
-    <width>16</width>
-    <height>16</height>
-    <off_color>
-      <color name="IO Background" red="235" green="235" blue="235">
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_4</name>
+    <x>650</x>
+    <width>1240</width>
+    <height>1210</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
-    </off_color>
-    <foreground_color>
-      <color red="192" green="192" blue="192">
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_3</name>
+    <width>630</width>
+    <height>1210</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
-    </foreground_color>
-    <line_color>
-      <color red="150" green="150" blue="150">
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_9</name>
+    <x>20</x>
+    <y>20</y>
+    <width>590</width>
+    <height>70</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
-    </line_color>
-    <actions>
-    </actions>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button</name>
+  <widget type="xyplot" version="2.0.0">
+    <name>XY Graph</name>
+    <x>670</x>
+    <y>20</y>
+    <width>1200</width>
+    <height>1166</height>
+    <title_font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </title_font>
+    <show_toolbar>true</show_toolbar>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
-      </action>
     </actions>
-    <pv_name>$(P)$(R)Control</pv_name>
-    <text>Enable</text>
-    <x>432</x>
-    <y>11</y>
-    <width>67</width>
-    <height>20</height>
+    <rules>
+      <rule name="buffer_size" prop_id="trace_0_buffer_size" out_exp="true">
+        <exp bool_exp="true">
+          <expression>pv0</expression>
+        </exp>
+        <pv_name>$(P)$(R)TRC1-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)TRC1-ArraySize1_RBV</pv_name>
+      </rule>
+      <rule name="data_x0_max" prop_id="axis_0_maximum" out_exp="true">
+        <exp bool_exp="true">
+          <expression>pv0</expression>
+        </exp>
+        <pv_name>$(P)$(R)TRC1-ArraySize0_RBV</pv_name>
+      </rule>
+    </rules>
+    <x_axis>
+      <title>Samples</title>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+      <minimum>0.0</minimum>
+      <maximum>100.0</maximum>
+      <show_grid>true</show_grid>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+        </font>
+      </scale_font>
+      <visible>true</visible>
+    </x_axis>
+    <y_axes>
+      <y_axis>
+        <title>ADC counts</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </y_axis>
+    </y_axes>
+    <traces>
+      <trace>
+        <name>$(traces[0].y_pv)</name>
+        <x_pv>$(P)$(R)TRC1-ArrayTimeUs</x_pv>
+        <y_pv>$(P)$(R)TRC1-ArrayData</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="21" green="21" blue="196">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>4</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_18</name>
+    <text>Attenuation</text>
+    <y>100</y>
+    <width>630</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_10</name>
+    <x>20</x>
+    <y>150</y>
+    <width>590</width>
+    <height>70</height>
+    <line_width>0</line_width>
     <background_color>
-      <color red="240" green="240" blue="240">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_1</name>
-    <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>0</value>
-      </action>
-    </actions>
-    <pv_name>$(P)$(R)Control</pv_name>
-    <text>Disable</text>
-    <x>504</x>
-    <y>11</y>
-    <width>67</width>
-    <height>20</height>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_19</name>
+    <text>Internal Trigger</text>
+    <y>230</y>
+    <width>630</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_11</name>
+    <x>20</x>
+    <y>280</y>
+    <width>590</width>
+    <height>220</height>
+    <line_width>0</line_width>
     <background_color>
-      <color red="240" green="240" blue="240">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_2</name>
-    <actions>
-      <action type="open_display">
-        <file>../admisc/NDTrace.opi</file>
-        <macros>
-          <R>$(CH)-TRC1-</R>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>More..</text>
-    <x>322</x>
-    <y>246</y>
-    <width>55</width>
-    <height>20</height>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_20</name>
+    <text>RAW data plugins</text>
+    <y>510</y>
+    <width>630</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>20</x>
+    <y>560</y>
+    <width>590</width>
+    <height>120</height>
+    <line_width>0</line_width>
     <background_color>
-      <color red="240" green="240" blue="240">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
-    <tooltip>$(actions)</tooltip>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_1</name>
-    <pv_name>$(P)$(R)Attenuation</pv_name>
-    <x>246</x>
-    <y>78</y>
-    <width>107</width>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_21</name>
+    <text>PROCESSED data plugins</text>
+    <y>690</y>
+    <width>630</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_13</name>
+    <x>20</x>
+    <y>740</y>
+    <width>590</width>
+    <height>270</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_22</name>
+    <text>Trace</text>
+    <y>1020</y>
+    <width>630</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_14</name>
+    <x>20</x>
+    <y>1070</y>
+    <width>590</width>
+    <height>116</height>
+    <line_width>0</line_width>
     <background_color>
-      <color red="255" green="255" blue="255">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_7</name>
+    <pv_name>$(P)$(R)TRC1-TimePerPointMsR</pv_name>
+    <x>400</x>
+    <y>1090</y>
+    <width>190</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
     </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
     <border_color>
       <color red="0" green="128" blue="255">
       </color>
     </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>Text Update_1</name>
-    <pv_name>$(P)$(R)AttenuationR</pv_name>
-    <x>132</x>
-    <y>78</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <name>Text Update_6</name>
+    <pv_name>$(P)$(R)TRC1-TimePerPointLink.DOL</pv_name>
+    <x>190</x>
+    <y>1140</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -127,34 +331,47 @@
       </color>
     </border_color>
   </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_1</name>
-    <pv_name>$(P)$(R)InternalTriggerLength</pv_name>
-    <x>246</x>
-    <y>134</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
+  <widget type="label" version="2.0.0">
+    <name>Label_21</name>
+    <text>Time link</text>
+    <x>40</x>
+    <y>1140</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_20</name>
+    <text>Time point</text>
+    <x>40</x>
+    <y>1090</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
     </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
     <border_color>
       <color red="0" green="128" blue="255">
       </color>
     </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>Text Update_1</name>
-    <pv_name>$(P)$(R)InternalTriggerLengthR</pv_name>
-    <x>132</x>
-    <y>134</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <name>Text Update_5</name>
+    <pv_name>$(P)$(R)TRC1-TimePerPointUsR</pv_name>
+    <x>190</x>
+    <y>1090</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -165,68 +382,109 @@
       </color>
     </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_2</name>
-    <pv_name>$(P)$(R)InternalTriggerConditionR</pv_name>
-    <x>132</x>
-    <y>153</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+  <widget type="label" version="2.0.0">
+    <name>Label_17</name>
+    <text>ROI</text>
+    <x>40</x>
+    <y>960</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
     </actions>
+    <tooltip>Region of interest</tooltip>
     <border_color>
       <color red="0" green="128" blue="255">
       </color>
     </border_color>
   </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Menu Button</name>
-    <pv_name>$(P)$(R)InternalTriggerCondition</pv_name>
-    <x>246</x>
-    <y>153</y>
-    <width>107</width>
-    <height>20</height>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_24</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)ROI2-EnableCallbacks</pv_name>
+    <text>Disable</text>
+    <x>340</x>
+    <y>960</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_2</name>
-    <pv_name>$(P)$(R)InternalTriggerOff</pv_name>
-    <x>246</x>
-    <y>172</y>
-    <width>107</width>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_23</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)ROI2-EnableCallbacks</pv_name>
+    <text>Enable</text>
+    <x>250</x>
+    <y>960</y>
+    <width>70</width>
     <background_color>
-      <color red="255" green="255" blue="255">
+      <color red="240" green="240" blue="240">
       </color>
     </background_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_7</name>
+    <pv_name>$(P)$(R)ROI2-EnableCallbacks_RBV</pv_name>
+    <x>190</x>
+    <y>965</y>
+    <off_color>
+      <color name="IO Background" red="235" green="235" blue="235">
+      </color>
+    </off_color>
+    <foreground_color>
+      <color red="192" green="192" blue="192">
+      </color>
+    </foreground_color>
+    <line_color>
+      <color red="150" green="150" blue="150">
+      </color>
+    </line_color>
     <actions>
     </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_3</name>
-    <pv_name>$(P)$(R)InternalTriggerOffR</pv_name>
-    <x>132</x>
-    <y>172</y>
-    <width>107</width>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_22</name>
+    <actions>
+      <action type="open_display">
+        <file>../adcore/NDROI.opi</file>
+        <macros>
+          <R>$(CH)-ROI2-</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>More..</text>
+    <x>430</x>
+    <y>960</y>
+    <width>70</width>
     <background_color>
-      <color red="255" green="255" blue="255">
+      <color red="240" green="240" blue="240">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_16</name>
+    <text>Statistics</text>
+    <x>40</x>
+    <y>910</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -236,66 +494,90 @@
       </color>
     </border_color>
   </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_3</name>
-    <pv_name>$(P)$(R)InternalTriggerOn</pv_name>
-    <x>246</x>
-    <y>191</y>
-    <width>107</width>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_21</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)STAT2-EnableCallbacks</pv_name>
+    <text>Disable</text>
+    <x>340</x>
+    <y>910</y>
+    <width>70</width>
     <background_color>
-      <color red="255" green="255" blue="255">
+      <color red="240" green="240" blue="240">
       </color>
     </background_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_20</name>
     <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
     </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_4</name>
-    <pv_name>$(P)$(R)InternalTriggerOnR</pv_name>
-    <x>132</x>
-    <y>191</y>
-    <width>107</width>
+    <pv_name>$(P)$(R)STAT2-EnableCallbacks</pv_name>
+    <text>Enable</text>
+    <x>250</x>
+    <y>910</y>
+    <width>70</width>
     <background_color>
-      <color red="255" green="255" blue="255">
+      <color red="240" green="240" blue="240">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_6</name>
+    <pv_name>$(P)$(R)STAT2-EnableCallbacks_RBV</pv_name>
+    <x>190</x>
+    <y>915</y>
+    <off_color>
+      <color name="IO Background" red="235" green="235" blue="235">
+      </color>
+    </off_color>
+    <foreground_color>
+      <color red="192" green="192" blue="192">
+      </color>
+    </foreground_color>
+    <line_color>
+      <color red="150" green="150" blue="150">
+      </color>
+    </line_color>
     <actions>
     </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_211</name>
-    <text>Channel name</text>
-    <x>15</x>
-    <y>12</y>
-    <width>102</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_19</name>
     <actions>
+      <action type="open_display">
+        <file>../adcore/NDStats.opi</file>
+        <macros>
+          <R>$(CH)-STAT2-</R>
+        </macros>
+        <target>tab</target>
+      </action>
     </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <text>More..</text>
+    <x>430</x>
+    <y>910</y>
+    <width>70</width>
+    <background_color>
+      <color red="240" green="240" blue="240">
       </color>
-    </border_color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_2</name>
-    <text>Attenuation</text>
-    <x>15</x>
-    <y>78</y>
-    <width>102</width>
+    <name>Label_15</name>
+    <text>Processing</text>
+    <x>40</x>
+    <y>860</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -306,69 +588,90 @@
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_3</name>
-    <text>Internal trigger</text>
-    <x>15</x>
-    <y>108</y>
-    <width>368</width>
-    <font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-      </font>
-    </font>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_18</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)PROC2-EnableCallbacks</pv_name>
+    <text>Disable</text>
+    <x>340</x>
+    <y>860</y>
+    <width>70</width>
     <background_color>
-      <color name="IO Focus Entry" red="198" green="217" blue="241">
+      <color red="240" green="240" blue="240">
       </color>
     </background_color>
-    <transparent>false</transparent>
-    <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_17</name>
     <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
     </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <pv_name>$(P)$(R)PROC2-EnableCallbacks</pv_name>
+    <text>Enable</text>
+    <x>250</x>
+    <y>860</y>
+    <width>70</width>
+    <background_color>
+      <color red="240" green="240" blue="240">
       </color>
-    </border_color>
+    </background_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_4</name>
-    <text>Length</text>
-    <x>15</x>
-    <y>134</y>
-    <width>102</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+  <widget type="led" version="2.0.0">
+    <name>LED_5</name>
+    <pv_name>$(P)$(R)PROC2-EnableCallbacks_RBV</pv_name>
+    <x>190</x>
+    <y>865</y>
+    <off_color>
+      <color name="IO Background" red="235" green="235" blue="235">
+      </color>
+    </off_color>
+    <foreground_color>
+      <color red="192" green="192" blue="192">
+      </color>
+    </foreground_color>
+    <line_color>
+      <color red="150" green="150" blue="150">
+      </color>
+    </line_color>
     <actions>
     </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_5</name>
-    <text>Condition</text>
-    <x>15</x>
-    <y>153</y>
-    <width>102</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_16</name>
     <actions>
+      <action type="open_display">
+        <file>../adcore/NDProcess.opi</file>
+        <macros>
+          <R>$(CH)-PROC2-</R>
+        </macros>
+        <target>tab</target>
+      </action>
     </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <text>More..</text>
+    <x>430</x>
+    <y>860</y>
+    <width>70</width>
+    <background_color>
+      <color red="240" green="240" blue="240">
       </color>
-    </border_color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_6</name>
-    <text>Off threshold</text>
-    <x>15</x>
-    <y>172</y>
-    <width>102</width>
+    <name>Label_14</name>
+    <text>HDF5</text>
+    <x>40</x>
+    <y>810</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -380,11 +683,12 @@
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_7</name>
-    <text>On threshold</text>
-    <x>15</x>
-    <y>191</y>
-    <width>102</width>
+    <name>Label_13</name>
+    <text>Trace</text>
+    <x>40</x>
+    <y>760</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -395,171 +699,47 @@
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_8</name>
-    <text>RAW data plugins</text>
-    <x>15</x>
-    <y>222</y>
-    <width>368</width>
-    <font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color name="IO Focus Entry" red="198" green="217" blue="241">
-      </color>
-    </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_15</name>
     <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
     </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_4</name>
-    <pv_name>$(P)$(R)Name</pv_name>
-    <x>132</x>
-    <y>11</y>
-    <width>221</width>
+    <pv_name>$(P)$(R)HDF2-EnableCallbacks</pv_name>
+    <text>Disable</text>
+    <x>340</x>
+    <y>810</y>
+    <width>70</width>
     <background_color>
-      <color red="255" green="255" blue="255">
+      <color red="240" green="240" blue="240">
       </color>
     </background_color>
-    <actions>
-    </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_3</name>
+    <name>Action Button_14</name>
     <actions>
-      <action type="open_display">
-        <file>../adcore/NDFileHDF5.opi</file>
-        <macros>
-          <R>$(CH)-HDF1-</R>
-        </macros>
-        <target>tab</target>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
       </action>
     </actions>
-    <text>More..</text>
-    <x>322</x>
-    <y>270</y>
-    <width>55</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>XY Graph</name>
-    <x>402</x>
-    <y>54</y>
-    <width>1105</width>
-    <height>495</height>
+    <pv_name>$(P)$(R)HDF2-EnableCallbacks</pv_name>
+    <text>Enable</text>
+    <x>250</x>
+    <y>810</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
-    <title_font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-      </font>
-    </title_font>
-    <show_toolbar>true</show_toolbar>
-    <actions>
-    </actions>
-    <rules>
-      <rule name="buffer_size" prop_id="trace_0_buffer_size" out_exp="true">
-        <exp bool_exp="true">
-          <expression>pv0</expression>
-        </exp>
-        <pv_name>$(P)$(R)TRC1-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)TRC1-ArraySize1_RBV</pv_name>
-      </rule>
-      <rule name="data_x0_max" prop_id="axis_0_maximum" out_exp="true">
-        <exp bool_exp="true">
-          <expression>pv0</expression>
-        </exp>
-        <pv_name>$(P)$(R)TRC1-ArraySize0_RBV</pv_name>
-      </rule>
-    </rules>
-    <x_axis>
-      <title>Samples</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>true</show_grid>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>ADC counts</title>
-        <autoscale>true</autoscale>
-        <log_scale>false</log_scale>
-        <minimum>0.0</minimum>
-        <maximum>100.0</maximum>
-        <show_grid>true</show_grid>
-        <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-          </font>
-        </title_font>
-        <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-          </font>
-        </scale_font>
-        <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>$(traces[0].y_pv)</name>
-        <x_pv>$(P)$(R)TRC1-ArrayTimeUs</x_pv>
-        <y_pv>$(P)$(R)TRC1-ArrayData</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="21" green="21" blue="196">
-          </color>
-        </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>4</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>LED_1</name>
-    <pv_name>$(P)$(R)TRC1-EnableCallbacks_RBV</pv_name>
-    <x>134</x>
-    <y>248</y>
-    <width>16</width>
-    <height>16</height>
+    <name>LED_4</name>
+    <pv_name>$(P)$(R)HDF2-EnableCallbacks_RBV</pv_name>
+    <x>190</x>
+    <y>815</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -576,50 +756,46 @@
     </actions>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_6</name>
+    <name>Action Button_13</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
+        <value>0</value>
       </action>
     </actions>
-    <pv_name>$(P)$(R)TRC1-EnableCallbacks</pv_name>
-    <text>Enable</text>
-    <x>174</x>
-    <y>246</y>
-    <width>55</width>
-    <height>20</height>
+    <pv_name>$(P)$(R)TRC2-EnableCallbacks</pv_name>
+    <text>Disable</text>
+    <x>340</x>
+    <y>760</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_7</name>
+    <name>Action Button_12</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(pv_name)</pv_name>
-        <value>0</value>
+        <value>1</value>
       </action>
     </actions>
-    <pv_name>$(P)$(R)TRC1-EnableCallbacks</pv_name>
-    <text>Disable</text>
-    <x>238</x>
-    <y>246</y>
-    <width>55</width>
-    <height>20</height>
+    <pv_name>$(P)$(R)TRC2-EnableCallbacks</pv_name>
+    <text>Enable</text>
+    <x>250</x>
+    <y>760</y>
+    <width>70</width>
     <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)HDF1-EnableCallbacks_RBV</pv_name>
-    <x>134</x>
-    <y>272</y>
-    <width>16</width>
-    <height>16</height>
+    <name>LED_3</name>
+    <pv_name>$(P)$(R)TRC2-EnableCallbacks_RBV</pv_name>
+    <x>190</x>
+    <y>765</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -636,65 +812,54 @@
     </actions>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_8</name>
+    <name>Action Button_11</name>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
+      <action type="open_display">
+        <file>../adcore/NDFileHDF5.opi</file>
+        <macros>
+          <R>$(CH)-HDF2-</R>
+        </macros>
+        <target>tab</target>
       </action>
     </actions>
-    <pv_name>$(P)$(R)HDF1-EnableCallbacks</pv_name>
-    <text>Enable</text>
-    <x>174</x>
-    <y>270</y>
-    <width>55</width>
-    <height>20</height>
+    <text>More..</text>
+    <x>430</x>
+    <y>810</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
+    <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_9</name>
+    <name>Action Button_10</name>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>0</value>
+      <action type="open_display">
+        <file>../admisc/NDTrace.opi</file>
+        <macros>
+          <R>$(CH)-TRC2-</R>
+        </macros>
+        <target>tab</target>
       </action>
     </actions>
-    <pv_name>$(P)$(R)HDF1-EnableCallbacks</pv_name>
-    <text>Disable</text>
-    <x>238</x>
-    <y>270</y>
-    <width>55</width>
-    <height>20</height>
+    <text>More..</text>
+    <x>430</x>
+    <y>760</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_10</name>
-    <text>Trace</text>
-    <x>15</x>
-    <y>246</y>
-    <width>102</width>
-    <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>
+    <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_11</name>
     <text>HDF5</text>
-    <x>15</x>
-    <y>270</y>
-    <width>102</width>
+    <x>40</x>
+    <y>630</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -706,21 +871,13 @@
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_12</name>
-    <text>PROCESSED data plugins</text>
-    <x>15</x>
-    <y>300</y>
-    <width>368</width>
-    <font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color name="IO Focus Entry" red="198" green="217" blue="241">
-      </color>
-    </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
+    <name>Label_10</name>
+    <text>Trace</text>
+    <x>40</x>
+    <y>580</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -731,56 +888,46 @@
     </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_10</name>
+    <name>Action Button_9</name>
     <actions>
-      <action type="open_display">
-        <file>../admisc/NDTrace.opi</file>
-        <macros>
-          <R>$(CH)-TRC2-</R>
-        </macros>
-        <target>tab</target>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
       </action>
     </actions>
-    <text>More..</text>
-    <x>322</x>
-    <y>324</y>
-    <width>55</width>
-    <height>20</height>
+    <pv_name>$(P)$(R)HDF1-EnableCallbacks</pv_name>
+    <text>Disable</text>
+    <x>340</x>
+    <y>630</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
-    <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_11</name>
+    <name>Action Button_8</name>
     <actions>
-      <action type="open_display">
-        <file>../adcore/NDFileHDF5.opi</file>
-        <macros>
-          <R>$(CH)-HDF2-</R>
-        </macros>
-        <target>tab</target>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
       </action>
     </actions>
-    <text>More..</text>
-    <x>322</x>
-    <y>348</y>
-    <width>55</width>
-    <height>20</height>
+    <pv_name>$(P)$(R)HDF1-EnableCallbacks</pv_name>
+    <text>Enable</text>
+    <x>250</x>
+    <y>630</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
-    <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>LED_3</name>
-    <pv_name>$(P)$(R)TRC2-EnableCallbacks_RBV</pv_name>
-    <x>134</x>
-    <y>326</y>
-    <width>16</width>
-    <height>16</height>
+    <name>LED_2</name>
+    <pv_name>$(P)$(R)HDF1-EnableCallbacks_RBV</pv_name>
+    <x>190</x>
+    <y>635</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -797,50 +944,46 @@
     </actions>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_12</name>
+    <name>Action Button_7</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
+        <value>0</value>
       </action>
     </actions>
-    <pv_name>$(P)$(R)TRC2-EnableCallbacks</pv_name>
-    <text>Enable</text>
-    <x>174</x>
-    <y>324</y>
-    <width>55</width>
-    <height>20</height>
+    <pv_name>$(P)$(R)TRC1-EnableCallbacks</pv_name>
+    <text>Disable</text>
+    <x>340</x>
+    <y>580</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_13</name>
+    <name>Action Button_6</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(pv_name)</pv_name>
-        <value>0</value>
+        <value>1</value>
       </action>
     </actions>
-    <pv_name>$(P)$(R)TRC2-EnableCallbacks</pv_name>
-    <text>Disable</text>
-    <x>238</x>
-    <y>324</y>
-    <width>55</width>
-    <height>20</height>
+    <pv_name>$(P)$(R)TRC1-EnableCallbacks</pv_name>
+    <text>Enable</text>
+    <x>250</x>
+    <y>580</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>LED_4</name>
-    <pv_name>$(P)$(R)HDF2-EnableCallbacks_RBV</pv_name>
-    <x>134</x>
-    <y>350</y>
-    <width>16</width>
-    <height>16</height>
+    <name>LED_1</name>
+    <pv_name>$(P)$(R)TRC1-EnableCallbacks_RBV</pv_name>
+    <x>190</x>
+    <y>585</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -857,49 +1000,50 @@
     </actions>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_14</name>
+    <name>Action Button_3</name>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
+      <action type="open_display">
+        <file>../adcore/NDFileHDF5.opi</file>
+        <macros>
+          <R>$(CH)-HDF1-</R>
+        </macros>
+        <target>tab</target>
       </action>
     </actions>
-    <pv_name>$(P)$(R)HDF2-EnableCallbacks</pv_name>
-    <text>Enable</text>
-    <x>174</x>
-    <y>348</y>
-    <width>55</width>
-    <height>20</height>
+    <text>More..</text>
+    <x>430</x>
+    <y>630</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
+    <tooltip>$(actions)</tooltip>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_15</name>
+  <widget type="label" version="2.0.0">
+    <name>Label_7</name>
+    <text>On threshold</text>
+    <x>40</x>
+    <y>450</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>0</value>
-      </action>
     </actions>
-    <pv_name>$(P)$(R)HDF2-EnableCallbacks</pv_name>
-    <text>Disable</text>
-    <x>238</x>
-    <y>348</y>
-    <width>55</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_13</name>
-    <text>Trace</text>
-    <x>15</x>
-    <y>324</y>
-    <width>102</width>
+    <name>Label_6</name>
+    <text>Off threshold</text>
+    <x>40</x>
+    <y>400</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -911,11 +1055,12 @@
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_14</name>
-    <text>HDF5</text>
-    <x>15</x>
-    <y>348</y>
-    <width>102</width>
+    <name>Label_5</name>
+    <text>Condition</text>
+    <x>40</x>
+    <y>350</y>
+    <width>110</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -926,95 +1071,80 @@
       </color>
     </border_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_16</name>
+  <widget type="label" version="2.0.0">
+    <name>Label_4</name>
+    <text>Length</text>
+    <x>40</x>
+    <y>300</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
-      <action type="open_display">
-        <file>../adcore/NDProcess.opi</file>
-        <macros>
-          <R>$(CH)-PROC2-</R>
-        </macros>
-        <target>tab</target>
-      </action>
     </actions>
-    <text>More..</text>
-    <x>322</x>
-    <y>372</y>
-    <width>55</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
+    </border_color>
   </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_5</name>
-    <pv_name>$(P)$(R)PROC2-EnableCallbacks_RBV</pv_name>
-    <x>134</x>
-    <y>374</y>
-    <width>16</width>
-    <height>16</height>
-    <off_color>
-      <color name="IO Background" red="235" green="235" blue="235">
-      </color>
-    </off_color>
-    <foreground_color>
-      <color red="192" green="192" blue="192">
-      </color>
-    </foreground_color>
-    <line_color>
-      <color red="150" green="150" blue="150">
-      </color>
-    </line_color>
+  <widget type="label" version="2.0.0">
+    <name>Label_2</name>
+    <text>Attenuation</text>
+    <x>40</x>
+    <y>170</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
     </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_17</name>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_4</name>
+    <pv_name>$(P)$(R)InternalTriggerOnR</pv_name>
+    <x>400</x>
+    <y>450</y>
+    <width>190</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
-      </action>
     </actions>
-    <pv_name>$(P)$(R)PROC2-EnableCallbacks</pv_name>
-    <text>Enable</text>
-    <x>174</x>
-    <y>372</y>
-    <width>55</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
+    </border_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_18</name>
-    <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>0</value>
-      </action>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_3</name>
+    <pv_name>$(P)$(R)InternalTriggerOn</pv_name>
+    <x>190</x>
+    <y>450</y>
+    <width>190</width>
+    <height>30</height>
+    <actions>
     </actions>
-    <pv_name>$(P)$(R)PROC2-EnableCallbacks</pv_name>
-    <text>Disable</text>
-    <x>238</x>
-    <y>372</y>
-    <width>55</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
+    </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_15</name>
-    <text>Processing</text>
-    <x>15</x>
-    <y>372</y>
-    <width>102</width>
-    <horizontal_alignment>2</horizontal_alignment>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_3</name>
+    <pv_name>$(P)$(R)InternalTriggerOffR</pv_name>
+    <x>400</x>
+    <y>400</y>
+    <width>190</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1024,95 +1154,90 @@
       </color>
     </border_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_19</name>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_2</name>
+    <pv_name>$(P)$(R)InternalTriggerOff</pv_name>
+    <x>190</x>
+    <y>400</y>
+    <width>190</width>
+    <height>30</height>
     <actions>
-      <action type="open_display">
-        <file>../adcore/NDStats.opi</file>
-        <macros>
-          <R>$(CH)-STAT2-</R>
-        </macros>
-        <target>tab</target>
-      </action>
     </actions>
-    <text>More..</text>
-    <x>322</x>
-    <y>396</y>
-    <width>55</width>
-    <height>20</height>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="combo" version="2.0.0">
+    <name>Menu Button</name>
+    <pv_name>$(P)$(R)InternalTriggerCondition</pv_name>
+    <x>190</x>
+    <y>350</y>
+    <width>190</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
-    <tooltip>$(actions)</tooltip>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_6</name>
-    <pv_name>$(P)$(R)STAT2-EnableCallbacks_RBV</pv_name>
-    <x>134</x>
-    <y>398</y>
-    <width>16</width>
-    <height>16</height>
-    <off_color>
-      <color name="IO Background" red="235" green="235" blue="235">
-      </color>
-    </off_color>
-    <foreground_color>
-      <color red="192" green="192" blue="192">
-      </color>
-    </foreground_color>
-    <line_color>
-      <color red="150" green="150" blue="150">
-      </color>
-    </line_color>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_2</name>
+    <pv_name>$(P)$(R)InternalTriggerConditionR</pv_name>
+    <x>400</x>
+    <y>350</y>
+    <width>190</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
     </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_20</name>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(P)$(R)InternalTriggerLengthR</pv_name>
+    <x>400</x>
+    <y>300</y>
+    <width>190</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
-      </action>
     </actions>
-    <pv_name>$(P)$(R)STAT2-EnableCallbacks</pv_name>
-    <text>Enable</text>
-    <x>174</x>
-    <y>396</y>
-    <width>55</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
+    </border_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_21</name>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_1</name>
+    <pv_name>$(P)$(R)InternalTriggerLength</pv_name>
+    <x>190</x>
+    <y>300</y>
+    <width>190</width>
+    <height>30</height>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>0</value>
-      </action>
     </actions>
-    <pv_name>$(P)$(R)STAT2-EnableCallbacks</pv_name>
-    <text>Disable</text>
-    <x>238</x>
-    <y>396</y>
-    <width>55</width>
-    <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
+    </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_16</name>
-    <text>Statistics</text>
-    <x>15</x>
-    <y>396</y>
-    <width>102</width>
-    <horizontal_alignment>2</horizontal_alignment>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(P)$(R)AttenuationR</pv_name>
+    <x>400</x>
+    <y>170</y>
+    <width>190</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1122,22 +1247,36 @@
       </color>
     </border_color>
   </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_1</name>
+    <pv_name>$(P)$(R)Attenuation</pv_name>
+    <x>190</x>
+    <y>170</y>
+    <width>190</width>
+    <height>30</height>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_22</name>
+    <name>Action Button_2</name>
     <actions>
       <action type="open_display">
-        <file>../adcore/NDROI.opi</file>
+        <file>../admisc/NDTrace.opi</file>
         <macros>
-          <R>$(CH)-ROI2-</R>
+          <R>$(CH)-TRC1-</R>
         </macros>
         <target>tab</target>
       </action>
     </actions>
     <text>More..</text>
-    <x>322</x>
-    <y>420</y>
-    <width>55</width>
-    <height>20</height>
+    <x>430</x>
+    <y>580</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -1145,12 +1284,10 @@
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>LED_7</name>
-    <pv_name>$(P)$(R)ROI2-EnableCallbacks_RBV</pv_name>
-    <x>134</x>
-    <y>422</y>
-    <width>16</width>
-    <height>16</height>
+    <name>LED</name>
+    <pv_name>$(P)$(R)ControlR</pv_name>
+    <x>395</x>
+    <y>45</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -1167,151 +1304,52 @@
     </actions>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_23</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(pv_name)</pv_name>
         <value>1</value>
       </action>
     </actions>
-    <pv_name>$(P)$(R)ROI2-EnableCallbacks</pv_name>
+    <pv_name>$(P)$(R)Control</pv_name>
     <text>Enable</text>
-    <x>174</x>
-    <y>420</y>
-    <width>55</width>
-    <height>20</height>
+    <x>430</x>
+    <y>40</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_24</name>
+    <name>Action Button_1</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(pv_name)</pv_name>
         <value>0</value>
       </action>
     </actions>
-    <pv_name>$(P)$(R)ROI2-EnableCallbacks</pv_name>
+    <pv_name>$(P)$(R)Control</pv_name>
     <text>Disable</text>
-    <x>238</x>
-    <y>420</y>
-    <width>55</width>
-    <height>20</height>
+    <x>520</x>
+    <y>40</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_17</name>
-    <text>Region of interest</text>
-    <x>15</x>
-    <y>420</y>
-    <width>102</width>
-    <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_18</name>
-    <text>Attenuation</text>
-    <x>15</x>
-    <y>54</y>
-    <width>368</width>
-    <font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color name="IO Focus Entry" red="198" green="217" blue="241">
-      </color>
-    </background_color>
-    <transparent>false</transparent>
-    <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_19</name>
-    <text>Trace</text>
-    <x>15</x>
-    <y>450</y>
-    <width>368</width>
-    <font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-      </font>
-    </font>
-    <background_color>
-      <color name="IO Focus Entry" red="198" green="217" blue="241">
-      </color>
-    </background_color>
-    <transparent>false</transparent>
-    <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_5</name>
-    <pv_name>$(P)$(R)TRC1-TimePerPointUsR</pv_name>
-    <x>132</x>
-    <y>474</y>
-    <width>107</width>
+    <name>Label_211</name>
+    <text>Channel name</text>
+    <x>40</x>
+    <y>40</y>
+    <width>110</width>
+    <height>30</height>
     <background_color>
-      <color red="255" green="255" blue="255">
+      <color name="Transparent" red="255" green="255" blue="255" alpha="0">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_20</name>
-    <text>Time point</text>
-    <x>15</x>
-    <y>474</y>
-    <width>102</width>
-    <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_21</name>
-    <text>Time link</text>
-    <x>15</x>
-    <y>493</y>
-    <width>102</width>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1322,41 +1360,16 @@
       </color>
     </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_6</name>
-    <pv_name>$(P)$(R)TRC1-TimePerPointLink.DOL</pv_name>
-    <x>132</x>
-    <y>493</y>
-    <width>245</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <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_7</name>
-    <pv_name>$(P)$(R)TRC1-TimePerPointMsR</pv_name>
-    <x>246</x>
-    <y>474</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_4</name>
+    <pv_name>$(P)$(R)Name</pv_name>
+    <x>190</x>
+    <y>40</y>
+    <width>190</width>
+    <height>30</height>
     <actions>
     </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
     <border_color>
       <color red="0" green="128" blue="255">
       </color>
diff --git a/99-Shared/adsis8300/channel_item.bob b/99-Shared/adsis8300/channel_item.bob
index 1935d91458b4d52b2aa56c3f1db75138b991dea7..618a63f00684f7499f3c98ec83df74a4d6884a05 100644
--- a/99-Shared/adsis8300/channel_item.bob
+++ b/99-Shared/adsis8300/channel_item.bob
@@ -1,39 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>Channel $(CH)</name>
+  <class></class>
+  <width>650</width>
+  <height>50</height>
   <background_color>
-    <color red="240" green="240" blue="240">
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
   </background_color>
   <actions>
   </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>18</x>
-    <y>80</y>
-    <width>342</width>
-    <height>24</height>
+    <name>BGGrey03-background_9</name>
+    <width>650</width>
+    <height>50</height>
     <line_width>0</line_width>
-    <line_color>
-      <color red="128" green="0" blue="255">
-      </color>
-    </line_color>
     <background_color>
-      <color name="IO Running Symbol Fill" red="166" green="166" blue="166">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED</name>
     <pv_name>$(P)$(R)ControlR</pv_name>
-    <x>110</x>
-    <y>84</y>
-    <width>16</width>
-    <height>16</height>
+    <x>322</x>
+    <y>12</y>
+    <width>26</width>
+    <height>26</height>
     <off_color>
       <color red="0" green="100" blue="0">
       </color>
@@ -59,10 +54,9 @@ $(pv_value)</tooltip>
     </actions>
     <pv_name>$(P)$(R)Control</pv_name>
     <text>Enable</text>
-    <x>138</x>
-    <y>82</y>
-    <width>67</width>
-    <height>20</height>
+    <x>360</x>
+    <y>10</y>
+    <width>80</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -78,10 +72,9 @@ $(pv_value)</tooltip>
     </actions>
     <pv_name>$(P)$(R)Control</pv_name>
     <text>Disable</text>
-    <x>210</x>
-    <y>82</y>
-    <width>67</width>
-    <height>20</height>
+    <x>460</x>
+    <y>10</y>
+    <width>80</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -96,10 +89,9 @@ $(pv_value)</tooltip>
       </action>
     </actions>
     <text>More..</text>
-    <x>282</x>
-    <y>82</y>
-    <width>73</width>
-    <height>20</height>
+    <x>560</x>
+    <y>10</y>
+    <width>80</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -109,17 +101,14 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)Name</pv_name>
-    <x>24</x>
-    <y>82</y>
-    <width>76</width>
+    <x>10</x>
+    <y>10</y>
+    <width>300</width>
+    <height>30</height>
     <font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
       </font>
     </font>
-    <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>
diff --git a/99-Shared/adsis8300/channels.bob b/99-Shared/adsis8300/channels.bob
index 9b437aaa82349cd4da3ea8560ec91214b4e237a7..94cbded2aec8fe7831685a6b90ad7a1471823b82 100644
--- a/99-Shared/adsis8300/channels.bob
+++ b/99-Shared/adsis8300/channels.bob
@@ -1,25 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <width>1600</width>
-  <height>800</height>
+  <width>690</width>
+  <height>750</height>
   <background_color>
-    <color red="240" green="240" blue="240">
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
   </background_color>
   <actions>
   </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <width>690</width>
+    <height>750</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container</name>
-    <file>channel_item.opi</file>
+    <file>channel_item.bob</file>
     <macros>
       <CH>$(CH10)</CH>
       <R>$(CH10)-</R>
     </macros>
-    <x>72</x>
-    <y>357</y>
-    <width>1077</width>
-    <height>27</height>
-    <resize>2</resize>
+    <x>20</x>
+    <y>680</y>
+    <width>650</width>
+    <height>50</height>
     <actions>
     </actions>
     <border_color>
@@ -29,16 +48,15 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_1</name>
-    <file>channel_item.opi</file>
+    <file>channel_item.bob</file>
     <macros>
       <CH>$(CH1)</CH>
       <R>$(CH1)-</R>
     </macros>
-    <x>72</x>
-    <y>114</y>
-    <width>345</width>
-    <height>27</height>
-    <resize>2</resize>
+    <x>20</x>
+    <y>50</y>
+    <width>650</width>
+    <height>50</height>
     <actions>
     </actions>
     <border_color>
@@ -48,16 +66,15 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_2</name>
-    <file>channel_item.opi</file>
+    <file>channel_item.bob</file>
     <macros>
       <CH>$(CH2)</CH>
       <R>$(CH2)-</R>
     </macros>
-    <x>72</x>
-    <y>141</y>
-    <width>1077</width>
-    <height>27</height>
-    <resize>2</resize>
+    <x>20</x>
+    <y>120</y>
+    <width>650</width>
+    <height>50</height>
     <actions>
     </actions>
     <border_color>
@@ -67,16 +84,15 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_3</name>
-    <file>channel_item.opi</file>
+    <file>channel_item.bob</file>
     <macros>
       <CH>$(CH3)</CH>
       <R>$(CH3)-</R>
     </macros>
-    <x>72</x>
-    <y>168</y>
-    <width>1077</width>
-    <height>27</height>
-    <resize>2</resize>
+    <x>20</x>
+    <y>190</y>
+    <width>650</width>
+    <height>50</height>
     <actions>
     </actions>
     <border_color>
@@ -86,16 +102,15 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_4</name>
-    <file>channel_item.opi</file>
+    <file>channel_item.bob</file>
     <macros>
       <CH>$(CH4)</CH>
       <R>$(CH4)-</R>
     </macros>
-    <x>72</x>
-    <y>195</y>
-    <width>1077</width>
-    <height>27</height>
-    <resize>2</resize>
+    <x>20</x>
+    <y>260</y>
+    <width>650</width>
+    <height>50</height>
     <actions>
     </actions>
     <border_color>
@@ -105,16 +120,15 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_5</name>
-    <file>channel_item.opi</file>
+    <file>channel_item.bob</file>
     <macros>
       <CH>$(CH5)</CH>
       <R>$(CH5)-</R>
     </macros>
-    <x>72</x>
-    <y>222</y>
-    <width>1077</width>
-    <height>27</height>
-    <resize>2</resize>
+    <x>20</x>
+    <y>330</y>
+    <width>650</width>
+    <height>50</height>
     <actions>
     </actions>
     <border_color>
@@ -124,16 +138,15 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_6</name>
-    <file>channel_item.opi</file>
+    <file>channel_item.bob</file>
     <macros>
       <CH>$(CH6)</CH>
       <R>$(CH6)-</R>
     </macros>
-    <x>72</x>
-    <y>249</y>
-    <width>1077</width>
-    <height>27</height>
-    <resize>2</resize>
+    <x>20</x>
+    <y>400</y>
+    <width>650</width>
+    <height>50</height>
     <actions>
     </actions>
     <border_color>
@@ -143,16 +156,15 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_7</name>
-    <file>channel_item.opi</file>
+    <file>channel_item.bob</file>
     <macros>
       <CH>$(CH7)</CH>
       <R>$(CH7)-</R>
     </macros>
-    <x>72</x>
-    <y>276</y>
-    <width>1077</width>
-    <height>27</height>
-    <resize>2</resize>
+    <x>20</x>
+    <y>470</y>
+    <width>650</width>
+    <height>50</height>
     <actions>
     </actions>
     <border_color>
@@ -162,16 +174,15 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_8</name>
-    <file>channel_item.opi</file>
+    <file>channel_item.bob</file>
     <macros>
       <CH>$(CH8)</CH>
       <R>$(CH8)-</R>
     </macros>
-    <x>72</x>
-    <y>303</y>
-    <width>1077</width>
-    <height>27</height>
-    <resize>2</resize>
+    <x>20</x>
+    <y>540</y>
+    <width>650</width>
+    <height>50</height>
     <actions>
     </actions>
     <border_color>
@@ -181,16 +192,15 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_9</name>
-    <file>channel_item.opi</file>
+    <file>channel_item.bob</file>
     <macros>
       <CH>$(CH9)</CH>
       <R>$(CH9)-</R>
     </macros>
-    <x>72</x>
-    <y>330</y>
-    <width>1077</width>
-    <height>27</height>
-    <resize>2</resize>
+    <x>20</x>
+    <y>610</y>
+    <width>650</width>
+    <height>50</height>
     <actions>
     </actions>
     <border_color>
@@ -198,4 +208,21 @@
       </color>
     </border_color>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_20</name>
+    <text>Channels</text>
+    <width>690</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
 </display>
diff --git a/99-Shared/adsis8300/sis8300-evr.bob b/99-Shared/adsis8300/sis8300-evr.bob
index db09844bc6ba24d3cdb0152d3f83b5bfef441b34..82718c5e88c07f0096a217acddab9ff10bb352ec 100644
--- a/99-Shared/adsis8300/sis8300-evr.bob
+++ b/99-Shared/adsis8300/sis8300-evr.bob
@@ -1,20 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>$(P)$(R) System</name>
-  <width>699</width>
-  <height>171</height>
+  <width>610</width>
+  <height>340</height>
   <background_color>
-    <color red="240" green="240" blue="240">
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
   </background_color>
   <actions>
   </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_11</name>
+    <width>610</width>
+    <height>340</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
   <widget type="label" version="2.0.0">
     <name>Label_237</name>
     <text>Timestamp</text>
-    <x>9</x>
-    <y>30</y>
-    <width>143</width>
+    <x>20</x>
+    <y>50</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -28,13 +41,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_121</name>
     <pv_name>$(P)$(R)EvrTimestamp</pv_name>
-    <x>162</x>
-    <y>30</y>
-    <width>157</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>50</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -48,13 +58,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_4</name>
     <pv_name>$(P)$(R)EvrTimestampIn.TSEL</pv_name>
-    <x>336</x>
-    <y>30</y>
-    <width>354</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>400</x>
+    <y>50</y>
+    <width>190</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -66,9 +73,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_239</name>
     <text>Beam mode</text>
-    <x>9</x>
-    <y>49</y>
-    <width>143</width>
+    <x>20</x>
+    <y>90</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -82,13 +90,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_1</name>
     <pv_name>$(P)$(R)BeamModeEvr</pv_name>
-    <x>162</x>
-    <y>50</y>
-    <width>157</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>90</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -102,13 +107,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_1</name>
     <pv_name>$(P)$(R)BeamModeEvr.DOL</pv_name>
-    <x>336</x>
-    <y>49</y>
-    <width>354</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>400</x>
+    <y>90</y>
+    <width>190</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -120,13 +122,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_2</name>
     <pv_name>$(P)$(R)BeamDestEvr</pv_name>
-    <x>162</x>
-    <y>69</y>
-    <width>157</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>130</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -140,9 +139,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_241</name>
     <text>Beam destination</text>
-    <x>9</x>
-    <y>68</y>
-    <width>143</width>
+    <x>20</x>
+    <y>130</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -156,13 +156,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_2</name>
     <pv_name>$(P)$(R)BeamDestEvr.DOL</pv_name>
-    <x>336</x>
-    <y>68</y>
-    <width>354</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>400</x>
+    <y>130</y>
+    <width>190</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -174,13 +171,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_3</name>
     <pv_name>$(P)$(R)EvrBeamState</pv_name>
-    <x>162</x>
-    <y>88</y>
-    <width>157</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>170</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -194,9 +188,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_243</name>
     <text>Beam state</text>
-    <x>9</x>
-    <y>87</y>
-    <width>143</width>
+    <x>20</x>
+    <y>170</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -210,13 +205,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_3</name>
     <pv_name>$(P)$(R)EvrBeamStateIn.INP</pv_name>
-    <x>336</x>
-    <y>87</y>
-    <width>354</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>400</x>
+    <y>170</y>
+    <width>190</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -228,13 +220,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_4</name>
     <pv_name>$(P)$(R)EvrLink</pv_name>
-    <x>162</x>
-    <y>107</y>
-    <width>157</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>210</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -248,9 +237,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_245</name>
     <text>EVR link status</text>
-    <x>9</x>
-    <y>106</y>
-    <width>143</width>
+    <x>20</x>
+    <y>210</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -264,13 +254,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_4</name>
     <pv_name>$(P)$(R)EvrLinkIn.INP</pv_name>
-    <x>336</x>
-    <y>106</y>
-    <width>354</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>400</x>
+    <y>210</y>
+    <width>190</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -282,13 +269,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_5</name>
     <pv_name>$(P)$(R)EvrLinkStat</pv_name>
-    <x>162</x>
-    <y>126</y>
-    <width>157</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>250</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -302,9 +286,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_247</name>
     <text>EVR link STAT status</text>
-    <x>9</x>
-    <y>125</y>
-    <width>143</width>
+    <x>20</x>
+    <y>250</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -318,13 +303,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_5</name>
     <pv_name>$(P)$(R)EvrLinkStatIn.INP</pv_name>
-    <x>336</x>
-    <y>125</y>
-    <width>354</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>400</x>
+    <y>250</y>
+    <width>190</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -336,13 +318,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_6</name>
     <pv_name>$(P)$(R)EvrLinkSevr</pv_name>
-    <x>162</x>
-    <y>145</y>
-    <width>157</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>190</x>
+    <y>290</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -356,9 +335,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_249</name>
     <text>EVR link SEVR status</text>
-    <x>9</x>
-    <y>144</y>
-    <width>143</width>
+    <x>20</x>
+    <y>290</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -372,13 +352,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_6</name>
     <pv_name>$(P)$(R)EvrLinkSevrIn.INP</pv_name>
-    <x>336</x>
-    <y>144</y>
-    <width>354</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>400</x>
+    <y>290</y>
+    <width>190</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -390,9 +367,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_250</name>
     <text>EVR input PV</text>
-    <x>336</x>
-    <y>6</y>
-    <width>259</width>
+    <x>400</x>
+    <y>20</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -406,9 +384,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_251</name>
     <text>Value</text>
-    <x>162</x>
-    <y>6</y>
-    <width>157</width>
+    <x>190</x>
+    <y>20</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
diff --git a/99-Shared/adsis8300/sis8300.bob b/99-Shared/adsis8300/sis8300.bob
index a7a080332d236374ad681ef773969513015cf2c3..a885d31da1af544258d43bd97a9bfa13d41ab20b 100644
--- a/99-Shared/adsis8300/sis8300.bob
+++ b/99-Shared/adsis8300/sis8300.bob
@@ -1,21 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>AD SIS8300</name>
-  <width>1000</width>
-  <height>800</height>
+  <width>2070</width>
+  <height>950</height>
   <background_color>
     <color red="240" green="240" blue="240">
     </color>
   </background_color>
   <actions>
   </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>2070</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>AD SIS8300 driver ($(P)$(R))</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>
+    <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="embedded" version="2.0.0">
     <name>Linking Container</name>
-    <file>system.opi</file>
-    <x>24</x>
-    <y>48</y>
-    <width>598</width>
-    <height>702</height>
+    <file>system.bob</file>
+    <x>20</x>
+    <y>70</y>
+    <width>1320</width>
+    <height>860</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -26,38 +60,11 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_1</name>
-    <file>channels.opi</file>
-    <x>630</x>
-    <y>48</y>
-    <width>348</width>
-    <height>273</height>
-    <resize>2</resize>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>AD SIS8300 driver ($(P)$(R))</text>
-    <x>24</x>
-    <y>6</y>
-    <width>961</width>
-    <height>37</height>
-    <font>
-      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
-      </font>
-    </font>
-    <background_color>
-      <color name="IO Focus Entry" red="198" green="217" blue="241">
-      </color>
-    </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+    <file>channels.bob</file>
+    <x>1360</x>
+    <y>70</y>
+    <width>690</width>
+    <height>750</height>
     <actions>
     </actions>
     <border_color>
diff --git a/99-Shared/adsis8300/system.bob b/99-Shared/adsis8300/system.bob
index c66e3fc42ef57fec600878dedf3edfd961e7879d..af4c766f8ca7b147733f2fd8d5e64added45865c 100644
--- a/99-Shared/adsis8300/system.bob
+++ b/99-Shared/adsis8300/system.bob
@@ -1,20 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>$(P)$(R) System</name>
-  <width>500</width>
-  <height>700</height>
+  <width>1320</width>
+  <height>860</height>
   <background_color>
-    <color red="240" green="240" blue="240">
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
   </background_color>
   <actions>
   </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_1</name>
+    <x>670</x>
+    <width>650</width>
+    <height>860</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>5</corner_height>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <width>650</width>
+    <height>860</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>5</corner_height>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_13</name>
+    <x>20</x>
+    <y>380</y>
+    <width>610</width>
+    <height>220</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_12</name>
+    <x>690</x>
+    <y>450</y>
+    <width>610</width>
+    <height>390</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_11</name>
+    <x>20</x>
+    <y>660</y>
+    <width>610</width>
+    <height>180</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_9</name>
+    <x>20</x>
+    <y>50</y>
+    <width>610</width>
+    <height>270</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
   <widget type="label" version="2.0.0">
     <name>Label_213</name>
     <text>RTM type</text>
-    <x>12</x>
-    <y>278</y>
-    <width>143</width>
+    <x>710</x>
+    <y>750</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -28,13 +126,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_101</name>
     <pv_name>$(P)$(R)RtmTypeR</pv_name>
-    <x>159</x>
-    <y>278</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>750</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -48,9 +143,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_214</name>
     <text>IRQ Poll</text>
-    <x>12</x>
-    <y>298</y>
-    <width>143</width>
+    <x>710</x>
+    <y>790</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -64,13 +160,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_102</name>
     <pv_name>$(P)$(R)IrqPollR</pv_name>
-    <x>159</x>
-    <y>298</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>790</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -84,13 +177,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_40</name>
     <pv_name>$(P)$(R)TickValueR</pv_name>
-    <x>159</x>
-    <y>198</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>590</y>
+    <width>190</width>
+    <height>30</height>
     <format>2</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -105,13 +195,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_1</name>
     <pv_name>$(P)$(R)SamplingFrequencyR</pv_name>
-    <x>159</x>
-    <y>178</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>550</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -125,9 +212,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_1</name>
     <text>Sampling frequency</text>
-    <x>12</x>
-    <y>178</y>
-    <width>143</width>
+    <x>710</x>
+    <y>550</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -141,9 +229,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_2</name>
     <text>Time tick</text>
-    <x>12</x>
-    <y>198</y>
-    <width>143</width>
+    <x>710</x>
+    <y>590</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -157,9 +246,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_198</name>
     <text>Clock source</text>
-    <x>12</x>
-    <y>138</y>
-    <width>143</width>
+    <x>710</x>
+    <y>470</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -173,9 +263,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_199</name>
     <text>Clock divider</text>
-    <x>12</x>
-    <y>158</y>
-    <width>143</width>
+    <x>710</x>
+    <y>510</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -189,9 +280,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_200</name>
     <text>Trigger source</text>
-    <x>12</x>
-    <y>218</y>
-    <width>143</width>
+    <x>710</x>
+    <y>630</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -205,9 +297,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_201</name>
     <text>Trigger line</text>
-    <x>12</x>
-    <y>238</y>
-    <width>143</width>
+    <x>710</x>
+    <y>670</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -221,9 +314,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_202</name>
     <text>Trigger repeat</text>
-    <x>12</x>
-    <y>258</y>
-    <width>143</width>
+    <x>710</x>
+    <y>710</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -237,13 +331,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_85</name>
     <pv_name>$(P)$(R)ClockSourceR</pv_name>
-    <x>159</x>
-    <y>138</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>470</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -257,13 +348,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_86</name>
     <pv_name>$(P)$(R)ClockDividerR</pv_name>
-    <x>159</x>
-    <y>158</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>510</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -277,13 +365,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_87</name>
     <pv_name>$(P)$(R)TriggerSourceR</pv_name>
-    <x>159</x>
-    <y>218</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>630</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -297,13 +382,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_88</name>
     <pv_name>$(P)$(R)TriggerExternalLineR</pv_name>
-    <x>159</x>
-    <y>238</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>670</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -317,13 +399,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_89</name>
     <pv_name>$(P)$(R)TriggerRepeatR</pv_name>
-    <x>159</x>
-    <y>258</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>880</x>
+    <y>710</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -337,10 +416,9 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_15</name>
     <pv_name>$(P)$(R)TriggerSource</pv_name>
-    <x>270</x>
-    <y>218</y>
-    <width>107</width>
-    <height>20</height>
+    <x>1090</x>
+    <y>630</y>
+    <width>190</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -350,10 +428,9 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)ClockSource</pv_name>
-    <x>270</x>
-    <y>138</y>
-    <width>107</width>
-    <height>20</height>
+    <x>1090</x>
+    <y>470</y>
+    <width>190</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -363,10 +440,9 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_19</name>
     <pv_name>$(P)$(R)IrqPoll</pv_name>
-    <x>270</x>
-    <y>299</y>
-    <width>107</width>
-    <height>20</height>
+    <x>1090</x>
+    <y>790</y>
+    <width>190</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -376,10 +452,9 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_18</name>
     <pv_name>$(P)$(R)RtmType</pv_name>
-    <x>270</x>
-    <y>279</y>
-    <width>107</width>
-    <height>20</height>
+    <x>1090</x>
+    <y>750</y>
+    <width>190</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -389,15 +464,12 @@
   <widget type="spinner" version="2.0.0">
     <name>Spinner_7</name>
     <pv_name>$(P)$(R)TriggerRepeat</pv_name>
-    <x>270</x>
-    <y>259</y>
-    <width>107</width>
+    <x>1090</x>
+    <y>710</y>
+    <width>190</width>
+    <height>30</height>
     <format>0</format>
     <precision>3</precision>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <actions>
     </actions>
     <minimum>-1.0</minimum>
@@ -407,13 +479,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_13</name>
     <pv_name>$(P)$(R)SamplingFrequency</pv_name>
-    <x>270</x>
-    <y>178</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>1090</x>
+    <y>550</y>
+    <width>190</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -425,10 +494,9 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button_16</name>
     <pv_name>$(P)$(R)TriggerExternalLine</pv_name>
-    <x>270</x>
-    <y>239</y>
-    <width>107</width>
-    <height>20</height>
+    <x>1090</x>
+    <y>670</y>
+    <width>190</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -438,15 +506,12 @@
   <widget type="spinner" version="2.0.0">
     <name>Spinner_6</name>
     <pv_name>$(P)$(R)ClockDivider</pv_name>
-    <x>270</x>
-    <y>158</y>
-    <width>107</width>
+    <x>1090</x>
+    <y>510</y>
+    <width>190</width>
+    <height>30</height>
     <format>0</format>
     <precision>3</precision>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
     <actions>
     </actions>
     <maximum>1.7976931348623157E308</maximum>
@@ -454,9 +519,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_207</name>
     <text>Model</text>
-    <x>12</x>
-    <y>32</y>
-    <width>143</width>
+    <x>40</x>
+    <y>110</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -470,13 +536,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_96</name>
     <pv_name>$(P)$(R)Model_RBV</pv_name>
-    <x>159</x>
-    <y>32</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>210</x>
+    <y>110</y>
+    <width>190</width>
+    <height>30</height>
     <format>6</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -491,9 +554,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_208</name>
     <text>Firmware version</text>
-    <x>12</x>
-    <y>52</y>
-    <width>143</width>
+    <x>40</x>
+    <y>150</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -507,13 +571,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_97</name>
     <pv_name>$(P)$(R)FirmwareVersion_RBV</pv_name>
-    <x>159</x>
-    <y>52</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>210</x>
+    <y>150</y>
+    <width>190</width>
+    <height>30</height>
     <format>6</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -528,9 +589,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_209</name>
     <text>Serial number</text>
-    <x>12</x>
-    <y>72</y>
-    <width>143</width>
+    <x>40</x>
+    <y>190</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -544,13 +606,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_98</name>
     <pv_name>$(P)$(R)SerialNumber_RBV</pv_name>
-    <x>159</x>
-    <y>72</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>210</x>
+    <y>190</y>
+    <width>190</width>
+    <height>30</height>
     <format>6</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -565,9 +624,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_210</name>
     <text>Memory size</text>
-    <x>12</x>
-    <y>92</y>
-    <width>143</width>
+    <x>40</x>
+    <y>230</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -581,13 +641,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_99</name>
     <pv_name>$(P)$(R)MemorySizeR</pv_name>
-    <x>159</x>
-    <y>92</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>210</x>
+    <y>230</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -601,9 +658,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_211</name>
     <text>Manufacturer</text>
-    <x>12</x>
-    <y>12</y>
-    <width>143</width>
+    <x>40</x>
+    <y>70</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -617,13 +675,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_100</name>
     <pv_name>$(P)$(R)Manufacturer_RBV</pv_name>
-    <x>159</x>
-    <y>12</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>210</x>
+    <y>70</y>
+    <width>190</width>
+    <height>30</height>
     <format>6</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -638,9 +693,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_212</name>
     <text>Device path</text>
-    <x>12</x>
-    <y>112</y>
-    <width>143</width>
+    <x>40</x>
+    <y>270</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -654,13 +710,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_101</name>
     <pv_name>$(P)$(R)DevicePathR</pv_name>
-    <x>159</x>
-    <y>112</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>210</x>
+    <y>270</y>
+    <width>190</width>
+    <height>30</height>
     <format>6</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -672,31 +725,15 @@
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_216</name>
-    <text>Driver message</text>
-    <x>13</x>
-    <y>641</y>
-    <width>144</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_104</name>
     <pv_name>$(P)$(R)MessageR</pv_name>
-    <x>13</x>
-    <y>660</y>
-    <width>445</width>
-    <height>51</height>
+    <x>40</x>
+    <y>680</y>
+    <width>570</width>
+    <height>140</height>
     <font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
       </font>
     </font>
     <background_color>
@@ -715,13 +752,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_2</name>
     <pv_name>$(P)$(R)NumSamples</pv_name>
-    <x>270</x>
-    <y>324</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>420</x>
+    <y>480</y>
+    <width>190</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -733,9 +767,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_219</name>
     <text>Number of samples</text>
-    <x>12</x>
-    <y>323</y>
-    <width>143</width>
+    <x>40</x>
+    <y>480</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -749,13 +784,10 @@
   <widget type="textentry" version="3.0.0">
     <name>Text Input_3</name>
     <pv_name>$(P)$(R)ArrayCounter</pv_name>
-    <x>270</x>
-    <y>344</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>420</x>
+    <y>520</y>
+    <width>190</width>
+    <height>30</height>
     <actions>
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -766,10 +798,11 @@
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_220</name>
-    <text>Number of acquisitions</text>
-    <x>12</x>
-    <y>343</y>
-    <width>143</width>
+    <text>No. of acquisitions</text>
+    <x>40</x>
+    <y>520</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -783,9 +816,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_221</name>
     <text>Acquire</text>
-    <x>13</x>
-    <y>576</y>
-    <width>143</width>
+    <x>40</x>
+    <y>400</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -806,10 +840,9 @@
     </actions>
     <pv_name>$(P)$(R)Acquire</pv_name>
     <text>Start</text>
-    <x>190</x>
-    <y>576</y>
-    <width>65</width>
-    <height>20</height>
+    <x>250</x>
+    <y>400</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -825,10 +858,9 @@
     </actions>
     <pv_name>$(P)$(R)Acquire</pv_name>
     <text>Stop</text>
-    <x>265</x>
-    <y>576</y>
-    <width>65</width>
-    <height>20</height>
+    <x>340</x>
+    <y>400</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -837,13 +869,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_105</name>
     <pv_name>$(P)$(R)NumSamplesR</pv_name>
-    <x>159</x>
-    <y>324</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>210</x>
+    <y>480</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -857,13 +886,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_106</name>
     <pv_name>$(P)$(R)ArrayCounter_RBV</pv_name>
-    <x>159</x>
-    <y>344</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>210</x>
+    <y>520</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -886,10 +912,9 @@
       </action>
     </actions>
     <text>Asyn</text>
-    <x>160</x>
-    <y>617</y>
-    <width>65</width>
-    <height>20</height>
+    <x>250</x>
+    <y>440</y>
+    <width>70</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -899,10 +924,8 @@
   <widget type="led" version="2.0.0">
     <name>LED</name>
     <pv_name>$(P)$(R)Acquire</pv_name>
-    <x>162</x>
-    <y>578</y>
-    <width>16</width>
-    <height>16</height>
+    <x>210</x>
+    <y>405</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -921,9 +944,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_234</name>
     <text>Asyn record</text>
-    <x>13</x>
-    <y>617</y>
-    <width>143</width>
+    <x>40</x>
+    <y>440</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -937,9 +961,10 @@
   <widget type="label" version="2.0.0">
     <name>Label_235</name>
     <text>Acquisition rate</text>
-    <x>12</x>
-    <y>362</y>
-    <width>143</width>
+    <x>40</x>
+    <y>560</y>
+    <width>150</width>
+    <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -953,13 +978,10 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_119</name>
     <pv_name>$(P)$(R)ArrayRate_RBV</pv_name>
-    <x>159</x>
-    <y>363</y>
-    <width>107</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
+    <x>210</x>
+    <y>560</y>
+    <width>190</width>
+    <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -972,11 +994,11 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_2</name>
-    <file>sis8300-evr.opi</file>
-    <x>9</x>
-    <y>390</y>
-    <width>595</width>
-    <height>161</height>
+    <file>sis8300-evr.bob</file>
+    <x>690</x>
+    <y>50</y>
+    <width>610</width>
+    <height>340</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -985,4 +1007,94 @@
       </color>
     </border_color>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_18</name>
+    <text>Driver message</text>
+    <y>610</y>
+    <width>650</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_19</name>
+    <text>EVR settings</text>
+    <x>670</x>
+    <width>650</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_20</name>
+    <text>Device Information</text>
+    <width>650</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_21</name>
+    <text>Timing Settings</text>
+    <x>670</x>
+    <y>400</y>
+    <width>650</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey02-title_22</name>
+    <text>Acquisition Settings</text>
+    <y>330</y>
+    <width>650</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="WHITE" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
 </display>