diff --git a/NON-APPROVED/lebt-010_vac/LEBT.bob b/NON-APPROVED/lebt-010_vac/LEBT.bob
index d32dcdc71b8fa421844e48d5bce444d04720ce2c..5d661d83c5f58be710af61089cdb3cba1fdaed45 100644
--- a/NON-APPROVED/lebt-010_vac/LEBT.bob
+++ b/NON-APPROVED/lebt-010_vac/LEBT.bob
@@ -42,7 +42,7 @@
       <action type="open_display">
         <file>Trending LEBT-010 VGC.bob</file>
         <target>tab</target>
-        <description>Open Display</description>
+        <description>Open VGC Trends</description>
       </action>
     </actions>
     <text>Open
@@ -67,8 +67,8 @@ VGC Trends</text>
     <actions>
       <action type="open_display">
         <file>diagnostics.bob</file>
-        <target>standalone</target>
-        <description>Open Display</description>
+        <target>window</target>
+        <description>Open Diagnostics</description>
       </action>
     </actions>
     <text>Open
@@ -93,8 +93,8 @@ Diagnostics</text>
     <actions>
       <action type="open_display">
         <file>$(WIDGET_ROOT)/COMMON/legend.bob</file>
-        <target>standalone</target>
-        <description>Open Display</description>
+        <target>window</target>
+        <description>Open Legend</description>
       </action>
     </actions>
     <text>Open
@@ -134,10 +134,10 @@ Legend</text>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Hydrogen bottle</name>
-    <file>$(WIDGET_ROOT)/gas-cylinder/gas-cylinder.bob</file>
     <macros>
       <Gas>H2</Gas>
     </macros>
+    <file>$(WIDGET_ROOT)/gas-cylinder/gas-cylinder.bob</file>
     <x>63</x>
     <y>555</y>
     <width>38</width>
@@ -149,11 +149,6 @@ Legend</text>
     <y>102</y>
     <width>300</width>
     <height>539</height>
-    <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
-      </color>
-    </line_color>
-    <line_style>1</line_style>
     <points>
       <point x="300.0" y="0.0">
       </point>
@@ -162,6 +157,11 @@ Legend</text>
       <point x="0.0" y="539.0">
       </point>
     </points>
+    <line_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </line_color>
+    <line_style>1</line_style>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>From Hydrogen</name>
@@ -343,17 +343,17 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VVMC-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vvmc/vac_vvmc.bob</file>
     <macros>
       <CONTROLLER>ISrc-$(SUBSEC):$(DIS)-VEVMC-01100</CONTROLLER>
       <DEV>VVMC</DEV>
       <IDX>01100</IDX>
       <SEC>ISrc</SEC>
     </macros>
+    <file>$(WIDGET_ROOT)/vvmc/vac_vvmc.bob</file>
     <x>144</x>
     <y>424</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="label" version="2.0.0">
@@ -377,17 +377,16 @@ pvSymbol.write(colorID);
     <y>507</y>
     <width>50</width>
     <height>1</height>
-    <arrows>2</arrows>
     <points>
       <point x="0.0" y="0.0">
       </point>
       <point x="50.0" y="0.0">
       </point>
     </points>
+    <arrows>2</arrows>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vgd/vac_vgd.bob</file>
     <macros>
       <CONTROLLER>ISrc-$(SUBSEC):$(DIS)-VEVMC-01100</CONTROLLER>
       <DEV>VGD</DEV>
@@ -395,10 +394,11 @@ pvSymbol.write(colorID);
       <PIPE_RIGHT>true</PIPE_RIGHT>
       <SEC>ISrc</SEC>
     </macros>
+    <file>$(WIDGET_ROOT)/vgd/vac_vgd.bob</file>
     <x>144</x>
     <y>532</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="polyline" version="2.0.0">
@@ -473,10 +473,10 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Nitrogen bottle</name>
-    <file>$(WIDGET_ROOT)/gas-cylinder/gas-cylinder.bob</file>
     <macros>
       <Gas>N2</Gas>
     </macros>
+    <file>$(WIDGET_ROOT)/gas-cylinder/gas-cylinder.bob</file>
     <x>775</x>
     <y>406</y>
     <width>38</width>
