diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_10.py b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_10.py
index 08df9d452425c3f1915751913797291aff2be9f8..219dc1366eaa7f17f264a8a8b9de2940a8020bd4 100755
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_10.py
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_10.py
@@ -25,26 +25,26 @@ iocstats_ = "LAB-010"
 ioc_ = "RFS-FIM-110"
 
 # Analog input macros
-ai00_ = "RFS-Mod-110:Cur"
-ai01_ = "RFS-Mod-110:Vol"
-ai02_ = "RFS-SolPS-110:Cur"
-ai03_ = "RFS-SolPS-120:Cur"
-ai04_ = "RFS-SolPS-130:Cur"
-ai05_ = "RFS-FIM-110:AI5"
-ai06_ = "RFS-FIM-110:AI6"
-ai07_ = "RFS-FIM-110:AI7"
-ai08_ = "RFS-FIM-110:AI8"
-ai09_ = "RFS-FIM-110:AI9"
-ai10_ = "RFS-DirC-110:PwrFwdDA"
-ai11_ = "RFS-DirC-110:PwrFwdPA"
-ai12_ = "RFS-DirC-110:PwrFwdL2"
-ai13_ = "RFS-DirC-110:PwrRflctPA"
-ai14_ = "RFS-DirC-110:PwrFwdC1"
-ai15_ = "RFS-DirC-110:PwrFwdC2"
-ai16_ = "RFS-DirC-110:PwrFwdL1"
-ai17_ = "RFS-DirC-110:PwrRflctL2"
-ai18_ = "RFS-DirC-110:PwrRflctC1"
-ai19_ = "RFS-DirC-110:PwrRflctC2"
+ai10_ = "RFS-Mod-110:Cur"
+ai11_ = "RFS-Mod-110:Vol"
+ai12_ = "RFS-SolPS-110:Cur"
+ai13_ = "RFS-SolPS-120:Cur"
+ai14_ = "RFS-SolPS-130:Cur"
+ai15_ = "RFS-FIM-110:AI5"
+ai16_ = "RFS-FIM-110:AI6"
+ai17_ = "RFS-FIM-110:AI7"
+ai18_ = "RFS-FIM-110:AI8"
+ai19_ = "RFS-FIM-110:AI9"
+ai00_ = "RFS-DirC-110:PwrFwdDA"
+ai01_ = "RFS-DirC-110:PwrFwdPA"
+ai02_ = "RFS-DirC-110:PwrFwdL2"
+ai03_ = "RFS-DirC-110:PwrRflctPA"
+ai04_ = "RFS-DirC-110:PwrFwdC1"
+ai05_ = "RFS-DirC-110:PwrFwdC2"
+ai06_ = "RFS-DirC-110:PwrFwdL1"
+ai07_ = "RFS-DirC-110:PwrRflctL2"
+ai08_ = "RFS-DirC-110:PwrRflctC1"
+ai09_ = "RFS-DirC-110:PwrRflctC2"
 
 di00_ = "RFS-SIM-110:HvEnaCmd"
 di01_ = "RFS-SIM-110:RfEnaCmd"
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_11.py b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_11.py
index 656c71296478d6f33d0cb3b6452a0f44aa4ab2fe..5150a6e85dd000b4627cba69261df79d3d471b1c 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_11.py
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_lab_11.py
@@ -25,26 +25,26 @@ iocstats_ = "LAB-011"
 ioc_ = "RFS-FIM-110"
 
 # Analog input macros
-ai00_ = "RFS-Mod-110:Cur"
-ai01_ = "RFS-Mod-110:Vol"
-ai02_ = "RFS-SolPS-110:Cur"
-ai03_ = "RFS-SolPS-120:Cur"
-ai04_ = "RFS-SolPS-130:Cur"
-ai05_ = "RFS-FIM-110:AI5"
-ai06_ = "RFS-FIM-110:AI6"
-ai07_ = "RFS-FIM-110:AI7"
-ai08_ = "RFS-FIM-110:AI8"
-ai09_ = "RFS-FIM-110:AI9"
-ai10_ = "RFS-DirC-110:PwrFwdDA"
-ai11_ = "RFS-DirC-110:PwrFwdPA"
-ai12_ = "RFS-DirC-110:PwrFwdL2"
-ai13_ = "RFS-DirC-110:PwrRflctPA"
-ai14_ = "RFS-DirC-110:PwrFwdC1"
-ai15_ = "RFS-DirC-110:PwrFwdC2"
-ai16_ = "RFS-DirC-110:PwrFwdL1"
-ai17_ = "RFS-DirC-110:PwrRflctL2"
-ai18_ = "RFS-DirC-110:PwrRflctC1"
-ai19_ = "RFS-DirC-110:PwrRflctC2"
+ai10_ = "RFS-Mod-110:Cur"
+ai11_ = "RFS-Mod-110:Vol"
+ai12_ = "RFS-SolPS-110:Cur"
+ai13_ = "RFS-SolPS-120:Cur"
+ai14_ = "RFS-SolPS-130:Cur"
+ai15_ = "RFS-FIM-110:AI5"
+ai16_ = "RFS-FIM-110:AI6"
+ai17_ = "RFS-FIM-110:AI7"
+ai18_ = "RFS-FIM-110:AI8"
+ai19_ = "RFS-FIM-110:AI9"
+ai00_ = "RFS-DirC-110:PwrFwdDA"
+ai01_ = "RFS-DirC-110:PwrFwdPA"
+ai02_ = "RFS-DirC-110:PwrFwdL2"
+ai03_ = "RFS-DirC-110:PwrRflctPA"
+ai04_ = "RFS-DirC-110:PwrFwdC1"
+ai05_ = "RFS-DirC-110:PwrFwdC2"
+ai06_ = "RFS-DirC-110:PwrFwdL1"
+ai07_ = "RFS-DirC-110:PwrRflctL2"
+ai08_ = "RFS-DirC-110:PwrRflctC1"
+ai09_ = "RFS-DirC-110:PwrRflctC2"
 
 di00_ = "RFS-SIM-110:HvEnaCmd"
 di01_ = "RFS-SIM-110:RfEnaCmd"
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_rfq_01.py b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_rfq_01.py
index 94049a1d4eac4b34f581c45b27ee3c6426975e13..0233424f120b800f87e3600f7979e92a3d7177ca 100755
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_rfq_01.py
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/scripts/fim_macros_rfq_01.py
@@ -25,26 +25,26 @@ iocstats_ = "RFQ-010"
 ioc_ = "RFS-FIM-110"
 
 # Analog input macros
-ai00_ = "RFS-Mod-110:Cur"
-ai01_ = "RFS-Mod-110:Vol"
-ai02_ = "RFS-SolPS-110:Cur"
-ai03_ = "RFS-SolPS-120:Cur"
-ai04_ = "RFS-SolPS-130:Cur"
-ai05_ = "RFS-FIM-110:AI5"
-ai06_ = "RFS-FIM-110:AI6"
-ai07_ = "RFS-FIM-110:AI7"
-ai08_ = "RFS-FIM-110:AI8"
-ai09_ = "RFS-FIM-110:AI9"
-ai10_ = "RFS-DirC-110:PwrFwdDA"
-ai11_ = "RFS-DirC-110:PwrFwdPA"
-ai12_ = "RFS-DirC-110:PwrFwdL2"
-ai13_ = "RFS-DirC-110:PwrRflctPA"
-ai14_ = "RFS-DirC-110:PwrFwdC1"
-ai15_ = "RFS-DirC-110:PwrFwdC2"
-ai16_ = "RFS-DirC-110:PwrFwdL1"
-ai17_ = "RFS-DirC-110:PwrRflctL2"
-ai18_ = "RFS-DirC-110:PwrRflctC1"
-ai19_ = "RFS-DirC-110:PwrRflctC2"
+ai10_ = "RFS-Mod-110:Cur"
+ai11_ = "RFS-Mod-110:Vol"
+ai12_ = "RFS-SolPS-110:Cur"
+ai13_ = "RFS-SolPS-120:Cur"
+ai14_ = "RFS-SolPS-130:Cur"
+ai15_ = "RFS-FIM-110:AI5"
+ai16_ = "RFS-FIM-110:AI6"
+ai17_ = "RFS-FIM-110:AI7"
+ai18_ = "RFS-FIM-110:AI8"
+ai19_ = "RFS-FIM-110:AI9"
+ai00_ = "RFS-DirC-110:PwrFwdDA"
+ai01_ = "RFS-DirC-110:PwrFwdPA"
+ai02_ = "RFS-DirC-110:PwrFwdL2"
+ai03_ = "RFS-DirC-110:PwrRflctPA"
+ai04_ = "RFS-DirC-110:PwrFwdC1"
+ai05_ = "RFS-DirC-110:PwrFwdC2"
+ai06_ = "RFS-DirC-110:PwrFwdL1"
+ai07_ = "RFS-DirC-110:PwrRflctL2"
+ai08_ = "RFS-DirC-110:PwrRflctC1"
+ai09_ = "RFS-DirC-110:PwrRflctC2"
 
 di00_ = "RFS-SIM-110:HvEnaCmd"
 di01_ = "RFS-SIM-110:RfEnaCmd"
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/ChOverview_v02.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/ChOverview_v02.bob
index 728922ec0b0ab7c2b4e757d60e1711e6f37b09d0..b5f82b3b88847b5cc4bc60209e4f296005859bec 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/ChOverview_v02.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/ChOverview_v02.bob
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>FIM Channel Overview v02</name>
+  <width>910</width>
   <height>34</height>
   <widget type="textupdate" version="2.0.0">
     <name>LED_8</name>
     <pv_name>$(PREFIX):$(DEVICE):HVToRF-RB</pv_name>