@@ -639,16 +639,16 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VVM-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vvm/vac_angle-vvm.bob</file>
     <macros>
       <DEV>VVM</DEV>
       <IDX>00021</IDX>
       <PIPE_RIGHT>true</PIPE_RIGHT>
     </macros>
+    <file>$(WIDGET_ROOT)/vvm/vac_angle-vvm.bob</file>
     <x>140</x>
     <y>764</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="label" version="2.0.0">
@@ -667,7 +667,6 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vgp/vac_vgp.bob</file>
     <macros>
       <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEG-00011</CONTROLLER>
       <DEV>VGP</DEV>
@@ -676,30 +675,30 @@ pvSymbol.write(colorID);
       <RELAY1_DESC>Process PLC: Manifold under vacuum</RELAY1_DESC>
       <RELAY2_DESC>Process PLC: (VVA-02100 + VVA-03100) Local protection</RELAY2_DESC>
     </macros>
+    <file>$(WIDGET_ROOT)/vgp/vac_vgp.bob</file>
     <x>246</x>
     <y>690</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file>
     <macros>
       <DEV>VVA</DEV>
       <IDX>02100</IDX>
       <PIPE_BELOW>true</PIPE_BELOW>
       <PIPE_RIGHT>true</PIPE_RIGHT>
     </macros>
+    <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file>
     <x>334</x>
     <y>612</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VPT-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file>
     <macros>
       <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEPT-$(IDX)</CONTROLLER>
       <DEV>VPT</DEV>
@@ -707,15 +706,15 @@ pvSymbol.write(colorID);
       <PIPE_ABOVE>true</PIPE_ABOVE>
       <PIPE_BELOW>true</PIPE_BELOW>
     </macros>
+    <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file>
     <x>433</x>
     <y>535</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VPT-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file>
     <macros>
       <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEPT-$(IDX)</CONTROLLER>
       <DEV>VPT</DEV>
@@ -723,15 +722,15 @@ pvSymbol.write(colorID);
       <PIPE_ABOVE>true</PIPE_ABOVE>
       <PIPE_BELOW>true</PIPE_BELOW>
     </macros>
+    <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file>
     <x>579</x>
     <y>535</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file>
     <macros>
       <DEV>VVA</DEV>
       <IDX>03100</IDX>
@@ -739,45 +738,45 @@ pvSymbol.write(colorID);
       <PIPE_LEFT>true</PIPE_LEFT>
       <ROTATION>90</ROTATION>
     </macros>
+    <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file>
     <x>689</x>
     <y>612</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vva/vac_straight-vva.bob</file>
     <macros>
       <BYPASS>true</BYPASS>
       <DEV>VVA</DEV>
       <IDX>00041</IDX>
       <PIPE_HORIZONTAL>true</PIPE_HORIZONTAL>
     </macros>
+    <file>$(WIDGET_ROOT)/vva/vac_straight-vva.bob</file>
     <x>912</x>
     <y>764</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file>
     <macros>
       <DEV>VVA</DEV>
       <IDX>01100</IDX>
       <PIPE_BELOW>true</PIPE_BELOW>
       <PIPE_RIGHT>true</PIPE_RIGHT>
     </macros>
+    <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file>
     <x>723</x>
     <y>118</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file>
     <macros>
       <DEV>VVA</DEV>
       <IDX>00031</IDX>
@@ -785,43 +784,43 @@ pvSymbol.write(colorID);
       <PIPE_LEFT>true</PIPE_LEFT>
       <ROTATION>90</ROTATION>
     </macros>
+    <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file>
     <x>546</x>
     <y>826</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VPDP-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vpp-vpdp/vac_vpp-vpdp.bob</file>
     <macros>
       <DEV>VPDP</DEV>
       <IDX>00031</IDX>
       <PIPE_ABOVE>true</PIPE_ABOVE>
     </macros>
+    <file>$(WIDGET_ROOT)/vpp-vpdp/vac_vpp-vpdp.bob</file>
     <x>546</x>
     <y>900</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VVS-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vvs/vac_vvs.bob</file>
     <macros>
       <DEV>VVS</DEV>
       <IDX>20000</IDX>
       <PIPE_HORIZONTAL>true</PIPE_HORIZONTAL>
     </macros>
+    <file>$(WIDGET_ROOT)/vvs/vac_vvs.bob</file>
     <x>1161</x>
     <y>482</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vgc/vac_vgc.bob</file>
     <macros>
       <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEG-10001</CONTROLLER>
       <DEV>VGC</DEV>
@@ -832,15 +831,15 @@ pvSymbol.write(colorID);
       <RELAY3_DESC>Process PLC: Gas Injection VVA Interlock</RELAY3_DESC>
       <RELAY4_DESC>&lt;not wired&gt;</RELAY4_DESC>
     </macros>
+    <file>$(WIDGET_ROOT)/vgc/vac_vgc.bob</file>
     <x>462</x>
     <y>329</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vgp/vac_vgp.bob</file>
     <macros>
       <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEG-10001</CONTROLLER>
       <DEV>VGP</DEV>
@@ -849,29 +848,29 @@ pvSymbol.write(colorID);
       <RELAY1_DESC>Process PLC: Atmospheric pressure</RELAY1_DESC>
       <RELAY2_DESC>Process PLC: "Vacuum" -&gt; Threshold to start the VPTs</RELAY2_DESC>
     </macros>
+    <file>$(WIDGET_ROOT)/vgp/vac_vgp.bob</file>
     <x>325</x>
     <y>329</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vgr/vac_vgr.bob</file>
     <macros>
       <DEV>VGR</DEV>
       <IDX>10000</IDX>
       <PIPE_LEFT>true</PIPE_LEFT>
     </macros>
+    <file>$(WIDGET_ROOT)/vgr/vac_vgr.bob</file>
     <x>462</x>
     <y>402</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vgd/vac_vgd.bob</file>
     <macros>
       <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEVMC-10001</CONTROLLER>
       <DEV>VGD</DEV>
@@ -880,39 +879,40 @@ pvSymbol.write(colorID);
       <RELAY1_DESC>Interlock PLC: Not used</RELAY1_DESC>
       <RELAY2_DESC>Process PLC: Not used</RELAY2_DESC>
     </macros>
+    <file>$(WIDGET_ROOT)/vgd/vac_vgd.bob</file>
     <x>389</x>
     <y>257</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VVMC-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vvmc/vac_vvmc.bob</file>
     <macros>
       <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEVMC-10001</CONTROLLER>
       <DEV>VVMC</DEV>
       <IDX>01100</IDX>
     </macros>
+    <file>$(WIDGET_ROOT)/vvmc/vac_vvmc.bob</file>
     <x>856</x>
     <y>103</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VVM-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vvm/vac_straight-vvm.bob</file>
     <macros>
       <DEV>VVM</DEV>
       <IDX>00012</IDX>
       <PIPE_VERTICAL>true</PIPE_VERTICAL>
       <ROTATION>270</ROTATION>
     </macros>
+    <file>$(WIDGET_ROOT)/vvm/vac_straight-vvm.bob</file>
     <x>723</x>
     <y>189</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="label" version="2.0.0">
@@ -931,17 +931,17 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VVM-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vvm/vac_straight-vvm.bob</file>
     <macros>
       <DEV>VVM</DEV>
       <IDX>00011</IDX>
       <PIPE_VERTICAL>true</PIPE_VERTICAL>
       <ROTATION>270</ROTATION>
     </macros>
+    <file>$(WIDGET_ROOT)/vvm/vac_straight-vvm.bob</file>
     <x>723</x>
     <y>331</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="label" version="2.0.0">
@@ -960,7 +960,6 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VVM-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vvm/vac_angle-vvm.bob</file>
     <macros>
       <DEV>VVM</DEV>
       <IDX>01100</IDX>
@@ -968,24 +967,25 @@ pvSymbol.write(colorID);
       <PIPE_LEFT>true</PIPE_LEFT>
       <ROTATION>90</ROTATION>
     </macros>
+    <file>$(WIDGET_ROOT)/vvm/vac_angle-vvm.bob</file>
     <x>989</x>
     <y>118</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VVM-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vvm/vac_angle-vvm.bob</file>
     <macros>
       <DEV>VVM</DEV>
       <IDX>10000</IDX>
       <PIPE_RIGHT>true</PIPE_RIGHT>
     </macros>
+    <file>$(WIDGET_ROOT)/vvm/vac_angle-vvm.bob</file>
     <x>325</x>
     <y>402</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="label" version="2.0.0">