-    <x>580</x>
+    <x>685</x>
     <y>7</y>
     <width>70</width>
     <height>21</height>
@@ -58,7 +59,7 @@
   <widget type="label" version="2.0.0">
     <name>LED_5</name>
     <text>NOK</text>
-    <x>560</x>
+    <x>665</x>
     <y>7</y>
     <width>20</width>
     <height>21</height>
@@ -107,7 +108,7 @@
       </action>
     </actions>
     <text>...</text>
-    <x>670</x>
+    <x>775</x>
     <y>5</y>
     <width>30</width>
     <height>24</height>
@@ -120,7 +121,7 @@
   <widget type="textupdate" version="2.0.0">
     <name>LED_6</name>
     <pv_name>$(PREFIX):$(DEVICE):IdleToHV-RB</pv_name>
-    <x>470</x>
+    <x>575</x>
     <y>7</y>
     <width>70</width>
     <height>21</height>
@@ -173,7 +174,7 @@
   <widget type="label" version="2.0.0">
     <name>LED_7</name>
     <text>NOK</text>
-    <x>450</x>
+    <x>555</x>
     <y>7</y>
     <width>20</width>
     <height>21</height>
@@ -215,7 +216,7 @@
   <widget type="picture" version="2.0.0">
     <name>Picture_4</name>
     <file>symbols/interlock_healthy_cms@32.png</file>
-    <x>770</x>
+    <x>875</x>
     <y>5</y>
     <width>24</width>
     <height>24</height>
@@ -231,9 +232,9 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_6</name>
     <pv_name>$(PREFIX):$(DEVICE).DESC</pv_name>
-    <x>237</x>
+    <x>290</x>
     <y>7</y>
-    <width>200</width>
+    <width>250</width>
     <transparent>true</transparent>
     <vertical_alignment>1</vertical_alignment>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -243,11 +244,7 @@
     <text>$(PREFIX):$(DEVICE)</text>
     <x>40</x>
     <y>7</y>
-    <width>180</width>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="10.0">
-      </font>
-    </font>
+    <width>240</width>
     <vertical_alignment>1</vertical_alignment>
   </widget>
   <widget type="label" version="2.0.0">
@@ -272,7 +269,7 @@
     </actions>
     <pv_name>$(PREFIX):$(DEVICE):resetIlck</pv_name>
     <text></text>
-    <x>770</x>
+    <x>875</x>
     <y>5</y>
     <width>22</width>
     <height>22</height>
@@ -285,7 +282,7 @@
   <widget type="led" version="2.0.0">
     <name>LED</name>
     <pv_name>$(PREFIX):$(DEVICE):FastIntStat</pv_name>
-    <x>730</x>
+    <x>835</x>
     <y>5</y>
     <width>25</width>
     <height>25</height>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitions_fim_v02.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitions_fim_v02.bob
index bd0c934215d16980aa7cfe62a8fa0a3a520c7c5b..f79018f9807e9edd8244a314a9141f057bfb2e4d 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitions_fim_v02.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/transitions_fim_v02.bob
@@ -5,7 +5,7 @@
     <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
     <ch_index>AI0</ch_index>
   </macros>
-  <width>1715</width>
+  <width>1970</width>
   <height>1080</height>
   <actions>
   </actions>
@@ -13,7 +13,7 @@
     <name>Analog Inputs</name>
     <x>18</x>
     <y>11</y>
-    <width>840</width>
+    <width>942</width>
     <height>1049</height>
     <style>3</style>
     <background_color>
@@ -22,7 +22,7 @@
     </background_color>
     <widget type="rectangle" version="2.0.0">
       <name>MGGrey03-background</name>
-      <width>840</width>
+      <width>941</width>
       <height>1049</height>
       <line_width>2</line_width>
       <line_color>
@@ -55,7 +55,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_32</name>
       <text>pre</text>
-      <x>578</x>
+      <x>686</x>
       <y>60</y>
       <width>40</width>
       <font>