@@ -1004,17 +1004,17 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file>
     <macros>
       <DEV>VVA</DEV>
       <IDX>00071</IDX>
       <PIPE_BELOW>true</PIPE_BELOW>
       <PIPE_RIGHT>true</PIPE_RIGHT>
     </macros>
+    <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file>
     <x>1465</x>
     <y>826</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
     <border_color>
       <color red="0" green="128" blue="255">
@@ -1023,17 +1023,17 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file>
     <macros>
       <DEV>VVA</DEV>
       <IDX>06100</IDX>
       <PIPE_BELOW>true</PIPE_BELOW>
       <PIPE_RIGHT>true</PIPE_RIGHT>
     </macros>
+    <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file>
     <x>1330</x>
     <y>608</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
     <border_color>
       <color red="0" green="128" blue="255">
@@ -1042,7 +1042,6 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file>
     <macros>
       <DEV>VVA</DEV>
       <IDX>07100</IDX>
@@ -1050,10 +1049,11 @@ pvSymbol.write(colorID);
       <PIPE_LEFT>true</PIPE_LEFT>
       <ROTATION>90</ROTATION>
     </macros>
+    <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file>
     <x>1762</x>
     <y>608</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
     <border_color>
       <color red="0" green="128" blue="255">
@@ -1062,16 +1062,16 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VPDP-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vpp-vpdp/vac_vpp-vpdp.bob</file>
     <macros>
       <DEV>VPDP</DEV>
       <IDX>00071</IDX>
       <PIPE_ABOVE>true</PIPE_ABOVE>
     </macros>
+    <file>$(WIDGET_ROOT)/vpp-vpdp/vac_vpp-vpdp.bob</file>
     <x>1465</x>
     <y>900</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
     <border_color>
       <color red="0" green="128" blue="255">
@@ -1080,7 +1080,6 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VPT-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file>
     <macros>
       <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEPT-$(IDX)</CONTROLLER>
       <DEV>VPT</DEV>
@@ -1088,10 +1087,11 @@ pvSymbol.write(colorID);
       <PIPE_ABOVE>true</PIPE_ABOVE>
       <PIPE_BELOW>true</PIPE_BELOW>
     </macros>
+    <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file>
     <x>1465</x>
     <y>535</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
     <border_color>
       <color red="0" green="128" blue="255">
@@ -1100,7 +1100,6 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VPT-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file>
     <macros>
       <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEPT-$(IDX)</CONTROLLER>
       <DEV>VPT</DEV>
@@ -1108,10 +1107,11 @@ pvSymbol.write(colorID);
       <PIPE_ABOVE>true</PIPE_ABOVE>
       <PIPE_BELOW>true</PIPE_BELOW>
     </macros>
+    <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file>
     <x>1627</x>
     <y>535</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
     <border_color>
       <color red="0" green="128" blue="255">
@@ -1120,7 +1120,6 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vgc/vac_vgc.bob</file>
     <macros>
       <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEG-10001</CONTROLLER>
       <DEV>VGC</DEV>
@@ -1131,10 +1130,11 @@ pvSymbol.write(colorID);
       <RELAY3_DESC>Process PLC: Not used</RELAY3_DESC>
       <RELAY4_DESC>&lt;not wired&gt;</RELAY4_DESC>
     </macros>
+    <file>$(WIDGET_ROOT)/vgc/vac_vgc.bob</file>
     <x>1756</x>
     <y>329</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
     <border_color>
       <color red="0" green="128" blue="255">
@@ -1143,7 +1143,6 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vgp/vac_vgp.bob</file>
     <macros>
       <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEG-10001</CONTROLLER>
       <DEV>VGP</DEV>
@@ -1152,10 +1151,11 @@ pvSymbol.write(colorID);
       <RELAY1_DESC>Process PLC: Atmospheric pressure</RELAY1_DESC>
       <RELAY2_DESC>Process PLC: "Vacuum" -&gt; Threshold to start the VPTs</RELAY2_DESC>
     </macros>
+    <file>$(WIDGET_ROOT)/vgp/vac_vgp.bob</file>
     <x>1619</x>
     <y>329</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
     <border_color>
       <color red="0" green="128" blue="255">
@@ -1164,16 +1164,16 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VVM-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vvm/vac_angle-vvm.bob</file>
     <macros>
       <DEV>VVM</DEV>
       <IDX>30000</IDX>
       <PIPE_RIGHT>true</PIPE_RIGHT>
     </macros>
+    <file>$(WIDGET_ROOT)/vvm/vac_angle-vvm.bob</file>
     <x>1619</x>
     <y>402</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="label" version="2.0.0">
@@ -1192,20 +1192,19 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VVS-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vvs/vac_vvs.bob</file>
     <macros>
       <DEV>VVS</DEV>
       <IDX>40000</IDX>
     </macros>
+    <file>$(WIDGET_ROOT)/vvs/vac_vvs.bob</file>
     <x>1992</x>
     <y>482</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vgp/vac_vgp.bob</file>
     <macros>
       <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEG-00011</CONTROLLER>
       <DEV>VGP</DEV>
@@ -1214,10 +1213,11 @@ pvSymbol.write(colorID);
       <RELAY1_DESC>Process PLC: Manifold under vacuum</RELAY1_DESC>
       <RELAY2_DESC>Process PLC: (VVA-06100 + VVA-07100) Local protection</RELAY2_DESC>
     </macros>
+    <file>$(WIDGET_ROOT)/vgp/vac_vgp.bob</file>
     <x>1896</x>
     <y>717</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
     <border_color>
       <color red="0" green="128" blue="255">
@@ -1226,17 +1226,17 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VVM-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vvm/vac_angle-vvm.bob</file>
     <macros>
       <DEV>VVM</DEV>
       <IDX>00081</IDX>
       <PIPE_LEFT>true</PIPE_LEFT>
       <ROTATION>90</ROTATION>
     </macros>
+    <file>$(WIDGET_ROOT)/vvm/vac_angle-vvm.bob</file>
     <x>2031</x>
     <y>764</y>
-    <width>131</width>
-    <height>68</height>
+    <width>133</width>
+    <height>70</height>
     <resize>2</resize>
     <border_color>
       <color red="0" green="128" blue="255">
@@ -1259,28 +1259,28 @@ pvSymbol.write(colorID);
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vpg/vac-vpg.bob</file>
     <macros>
       <DEV>VPG</DEV>
       <IDX>10001</IDX>
     </macros>
+    <file>$(WIDGET_ROOT)/vpg/vac-vpg.bob</file>
     <x>720</x>
     <y>850</y>
-    <width>318</width>
-    <height>302</height>
+    <width>320</width>
+    <height>304</height>
     <resize>2</resize>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
-    <file>$(WIDGET_ROOT)/vpg/vac-vpg.bob</file>
     <macros>
       <DEV>VPG</DEV>
       <IDX>20001</IDX>
     </macros>
+    <file>$(WIDGET_ROOT)/vpg/vac-vpg.bob</file>
     <x>1682</x>
     <y>850</y>
-    <width>318</width>
-    <height>302</height>
+    <width>320</width>
+    <height>304</height>
     <resize>2</resize>
   </widget>
 </display>
diff --git a/NON-APPROVED/rfq-010_vac/RFQ.bob b/NON-APPROVED/rfq-010_vac/RFQ.bob
index 6a0ca8e7c23acb316fb7072895383be105af2c32..e866ff8dad48ffbb06693971656022d7900d61a5 100644
--- a/NON-APPROVED/rfq-010_vac/RFQ.bob
+++ b/NON-APPROVED/rfq-010_vac/RFQ.bob
@@ -41,7 +41,7 @@
       <action type="open_display">
         <file>Trending RFQ-010 VGC.bob</file>
         <target>tab</target>
-        <description>Open Display</description>
+        <description>Open VGC Trends</description>
       </action>
     </actions>
     <text>Open
@@ -66,8 +66,8 @@ VGC Trends</text>
     <actions>
       <action type="open_display">
         <file>diagnostics.bob</file>
-        <target>standalone</target>
-        <description>Open Display</description>
+        <target>window</target>
+        <description>Open Diagnostics</description>
       </action>
     </actions>
     <text>Open
@@ -92,8 +92,8 @@ Diagnostics</text>
     <actions>
       <action type="open_display">
         <file>$(WIDGET_ROOT)/COMMON/legend.bob</file>