@@ -67,7 +67,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_18</name>
       <text>RF ON</text>
-      <x>598</x>
+      <x>702</x>
       <y>60</y>
       <width>72</width>
       <font>
@@ -80,7 +80,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_20</name>
       <text>HV ON</text>
-      <x>489</x>
+      <x>596</x>
       <y>60</y>
       <width>72</width>
       <font>
@@ -93,7 +93,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_21</name>
       <text>pre</text>
-      <x>468</x>
+      <x>575</x>
       <y>60</y>
       <width>40</width>
       <font>
@@ -105,7 +105,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_22</name>
       <text>Description</text>
-      <x>258</x>
+      <x>312</x>
       <y>60</y>
       <width>170</width>
       <font>
@@ -129,15 +129,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_1</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI00)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI0</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>90</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -148,15 +148,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_2</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI01)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI1</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>138</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -167,15 +167,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_3</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI02)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI2</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>186</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -186,15 +186,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_4</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI03)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI3</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>234</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -205,15 +205,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_5</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI04)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI4</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>282</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -224,15 +224,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_6</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI05)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI5</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>330</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -243,15 +243,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_7</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI06)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI6</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>378</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -262,15 +262,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_8</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI07)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI7</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>426</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -281,15 +281,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_9</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI08)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI8</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>474</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -300,15 +300,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_10</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI09)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI9</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>522</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -319,15 +319,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_11</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI10)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI10</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>570</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -338,15 +338,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_12</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI11)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI11</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>618</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -357,15 +357,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_13</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI12)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI12</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>666</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -376,15 +376,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_14</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI14)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI14</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>762</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -395,15 +395,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_15</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI15)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI15</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>810</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -414,15 +414,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_16</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI16)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI16</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>858</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -433,15 +433,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_17</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI17)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI17</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>906</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -452,15 +452,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_18</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI18)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI18</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>954</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -471,15 +471,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_19</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI19)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI19</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>1001</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -490,15 +490,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_21</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(AI13)</DEVICE>
         <EXPERT_DISPLAY>AnalogChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>AI13</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>21</x>
       <y>714</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -510,7 +510,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_19</name>
       <text>ILCK</text>
-      <x>732</x>
+      <x>845</x>
       <y>60</y>
       <width>46</width>
       <font>
@@ -523,7 +523,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_24</name>
       <text>First</text>
-      <x>778</x>
+      <x>884</x>
       <y>60</y>
       <width>46</width>
       <font>
@@ -536,9 +536,9 @@
   </widget>
   <widget type="group" version="2.0.0">
     <name>Digital Inputs</name>
-    <x>870</x>
+    <x>980</x>
     <y>11</y>
-    <width>840</width>
+    <width>950</width>
     <height>1049</height>
     <style>3</style>
     <background_color>
@@ -547,7 +547,7 @@
     </background_color>
     <widget type="rectangle" version="2.0.0">
       <name>MGGrey03-background_1</name>
-      <width>840</width>
+      <width>950</width>
       <height>1049</height>
       <line_width>2</line_width>
       <line_color>
@@ -654,15 +654,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_20</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI00)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI0</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>90</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -673,15 +673,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_22</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI01)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI1</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>138</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -692,15 +692,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_23</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI02)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI2</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>186</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -711,15 +711,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_24</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI03)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI3</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>234</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -730,15 +730,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_25</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI04)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI4</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>282</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -749,15 +749,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_26</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI05)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI5</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>330</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -768,15 +768,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_27</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI06)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI6</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>378</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -787,15 +787,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_28</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI07)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI7</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>426</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -806,15 +806,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_29</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI08)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI8</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>474</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -825,15 +825,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_30</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI09)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI9</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>522</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -844,15 +844,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_31</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI10)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI10</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>570</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -863,15 +863,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_32</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI11)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI11</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>618</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -882,15 +882,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_33</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI12)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI12</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>666</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -901,15 +901,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_34</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI13)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI13</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>714</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -920,15 +920,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_36</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI14)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI14</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>762</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -939,15 +939,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_37</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI15)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI15</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>810</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>
@@ -984,15 +984,15 @@
     </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_42</name>
+      <file>ChOverview_v02.bob</file>
       <macros>
         <DEVICE>$(DI20)</DEVICE>
         <EXPERT_DISPLAY>DigitalChannelGeneric.bob</EXPERT_DISPLAY>
         <ch_index>DI20</ch_index>
       </macros>
-      <file>ChOverview_v02.bob</file>
       <x>20</x>
       <y>858</y>
-      <width>800</width>
+      <width>910</width>
       <height>34</height>
       <resize>2</resize>
       <transparent>true</transparent>