-        <target>standalone</target>
-        <description>Open Display</description>
+        <target>window</target>
+        <description>Open Legend</description>
       </action>
     </actions>
     <text>Open
@@ -152,17 +152,17 @@ Legend</text>
       <name>$(SEC)-$(SECTOR) Separator</name>
       <width>800</width>
       <height>800</height>
-      <line_color>
-        <color red="169" green="169" blue="169" alpha="128">
-        </color>
-      </line_color>
-      <line_style>2</line_style>
       <points>
         <point x="800.0" y="0.0">
         </point>
         <point x="800.0" y="800.0">
         </point>
       </points>
+      <line_color>
+        <color red="169" green="169" blue="169" alpha="128">
+        </color>
+      </line_color>
+      <line_style>2</line_style>
     </widget>
     <widget type="label" version="2.0.0">
       <name>$(SEC)-$(SECTOR)</name>
@@ -500,17 +500,17 @@ Legend</text>
       <name>$(SEC)-$(SECTOR) Separator</name>
       <width>400</width>
       <height>800</height>
-      <line_color>
-        <color red="169" green="169" blue="169" alpha="128">
-        </color>
-      </line_color>
-      <line_style>2</line_style>
       <points>
         <point x="400.0" y="0.0">
         </point>
         <point x="400.0" y="800.0">
         </point>
       </points>
+      <line_color>
+        <color red="169" green="169" blue="169" alpha="128">
+        </color>
+      </line_color>
+      <line_style>2</line_style>
     </widget>
     <widget type="label" version="2.0.0">
       <name>$(SEC)-$(SECTOR)</name>
@@ -640,17 +640,17 @@ Legend</text>
       <name>$(SEC)-$(SECTOR) Separator</name>
       <width>300</width>
       <height>800</height>
-      <line_color>
-        <color red="169" green="169" blue="169" alpha="128">
-        </color>
-      </line_color>
-      <line_style>2</line_style>
       <points>
         <point x="300.0" y="0.0">
         </point>
         <point x="300.0" y="800.0">
         </point>
       </points>
+      <line_color>
+        <color red="169" green="169" blue="169" alpha="128">
+        </color>
+      </line_color>
+      <line_style>2</line_style>
     </widget>
     <widget type="label" version="2.0.0">
       <name>$(SEC)-$(SECTOR)</name>
@@ -741,17 +741,17 @@ Legend</text>
       <name>$(SEC)-$(SECTOR) Separator</name>
       <width>400</width>
       <height>800</height>
-      <line_color>
-        <color red="169" green="169" blue="169" alpha="128">
-        </color>
-      </line_color>
-      <line_style>2</line_style>
       <points>
         <point x="400.0" y="0.0">
         </point>
         <point x="400.0" y="800.0">
         </point>
       </points>
+      <line_color>
+        <color red="169" green="169" blue="169" alpha="128">
+        </color>
+      </line_color>
+      <line_style>2</line_style>
     </widget>
     <widget type="label" version="2.0.0">
       <name>$(SEC)-$(SECTOR)</name>
@@ -882,17 +882,17 @@ Legend</text>
       <name>$(SEC)-$(SECTOR) Separator</name>
       <width>600</width>
       <height>800</height>
-      <line_color>
-        <color red="169" green="169" blue="169" alpha="128">
-        </color>
-      </line_color>
-      <line_style>2</line_style>
       <points>
         <point x="600.0" y="0.0">
         </point>
         <point x="600.0" y="800.0">
         </point>
       </points>
+      <line_color>
+        <color red="169" green="169" blue="169" alpha="128">
+        </color>
+      </line_color>
+      <line_style>2</line_style>
     </widget>
     <widget type="label" version="2.0.0">
       <name>$(SEC)-$(SECTOR)</name>
@@ -1252,16 +1252,16 @@ Leak Testing</text>
     <y>300</y>
     <width>1</width>
     <height>810</height>
-    <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
-      </color>
-    </line_color>
-    <line_style>1</line_style>
     <points>
       <point x="0.0" y="0.0">
       </point>
       <point x="0.0" y="810.0">
       </point>
     </points>
+    <line_color>
+      <color name="Grid" red="169" green="169" blue="169">
+      </color>
+    </line_color>
+    <line_style>1</line_style>
   </widget>
 </display>