From 5aa58559bc248312535f99fe285971dfebc46b58 Mon Sep 17 00:00:00 2001
From: Benjamin Bolling <benjaminbolling@ci0021286.esss.lu.se>
Date: Fri, 14 Feb 2020 08:46:10 +0100
Subject: [PATCH] Split up cavs/MBL into cavs/MBL[1,2] and cavs/HBL into
 cavs/HBL[1,2,3]. Resized all windows except PBI which is to be done later
 today so that all fits perfectly into current LCR screens.

---
 .../EmbedddedWindows/em_SL_OPI_TS2.bob        |   9 +-
 .../EmbedddedWindows/em_SL_OPI_operations.bob |   9 +-
 .../Main_OPI_Navigator.bob                    |  41 +-
 .../collectedOPIs_01_Beamlines.bob            |  10 +-
 .../collectedOPIs_01_Target.bob               |   6 +-
 .../collectedOPIs_01_beamsettings.bob         |  32 +-
 .../collectedOPIs_01_cavities.bob             |  98 +++-
 .../collectedOPIs_01_cavs_HBL_1.bob           | 384 ++++++++++++++
 .../collectedOPIs_01_cavs_HBL_2.bob           | 384 ++++++++++++++
 ...BL.bob => collectedOPIs_01_cavs_HBL_3.bob} | 502 ++----------------
 .../collectedOPIs_01_cavs_MBL_1.bob           | 175 ++++++
 ...BL.bob => collectedOPIs_01_cavs_MBL_2.bob} | 233 ++------
 .../collectedOPIs_01_cavs_NCL.bob             |   2 -
 .../collectedOPIs_01_cavs_Spk.bob             |  96 ++--
 .../collectedOPIs_01_cryogenics.bob           |   4 +-
 .../collectedOPIs_01_diagnostics.bob          |  28 +-
 .../collectedOPIs_01_magnets.bob              |  19 +-
 .../collectedOPIs_01_mainOverview.bob         |   8 +-
 .../collectedOPIs_01_system.bob               |  35 +-
 .../collectedOPIs_01_systs_interlocks.bob     |  13 +-
 .../collectedOPIs_01_systs_ints_NCL.bob       |   2 +-
 .../collectedOPIs_01_systs_ints_SCL.bob       |   2 +-
 .../collectedOPIs_01_systs_ints_history.bob   |   6 +-
 .../collectedOPIs_01_systs_ints_overview.bob  |   5 +-
 .../collectedOPIs_01_systs_ints_target.bob    |   2 +-
 .../collectedOPIs_01_systs_valvesflows.bob    |  96 ++--
 26 files changed, 1332 insertions(+), 869 deletions(-)
 create mode 100644 NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_1.bob
 create mode 100644 NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_2.bob
 rename NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/{collectedOPIs_01_cavs_HBL.bob => collectedOPIs_01_cavs_HBL_3.bob} (68%)
 create mode 100644 NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL_1.bob
 rename NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/{collectedOPIs_01_cavs_MBL.bob => collectedOPIs_01_cavs_MBL_2.bob} (78%)

diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_SL_OPI_TS2.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_SL_OPI_TS2.bob
index 524310e5..cc32b84b 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_SL_OPI_TS2.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_SL_OPI_TS2.bob
@@ -3,6 +3,7 @@
   <name>SLOPI-TS2</name>
   <class></class>
   <width>460</width>
+  <height>500</height>
   <background_color>
     <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
@@ -10,7 +11,7 @@
   <widget type="group" version="2.0.0">
     <name>ShiftGroup</name>
     <width>460</width>
-    <height>600</height>
+    <height>500</height>
     <style>3</style>
     <background_color>
       <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -20,7 +21,7 @@
     <widget type="rectangle" version="2.0.0">
       <name>group-rectangle-4</name>
       <width>460</width>
-      <height>600</height>
+      <height>500</height>
       <line_width>2</line_width>
       <line_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -70,7 +71,7 @@
       <x>20</x>
       <y>170</y>
       <width>420</width>
-      <height>350</height>
+      <height>260</height>
       <font>
         <font family="Source Sans Pro" style="REGULAR" size="18.0">
         </font>
@@ -123,7 +124,7 @@ PVUtil.writePV(thepv, shiftid,1)]]></text>
       <name>Text Entry</name>
       <pv_name>NSO-LCR:Ops:TSMsg</pv_name>
       <x>20</x>
-      <y>530</y>
+      <y>440</y>
       <width>420</width>
       <height>40</height>
     </widget>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_SL_OPI_operations.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_SL_OPI_operations.bob
index 62d75422..60386e20 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_SL_OPI_operations.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbedddedWindows/em_SL_OPI_operations.bob
@@ -3,6 +3,7 @@
   <name>SLOPI-operations</name>
   <class></class>
   <width>460</width>
+  <height>500</height>
   <background_color>
     <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
@@ -10,7 +11,7 @@
   <widget type="group" version="2.0.0">
     <name>ShiftGroup</name>
     <width>460</width>
-    <height>600</height>
+    <height>500</height>
     <style>3</style>
     <background_color>
       <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -20,7 +21,7 @@
     <widget type="rectangle" version="2.0.0">
       <name>group-rectangle-4</name>
       <width>460</width>
-      <height>600</height>
+      <height>500</height>
       <line_width>2</line_width>
       <line_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -70,7 +71,7 @@
       <x>20</x>
       <y>170</y>
       <width>420</width>
-      <height>350</height>
+      <height>260</height>
       <font>
         <font family="Source Sans Pro" style="REGULAR" size="18.0">
         </font>
@@ -123,7 +124,7 @@ PVUtil.writePV(thepv, shiftid,1)]]></text>
       <name>Text Entry</name>
       <pv_name>NSO-LCR:Ops:Msg</pv_name>
       <x>20</x>
-      <y>530</y>
+      <y>440</y>
       <width>420</width>
       <height>40</height>
     </widget>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Main_OPI_Navigator.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Main_OPI_Navigator.bob
index b664c30b..2aaa3c4d 100755
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Main_OPI_Navigator.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Main_OPI_Navigator.bob
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>Navigator</name>
+  <class></class>
   <macros>
     <ROOT>/Users/benjaminbolling/Library/Mobile Documents/com~apple~CloudDocs/Documents/ESS/Coding/ESS_OPIs</ROOT>
     <limit_blm_auto>loc://limit_blm_auto</limit_blm_auto>
@@ -10,8 +11,8 @@
     <limit_min_blm>loc://limit_min_blm</limit_min_blm>
     <limit_min_bpm>loc://limit_min_bpm</limit_min_bpm>
   </macros>
-  <width>1200</width>
-  <height>900</height>
+  <width>2560</width>
+  <height>1300</height>
   <background_color>
     <color name="BACKGROUND" red="220" green="225" blue="221">
     </color>
@@ -20,7 +21,7 @@
     <name>Rectangle_39</name>
     <y>50</y>
     <width>136</width>
-    <height>1354</height>
+    <height>1250</height>
     <line_width>0</line_width>
     <background_color>
       <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
@@ -29,7 +30,7 @@
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>Rectangle_38</name>
-    <width>2610</width>
+    <width>2560</width>
     <height>50</height>
     <line_width>0</line_width>
     <background_color>
@@ -39,7 +40,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED</name>
-    <x>2160</x>
+    <x>2110</x>
     <y>10</y>
     <width>130</width>
     <height>30</height>
@@ -63,7 +64,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_1</name>
-    <x>2310</x>
+    <x>2260</x>
     <y>10</y>
     <width>130</width>
     <height>30</height>
@@ -87,7 +88,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_2</name>
-    <x>2460</x>
+    <x>2410</x>
     <y>10</y>
     <width>130</width>
     <height>30</height>
@@ -171,8 +172,8 @@
     </tabs>
     <x>14</x>
     <y>50</y>
-    <width>2596</width>
-    <height>1354</height>
+    <width>2546</width>
+    <height>1250</height>
     <tab_width>120</tab_width>
     <tab_height>40</tab_height>
     <tab_spacing>10</tab_spacing>
@@ -195,14 +196,14 @@
     <name>Label_279</name>
     <text>Current User:</text>
     <x>14</x>
-    <y>1350</y>
+    <y>1230</y>
     <height>25</height>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_280</name>
     <text>User Name</text>
     <x>14</x>
-    <y>1375</y>
+    <y>1255</y>
     <height>25</height>
   </widget>
   <widget type="label" version="2.0.0">
@@ -238,7 +239,7 @@
       </action>
     </actions>
     <text>Check States</text>
-    <x>2010</x>
+    <x>1960</x>
     <y>10</y>
     <width>130</width>
     <font>
@@ -259,7 +260,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_mainOverview.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>Main Overview</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -271,7 +272,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_system.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>Main Overview</windowtitle>
           <windowwidth>2500</windowwidth>
         </macros>
@@ -283,7 +284,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_diagnostics.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>Proton Beam Instrumentation</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -295,7 +296,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_beamsettings.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>Beam Settings</windowtitle>
           <windowwidth>2440</windowwidth>
         </macros>
@@ -307,7 +308,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_magnets.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>Magnet Controls Overview</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -319,7 +320,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_cavities.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>Cavities Overview</windowtitle>
           <windowwidth>2500</windowwidth>
         </macros>
@@ -331,7 +332,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_Target.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>Target Overview</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -343,7 +344,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_Beamlines.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>Beamlines Overview</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_Beamlines.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_Beamlines.bob
index a8e6d93c..95540e19 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_Beamlines.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_Beamlines.bob
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>Beamlines</name>
-  <width>1200</width>
-  <height>900</height>
+  <width>2230</width>
+  <height>1270</height>
   <background_color>
     <color name="BACKGROUND" red="220" green="225" blue="221">
     </color>
   </background_color>
   <widget type="picture" version="2.0.0">
     <name>Picture</name>
+    <class></class>
     <file>Figures/target.png</file>
-    <x>20</x>
     <y>20</y>
-    <width>2190</width>
-    <height>1280</height>
+    <width>2350</width>
+    <height>1200</height>
   </widget>
 </display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_Target.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_Target.bob
index 83a48653..10d5f674 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_Target.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_Target.bob
@@ -52,9 +52,9 @@
     </widget>
   </widget>
   <widget type="group" version="2.0.0">
-    <name>WheelGroup_1</name>
-    <x>600</x>
-    <y>20</y>
+    <name>ModeratorGroup</name>
+    <x>20</x>
+    <y>330</y>
     <width>560</width>
     <height>290</height>
     <style>3</style>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_beamsettings.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_beamsettings.bob
index 6409eacd..3ee526f4 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_beamsettings.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_beamsettings.bob
@@ -14,7 +14,7 @@
     <RW_ChopFile>./EmbedddedWindows/em_chopper_rw.bob</RW_ChopFile>
     <RW_MagsFile>./EmbedddedWindows/em_mag_rw.bob</RW_MagsFile>
   </macros>
-  <width>2440</width>
+  <width>2400</width>
   <height>650</height>
   <background_color>
     <color name="Transparent" red="255" green="255" blue="255" alpha="0">
@@ -23,14 +23,14 @@
   <widget type="action_button" version="3.0.0">
     <name>CollimatorButton</name>
     <text>Collimator</text>
-    <x>590</x>
+    <x>560</x>
     <y>30</y>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>IrisButton</name>
     <text>IRIS</text>
-    <x>720</x>
+    <x>690</x>
     <y>30</y>
     <width>90</width>
     <tooltip>$(actions)</tooltip>
@@ -38,7 +38,7 @@
   <widget type="bool_button" version="2.0.0">
     <name>ControllersButton</name>
     <pv_name>loc://pbicontrolbool</pv_name>
-    <x>840</x>
+    <x>810</x>
     <y>30</y>
     <width>160</width>
     <off_label>Controllers Disabled</off_label>
@@ -54,7 +54,7 @@
   </widget>
   <widget type="group" version="2.0.0">
     <name>ISrc</name>
-    <x>560</x>
+    <x>530</x>
     <y>80</y>
     <width>470</width>
     <height>220</height>
@@ -134,7 +134,7 @@
   </widget>
   <widget type="group" version="2.0.0">
     <name>ISrc Magnetron</name>
-    <x>560</x>
+    <x>530</x>
     <y>320</y>
     <width>470</width>
     <height>120</height>
@@ -246,7 +246,7 @@
   </widget>
   <widget type="group" version="2.0.0">
     <name>Repellers</name>
-    <x>560</x>
+    <x>530</x>
     <y>460</y>
     <width>470</width>
     <height>170</height>
@@ -315,7 +315,7 @@
   </widget>
   <widget type="group" version="2.0.0">
     <name>Choppers</name>
-    <x>1050</x>
+    <x>1020</x>
     <y>20</y>
     <width>520</width>
     <height>250</height>
@@ -378,7 +378,7 @@
   </widget>
   <widget type="group" version="2.0.0">
     <name>ModeGroup</name>
-    <x>1590</x>
+    <x>1560</x>
     <y>150</y>
     <width>430</width>
     <height>450</height>
@@ -667,7 +667,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
   </widget>
   <widget type="group" version="2.0.0">
     <name>Destination</name>
-    <x>2040</x>
+    <x>2010</x>
     <y>20</y>
     <width>380</width>
     <height>210</height>
@@ -708,7 +708,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
   </widget>
   <widget type="group" version="2.0.0">
     <name>MatchingGroup_1</name>
-    <x>2040</x>
+    <x>2010</x>
     <y>250</y>
     <width>380</width>
     <height>350</height>
@@ -749,7 +749,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
   </widget>
   <widget type="group" version="2.0.0">
     <name>TrajCorr</name>
-    <x>1050</x>
+    <x>1020</x>
     <y>290</y>
     <width>520</width>
     <height>310</height>
@@ -792,13 +792,13 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     <name>Timing</name>
     <x>20</x>
     <y>20</y>
-    <width>520</width>
+    <width>490</width>
     <height>610</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>MGGrey03-background_19</name>
-      <width>520</width>
+      <width>490</width>
       <height>610</height>
       <line_width>2</line_width>
       <line_color>
@@ -815,7 +815,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
     <widget type="label" version="2.0.0">
       <name>MGGrey03-title_18</name>
       <text>Timing Setup</text>
-      <width>520</width>
+      <width>490</width>
       <height>50</height>
       <font>
         <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
@@ -831,7 +831,7 @@ Used for fast scans to rapidly determine/verify RF setpoints.</tooltip>
   </widget>
   <widget type="group" version="2.0.0">
     <name>BeamInfo</name>
-    <x>1590</x>
+    <x>1560</x>
     <y>20</y>
     <width>430</width>
     <height>110</height>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavities.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavities.bob
index e7ca6606..118adb51 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavities.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavities.bob
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>Cavities</name>
-  <width>1200</width>
-  <height>900</height>
+  <class></class>
+  <width>2370</width>
+  <height>1240</height>
   <background_color>
     <color name="BACKGROUND" red="220" green="225" blue="221">
     </color>
@@ -10,7 +11,7 @@
   <widget type="rectangle" version="2.0.0">
     <name>Rectangle_39</name>
     <width>200</width>
-    <height>1342</height>
+    <height>1236</height>
     <line_width>0</line_width>
     <background_color>
       <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
@@ -42,22 +43,43 @@
         <group_name></group_name>
       </tab>
       <tab>
-        <name>MBL Cavities</name>
-        <file>collectedOPIs_01_cavs_MBL.bob</file>
+        <name>MBL Cavities 1-6</name>
+        <file>collectedOPIs_01_cavs_MBL_1.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
       <tab>
-        <name>HBL Cavities</name>
-        <file>collectedOPIs_01_cavs_HBL.bob</file>
+        <name>MBL Cavities 7-9</name>
+        <file>collectedOPIs_01_cavs_MBL_2.bob</file>
+        <macros>
+        </macros>
+        <group_name></group_name>
+      </tab>
+      <tab>
+        <name>HBL Cavities 1-8</name>
+        <file>collectedOPIs_01_cavs_HBL_1.bob</file>
+        <macros>
+        </macros>
+        <group_name></group_name>
+      </tab>
+      <tab>
+        <name>HBL Cavities 9-16</name>
+        <file>collectedOPIs_01_cavs_HBL_2.bob</file>
+        <macros>
+        </macros>
+        <group_name></group_name>
+      </tab>
+      <tab>
+        <name>HBL Cavities 17-21</name>
+        <file>collectedOPIs_01_cavs_HBL_3.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
       </tab>
     </tabs>
-    <width>2450</width>
-    <height>1342</height>
+    <width>2400</width>
+    <height>1236</height>
     <tab_width>200</tab_width>
     <tab_height>40</tab_height>
     <tab_spacing>10</tab_spacing>
@@ -78,7 +100,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_cavs_NCL.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>NCL Cavities</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -90,7 +112,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_cavs_Spk.bob</detachwindowpath>
-          <windowheight>1500</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>Spk Cavities</windowtitle>
           <windowwidth>2000</windowwidth>
         </macros>
@@ -101,30 +123,66 @@
         <file>detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_cavs_MBL.bob</detachwindowpath>
-          <windowheight>1750</windowheight>
-          <windowtitle>MBL Cavities</windowtitle>
+          <detachwindowpath>collectedOPIs_01_cavs_MBL_1.bob</detachwindowpath>
+          <windowheight>1300</windowheight>
+          <windowtitle>MBL Cavities 1-6</windowtitle>
+          <windowwidth>2350</windowwidth>
+        </macros>
+        <target>window</target>
+        <description>Detach MBL 1-6</description>
+      </action>
+      <action type="open_display">
+        <file>detachwindowcontainer.bob</file>
+        <macros>
+          <ROOT>$(ROOT)</ROOT>
+          <detachwindowpath>collectedOPIs_01_cavs_MBL_2.bob</detachwindowpath>
+          <windowheight>1300</windowheight>
+          <windowtitle>MBL Cavities 7-9 + History Diagram</windowtitle>
+          <windowwidth>2350</windowwidth>
+        </macros>
+        <target>window</target>
+        <description>Detach MBL 7-9</description>
+      </action>
+      <action type="open_display">
+        <file>detachwindowcontainer.bob</file>
+        <macros>
+          <ROOT>$(ROOT)</ROOT>
+          <detachwindowpath>collectedOPIs_01_cavs_HBL_1.bob</detachwindowpath>
+          <windowheight>1300</windowheight>
+          <windowtitle>HBL Cavities 1-8</windowtitle>
+          <windowwidth>2350</windowwidth>
+        </macros>
+        <target>window</target>
+        <description>Detach HBL 1-8</description>
+      </action>
+      <action type="open_display">
+        <file>detachwindowcontainer.bob</file>
+        <macros>
+          <ROOT>$(ROOT)</ROOT>
+          <detachwindowpath>collectedOPIs_01_cavs_HBL_2.bob</detachwindowpath>
+          <windowheight>1300</windowheight>
+          <windowtitle>HBL Cavities 9-16</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
         <target>window</target>
-        <description>Detach MBL</description>
+        <description>Detach HBL 9-16</description>
       </action>
       <action type="open_display">
         <file>detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_cavs_HBL.bob</detachwindowpath>
-          <windowheight>3500</windowheight>
-          <windowtitle>HBL Cavities</windowtitle>
+          <detachwindowpath>collectedOPIs_01_cavs_HBL_3.bob</detachwindowpath>
+          <windowheight>1300</windowheight>
+          <windowtitle>HBL Cavities 17-21 + History Diagram</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
         <target>window</target>
-        <description>Detach HBL</description>
+        <description>Detach HBL 17-21</description>
       </action>
     </actions>
     <text>Detach</text>
     <x>3</x>
-    <y>250</y>
+    <y>400</y>
     <width>185</width>
     <height>40</height>
     <tooltip>$(ROOT)</tooltip>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_1.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_1.bob
new file mode 100644
index 00000000..bd28b5ec
--- /dev/null
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_1.bob
@@ -0,0 +1,384 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Cavities - HBL 1-8</name>
+  <class></class>
+  <macros>
+    <HBL01_K01_amp>$(PV_HBL01_K01_amp)</HBL01_K01_amp>
+    <HBL01_K01_phase>$(PV_HBL01_K01_phase)</HBL01_K01_phase>
+    <HBL01_K02_amp>$(PV_HBL01_K02_amp)</HBL01_K02_amp>
+    <HBL01_K02_phase>$(PV_HBL01_K02_phase)</HBL01_K02_phase>
+    <HBL01_K03_amp>$(PV_HBL01_K03_amp)</HBL01_K03_amp>
+    <HBL01_K03_phase>$(PV_HBL01_K03_phase)</HBL01_K03_phase>
+    <HBL01_K04_amp>$(PV_HBL01_K04_amp)</HBL01_K04_amp>
+    <HBL01_K04_phase>$(PV_HBL01_K04_phase)</HBL01_K04_phase>
+    <HBL02_K01_amp>$(PV_HBL02_K01_amp)</HBL02_K01_amp>
+    <HBL02_K01_phase>$(PV_HBL02_K01_phase)</HBL02_K01_phase>
+    <HBL02_K02_amp>$(PV_HBL02_K02_amp)</HBL02_K02_amp>
+    <HBL02_K02_phase>$(PV_HBL02_K02_phase)</HBL02_K02_phase>
+    <HBL02_K03_amp>$(PV_HBL02_K03_amp)</HBL02_K03_amp>
+    <HBL02_K03_phase>$(PV_HBL02_K03_phase)</HBL02_K03_phase>
+    <HBL02_K04_amp>$(PV_HBL02_K04_amp)</HBL02_K04_amp>
+    <HBL02_K04_phase>$(PV_HBL02_K04_phase)</HBL02_K04_phase>
+    <HBL03_K01_amp>$(PV_HBL03_K01_amp)</HBL03_K01_amp>
+    <HBL03_K01_phase>$(PV_HBL03_K01_phase)</HBL03_K01_phase>
+    <HBL03_K02_amp>$(PV_HBL03_K02_amp)</HBL03_K02_amp>
+    <HBL03_K02_phase>$(PV_HBL03_K02_phase)</HBL03_K02_phase>
+    <HBL03_K03_amp>$(PV_HBL03_K03_amp)</HBL03_K03_amp>
+    <HBL03_K03_phase>$(PV_HBL03_K03_phase)</HBL03_K03_phase>
+    <HBL03_K04_amp>$(PV_HBL03_K04_amp)</HBL03_K04_amp>
+    <HBL03_K04_phase>$(PV_HBL03_K04_phase)</HBL03_K04_phase>
+    <HBL04_K01_amp>$(PV_HBL04_K01_amp)</HBL04_K01_amp>
+    <HBL04_K01_phase>$(PV_HBL04_K01_phase)</HBL04_K01_phase>
+    <HBL04_K02_amp>$(PV_HBL04_K02_amp)</HBL04_K02_amp>
+    <HBL04_K02_phase>$(PV_HBL04_K02_phase)</HBL04_K02_phase>
+    <HBL04_K03_amp>$(PV_HBL04_K03_amp)</HBL04_K03_amp>
+    <HBL04_K03_phase>$(PV_HBL04_K03_phase)</HBL04_K03_phase>
+    <HBL04_K04_amp>$(PV_HBL04_K04_amp)</HBL04_K04_amp>
+    <HBL04_K04_phase>$(PV_HBL04_K04_phase)</HBL04_K04_phase>
+    <HBL05_K01_amp>$(PV_HBL05_K01_amp)</HBL05_K01_amp>
+    <HBL05_K01_phase>$(PV_HBL05_K01_phase)</HBL05_K01_phase>
+    <HBL05_K02_amp>$(PV_HBL05_K02_amp)</HBL05_K02_amp>
+    <HBL05_K02_phase>$(PV_HBL05_K02_phase)</HBL05_K02_phase>
+    <HBL05_K03_amp>$(PV_HBL05_K03_amp)</HBL05_K03_amp>
+    <HBL05_K03_phase>$(PV_HBL05_K03_phase)</HBL05_K03_phase>
+    <HBL05_K04_amp>$(PV_HBL05_K04_amp)</HBL05_K04_amp>
+    <HBL05_K04_phase>$(PV_HBL05_K04_phase)</HBL05_K04_phase>
+    <HBL06_K01_amp>$(PV_HBL06_K01_amp)</HBL06_K01_amp>
+    <HBL06_K01_phase>$(PV_HBL06_K01_phase)</HBL06_K01_phase>
+    <HBL06_K02_amp>$(PV_HBL06_K02_amp)</HBL06_K02_amp>
+    <HBL06_K02_phase>$(PV_HBL06_K02_phase)</HBL06_K02_phase>
+    <HBL06_K03_amp>$(PV_HBL06_K03_amp)</HBL06_K03_amp>
+    <HBL06_K03_phase>$(PV_HBL06_K03_phase)</HBL06_K03_phase>
+    <HBL06_K04_amp>$(PV_HBL06_K04_amp)</HBL06_K04_amp>
+    <HBL06_K04_phase>$(PV_HBL06_K04_phase)</HBL06_K04_phase>
+    <HBL07_K01_amp>$(PV_HBL07_K01_amp)</HBL07_K01_amp>
+    <HBL07_K01_phase>$(PV_HBL07_K01_phase)</HBL07_K01_phase>
+    <HBL07_K02_amp>$(PV_HBL07_K02_amp)</HBL07_K02_amp>
+    <HBL07_K02_phase>$(PV_HBL07_K02_phase)</HBL07_K02_phase>
+    <HBL07_K03_amp>$(PV_HBL07_K03_amp)</HBL07_K03_amp>
+    <HBL07_K03_phase>$(PV_HBL07_K03_phase)</HBL07_K03_phase>
+    <HBL07_K04_amp>$(PV_HBL07_K04_amp)</HBL07_K04_amp>
+    <HBL07_K04_phase>$(PV_HBL07_K04_phase)</HBL07_K04_phase>
+    <HBL08_K01_amp>$(PV_HBL08_K01_amp)</HBL08_K01_amp>
+    <HBL08_K01_phase>$(PV_HBL08_K01_phase)</HBL08_K01_phase>
+    <HBL08_K02_amp>$(PV_HBL08_K02_amp)</HBL08_K02_amp>
+    <HBL08_K02_phase>$(PV_HBL08_K02_phase)</HBL08_K02_phase>
+    <HBL08_K03_amp>$(PV_HBL08_K03_amp)</HBL08_K03_amp>
+    <HBL08_K03_phase>$(PV_HBL08_K03_phase)</HBL08_K03_phase>
+    <HBL08_K04_amp>$(PV_HBL08_K04_amp)</HBL08_K04_amp>
+    <HBL08_K04_phase>$(PV_HBL08_K04_phase)</HBL08_K04_phase>
+    <HBL09_K01_amp>$(PV_HBL09_K01_amp)</HBL09_K01_amp>
+    <HBL09_K01_phase>$(PV_HBL09_K01_phase)</HBL09_K01_phase>
+    <HBL09_K02_amp>$(PV_HBL09_K02_amp)</HBL09_K02_amp>
+    <HBL09_K02_phase>$(PV_HBL09_K02_phase)</HBL09_K02_phase>
+    <HBL09_K03_amp>$(PV_HBL09_K03_amp)</HBL09_K03_amp>
+    <HBL09_K03_phase>$(PV_HBL09_K03_phase)</HBL09_K03_phase>
+    <HBL09_K04_amp>$(PV_HBL09_K04_amp)</HBL09_K04_amp>
+    <HBL09_K04_phase>$(PV_HBL09_K04_phase)</HBL09_K04_phase>
+    <HBL10_K01_amp>$(PV_HBL10_K01_amp)</HBL10_K01_amp>
+    <HBL10_K01_phase>$(PV_HBL10_K01_phase)</HBL10_K01_phase>
+    <HBL10_K02_amp>$(PV_HBL10_K02_amp)</HBL10_K02_amp>
+    <HBL10_K02_phase>$(PV_HBL10_K02_phase)</HBL10_K02_phase>
+    <HBL10_K03_amp>$(PV_HBL10_K03_amp)</HBL10_K03_amp>
+    <HBL10_K03_phase>$(PV_HBL10_K03_phase)</HBL10_K03_phase>
+    <HBL10_K04_amp>$(PV_HBL10_K04_amp)</HBL10_K04_amp>
+    <HBL10_K04_phase>$(PV_HBL10_K04_phase)</HBL10_K04_phase>
+    <HBL11_K01_amp>$(PV_HBL11_K01_amp)</HBL11_K01_amp>
+    <HBL11_K01_phase>$(PV_HBL11_K01_phase)</HBL11_K01_phase>
+    <HBL11_K02_amp>$(PV_HBL11_K02_amp)</HBL11_K02_amp>
+    <HBL11_K02_phase>$(PV_HBL11_K02_phase)</HBL11_K02_phase>
+    <HBL11_K03_amp>$(PV_HBL11_K03_amp)</HBL11_K03_amp>
+    <HBL11_K03_phase>$(PV_HBL11_K03_phase)</HBL11_K03_phase>
+    <HBL11_K04_amp>$(PV_HBL11_K04_amp)</HBL11_K04_amp>
+    <HBL11_K04_phase>$(PV_HBL11_K04_phase)</HBL11_K04_phase>
+    <HBL12_K01_amp>$(PV_HBL12_K01_amp)</HBL12_K01_amp>
+    <HBL12_K01_phase>$(PV_HBL12_K01_phase)</HBL12_K01_phase>
+    <HBL12_K02_amp>$(PV_HBL12_K02_amp)</HBL12_K02_amp>
+    <HBL12_K02_phase>$(PV_HBL12_K02_phase)</HBL12_K02_phase>
+    <HBL12_K03_amp>$(PV_HBL12_K03_amp)</HBL12_K03_amp>
+    <HBL12_K03_phase>$(PV_HBL12_K03_phase)</HBL12_K03_phase>
+    <HBL12_K04_amp>$(PV_HBL12_K04_amp)</HBL12_K04_amp>
+    <HBL12_K04_phase>$(PV_HBL12_K04_phase)</HBL12_K04_phase>
+    <HBL13_K01_amp>$(PV_HBL13_K01_amp)</HBL13_K01_amp>
+    <HBL13_K01_phase>$(PV_HBL13_K01_phase)</HBL13_K01_phase>
+    <HBL13_K02_amp>$(PV_HBL13_K02_amp)</HBL13_K02_amp>
+    <HBL13_K02_phase>$(PV_HBL13_K02_phase)</HBL13_K02_phase>
+    <HBL13_K03_amp>$(PV_HBL13_K03_amp)</HBL13_K03_amp>
+    <HBL13_K03_phase>$(PV_HBL13_K03_phase)</HBL13_K03_phase>
+    <HBL13_K04_amp>$(PV_HBL13_K04_amp)</HBL13_K04_amp>
+    <HBL13_K04_phase>$(PV_HBL13_K04_phase)</HBL13_K04_phase>
+    <HBL14_K01_amp>$(PV_HBL14_K01_amp)</HBL14_K01_amp>
+    <HBL14_K01_phase>$(PV_HBL14_K01_phase)</HBL14_K01_phase>
+    <HBL14_K02_amp>$(PV_HBL14_K02_amp)</HBL14_K02_amp>
+    <HBL14_K02_phase>$(PV_HBL14_K02_phase)</HBL14_K02_phase>
+    <HBL14_K03_amp>$(PV_HBL14_K03_amp)</HBL14_K03_amp>
+    <HBL14_K03_phase>$(PV_HBL14_K03_phase)</HBL14_K03_phase>
+    <HBL14_K04_amp>$(PV_HBL14_K04_amp)</HBL14_K04_amp>
+    <HBL14_K04_phase>$(PV_HBL14_K04_phase)</HBL14_K04_phase>
+    <HBL15_K01_amp>$(PV_HBL15_K01_amp)</HBL15_K01_amp>
+    <HBL15_K01_phase>$(PV_HBL15_K01_phase)</HBL15_K01_phase>
+    <HBL15_K02_amp>$(PV_HBL15_K02_amp)</HBL15_K02_amp>
+    <HBL15_K02_phase>$(PV_HBL15_K02_phase)</HBL15_K02_phase>
+    <HBL15_K03_amp>$(PV_HBL15_K03_amp)</HBL15_K03_amp>
+    <HBL15_K03_phase>$(PV_HBL15_K03_phase)</HBL15_K03_phase>
+    <HBL15_K04_amp>$(PV_HBL15_K04_amp)</HBL15_K04_amp>
+    <HBL15_K04_phase>$(PV_HBL15_K04_phase)</HBL15_K04_phase>
+    <HBL16_K01_amp>$(PV_HBL16_K01_amp)</HBL16_K01_amp>
+    <HBL16_K01_phase>$(PV_HBL16_K01_phase)</HBL16_K01_phase>
+    <HBL16_K02_amp>$(PV_HBL16_K02_amp)</HBL16_K02_amp>
+    <HBL16_K02_phase>$(PV_HBL16_K02_phase)</HBL16_K02_phase>
+    <HBL16_K03_amp>$(PV_HBL16_K03_amp)</HBL16_K03_amp>
+    <HBL16_K03_phase>$(PV_HBL16_K03_phase)</HBL16_K03_phase>
+    <HBL16_K04_amp>$(PV_HBL16_K04_amp)</HBL16_K04_amp>
+    <HBL16_K04_phase>$(PV_HBL16_K04_phase)</HBL16_K04_phase>
+    <HBL17_K01_amp>$(PV_HBL17_K01_amp)</HBL17_K01_amp>
+    <HBL17_K01_phase>$(PV_HBL17_K01_phase)</HBL17_K01_phase>
+    <HBL17_K02_amp>$(PV_HBL17_K02_amp)</HBL17_K02_amp>
+    <HBL17_K02_phase>$(PV_HBL17_K02_phase)</HBL17_K02_phase>
+    <HBL17_K03_amp>$(PV_HBL17_K03_amp)</HBL17_K03_amp>
+    <HBL17_K03_phase>$(PV_HBL17_K03_phase)</HBL17_K03_phase>
+    <HBL17_K04_amp>$(PV_HBL17_K04_amp)</HBL17_K04_amp>
+    <HBL17_K04_phase>$(PV_HBL17_K04_phase)</HBL17_K04_phase>
+    <HBL18_K01_amp>$(PV_HBL18_K01_amp)</HBL18_K01_amp>
+    <HBL18_K01_phase>$(PV_HBL18_K01_phase)</HBL18_K01_phase>
+    <HBL18_K02_amp>$(PV_HBL18_K02_amp)</HBL18_K02_amp>
+    <HBL18_K02_phase>$(PV_HBL18_K02_phase)</HBL18_K02_phase>
+    <HBL18_K03_amp>$(PV_HBL18_K03_amp)</HBL18_K03_amp>
+    <HBL18_K03_phase>$(PV_HBL18_K03_phase)</HBL18_K03_phase>
+    <HBL18_K04_amp>$(PV_HBL18_K04_amp)</HBL18_K04_amp>
+    <HBL18_K04_phase>$(PV_HBL18_K04_phase)</HBL18_K04_phase>
+    <HBL19_K01_amp>$(PV_HBL19_K01_amp)</HBL19_K01_amp>
+    <HBL19_K01_phase>$(PV_HBL19_K01_phase)</HBL19_K01_phase>
+    <HBL19_K02_amp>$(PV_HBL19_K02_amp)</HBL19_K02_amp>
+    <HBL19_K02_phase>$(PV_HBL19_K02_phase)</HBL19_K02_phase>
+    <HBL19_K03_amp>$(PV_HBL19_K03_amp)</HBL19_K03_amp>
+    <HBL19_K03_phase>$(PV_HBL19_K03_phase)</HBL19_K03_phase>
+    <HBL19_K04_amp>$(PV_HBL19_K04_amp)</HBL19_K04_amp>
+    <HBL19_K04_phase>$(PV_HBL19_K04_phase)</HBL19_K04_phase>
+    <HBL20_K01_amp>$(PV_HBL20_K01_amp)</HBL20_K01_amp>
+    <HBL20_K01_phase>$(PV_HBL20_K01_phase)</HBL20_K01_phase>
+    <HBL20_K02_amp>$(PV_HBL20_K02_amp)</HBL20_K02_amp>
+    <HBL20_K02_phase>$(PV_HBL20_K02_phase)</HBL20_K02_phase>
+    <HBL20_K03_amp>$(PV_HBL20_K03_amp)</HBL20_K03_amp>
+    <HBL20_K03_phase>$(PV_HBL20_K03_phase)</HBL20_K03_phase>
+    <HBL20_K04_amp>$(PV_HBL20_K04_amp)</HBL20_K04_amp>
+    <HBL20_K04_phase>$(PV_HBL20_K04_phase)</HBL20_K04_phase>
+    <HBL21_K01_amp>$(PV_HBL21_K01_amp)</HBL21_K01_amp>
+    <HBL21_K01_phase>$(PV_HBL21_K01_phase)</HBL21_K01_phase>
+    <HBL21_K02_amp>$(PV_HBL21_K02_amp)</HBL21_K02_amp>
+    <HBL21_K02_phase>$(PV_HBL21_K02_phase)</HBL21_K02_phase>
+    <HBL21_K03_amp>$(PV_HBL21_K03_amp)</HBL21_K03_amp>
+    <HBL21_K03_phase>$(PV_HBL21_K03_phase)</HBL21_K03_phase>
+    <HBL21_K04_amp>$(PV_HBL21_K04_amp)</HBL21_K04_amp>
+    <HBL21_K04_phase>$(PV_HBL21_K04_phase)</HBL21_K04_phase>
+    <RFpowerFile>em_rf_rr.bob</RFpowerFile>
+  </macros>
+  <width>2350</width>
+  <height>1240</height>
+  <background_color>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+    </color>
+  </background_color>
+  <widget type="group" version="2.0.0">
+    <name>CurrentPowerGroup_K01-K04</name>
+    <x>20</x>
+    <y>20</y>
+    <width>2130</width>
+    <height>550</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey03-titlebar_4</name>
+      <width>2130</width>
+      <height>550</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 01</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL01_K01_amp)</K01_amp>
+        <K01_phase>$(HBL01_K01_phase)</K01_phase>
+        <K02_amp>$(HBL01_K02_amp)</K02_amp>
+        <K02_phase>$(HBL01_K02_phase)</K02_phase>
+        <K03_amp>$(HBL01_K03_amp)</K03_amp>
+        <K03_phase>$(HBL01_K03_phase)</K03_phase>
+        <K04_amp>$(HBL01_K04_amp)</K04_amp>
+        <K04_phase>$(HBL01_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 1</cavityName>
+        <sectionName>HBL 1</sectionName>
+      </macros>
+      <x>20</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 02</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL02_K01_amp)</K01_amp>
+        <K01_phase>$(HBL02_K01_phase)</K01_phase>
+        <K02_amp>$(HBL02_K02_amp)</K02_amp>
+        <K02_phase>$(HBL02_K02_phase)</K02_phase>
+        <K03_amp>$(HBL02_K03_amp)</K03_amp>
+        <K03_phase>$(HBL02_K03_phase)</K03_phase>
+        <K04_amp>$(HBL02_K04_amp)</K04_amp>
+        <K04_phase>$(HBL02_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 2</cavityName>
+        <sectionName>HBL 2</sectionName>
+      </macros>
+      <x>550</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 03</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL03_K01_amp)</K01_amp>
+        <K01_phase>$(HBL03_K01_phase)</K01_phase>
+        <K02_amp>$(HBL03_K02_amp)</K02_amp>
+        <K02_phase>$(HBL03_K02_phase)</K02_phase>
+        <K03_amp>$(HBL03_K03_amp)</K03_amp>
+        <K03_phase>$(HBL03_K03_phase)</K03_phase>
+        <K04_amp>$(HBL03_K04_amp)</K04_amp>
+        <K04_phase>$(HBL03_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 3</cavityName>
+        <sectionName>HBL 3</sectionName>
+      </macros>
+      <x>1070</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 04</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL04_K01_amp)</K01_amp>
+        <K01_phase>$(HBL04_K01_phase)</K01_phase>
+        <K02_amp>$(HBL04_K02_amp)</K02_amp>
+        <K02_phase>$(HBL04_K02_phase)</K02_phase>
+        <K03_amp>$(HBL04_K03_amp)</K03_amp>
+        <K03_phase>$(HBL04_K03_phase)</K03_phase>
+        <K04_amp>$(HBL04_K04_amp)</K04_amp>
+        <K04_phase>$(HBL04_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 4</cavityName>
+        <sectionName>HBL 4</sectionName>
+      </macros>
+      <x>1600</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>CurrentPowerGroup_K05-K08</name>
+    <x>20</x>
+    <y>590</y>
+    <width>2130</width>
+    <height>550</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey03-titlebar_5</name>
+      <width>2130</width>
+      <height>550</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 05</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL05_K01_amp)</K01_amp>
+        <K01_phase>$(HBL05_K01_phase)</K01_phase>
+        <K02_amp>$(HBL05_K02_amp)</K02_amp>
+        <K02_phase>$(HBL05_K02_phase)</K02_phase>
+        <K03_amp>$(HBL05_K03_amp)</K03_amp>
+        <K03_phase>$(HBL05_K03_phase)</K03_phase>
+        <K04_amp>$(HBL05_K04_amp)</K04_amp>
+        <K04_phase>$(HBL05_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 5</cavityName>
+        <sectionName>HBL 5</sectionName>
+      </macros>
+      <x>20</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 06</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL06_K01_amp)</K01_amp>
+        <K01_phase>$(HBL06_K01_phase)</K01_phase>
+        <K02_amp>$(HBL06_K02_amp)</K02_amp>
+        <K02_phase>$(HBL06_K02_phase)</K02_phase>
+        <K03_amp>$(HBL06_K03_amp)</K03_amp>
+        <K03_phase>$(HBL06_K03_phase)</K03_phase>
+        <K04_amp>$(HBL06_K04_amp)</K04_amp>
+        <K04_phase>$(HBL06_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 6</cavityName>
+        <sectionName>HBL 6</sectionName>
+      </macros>
+      <x>550</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 07</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL07_K01_amp)</K01_amp>
+        <K01_phase>$(HBL07_K01_phase)</K01_phase>
+        <K02_amp>$(HBL07_K02_amp)</K02_amp>
+        <K02_phase>$(HBL07_K02_phase)</K02_phase>
+        <K03_amp>$(HBL07_K03_amp)</K03_amp>
+        <K03_phase>$(HBL07_K03_phase)</K03_phase>
+        <K04_amp>$(HBL07_K04_amp)</K04_amp>
+        <K04_phase>$(HBL07_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 7</cavityName>
+        <sectionName>HBL 7</sectionName>
+      </macros>
+      <x>1080</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 08</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL08_K01_amp)</K01_amp>
+        <K01_phase>$(HBL08_K01_phase)</K01_phase>
+        <K02_amp>$(HBL08_K02_amp)</K02_amp>
+        <K02_phase>$(HBL08_K02_phase)</K02_phase>
+        <K03_amp>$(HBL08_K03_amp)</K03_amp>
+        <K03_phase>$(HBL08_K03_phase)</K03_phase>
+        <K04_amp>$(HBL08_K04_amp)</K04_amp>
+        <K04_phase>$(HBL08_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 8</cavityName>
+        <sectionName>HBL 8</sectionName>
+      </macros>
+      <x>1600</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+  </widget>
+</display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_2.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_2.bob
new file mode 100644
index 00000000..efcaf86d
--- /dev/null
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_2.bob
@@ -0,0 +1,384 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Cavities - HBL 9-16</name>
+  <class></class>
+  <macros>
+    <HBL01_K01_amp>$(PV_HBL01_K01_amp)</HBL01_K01_amp>
+    <HBL01_K01_phase>$(PV_HBL01_K01_phase)</HBL01_K01_phase>
+    <HBL01_K02_amp>$(PV_HBL01_K02_amp)</HBL01_K02_amp>
+    <HBL01_K02_phase>$(PV_HBL01_K02_phase)</HBL01_K02_phase>
+    <HBL01_K03_amp>$(PV_HBL01_K03_amp)</HBL01_K03_amp>
+    <HBL01_K03_phase>$(PV_HBL01_K03_phase)</HBL01_K03_phase>
+    <HBL01_K04_amp>$(PV_HBL01_K04_amp)</HBL01_K04_amp>
+    <HBL01_K04_phase>$(PV_HBL01_K04_phase)</HBL01_K04_phase>
+    <HBL02_K01_amp>$(PV_HBL02_K01_amp)</HBL02_K01_amp>
+    <HBL02_K01_phase>$(PV_HBL02_K01_phase)</HBL02_K01_phase>
+    <HBL02_K02_amp>$(PV_HBL02_K02_amp)</HBL02_K02_amp>
+    <HBL02_K02_phase>$(PV_HBL02_K02_phase)</HBL02_K02_phase>
+    <HBL02_K03_amp>$(PV_HBL02_K03_amp)</HBL02_K03_amp>
+    <HBL02_K03_phase>$(PV_HBL02_K03_phase)</HBL02_K03_phase>
+    <HBL02_K04_amp>$(PV_HBL02_K04_amp)</HBL02_K04_amp>
+    <HBL02_K04_phase>$(PV_HBL02_K04_phase)</HBL02_K04_phase>
+    <HBL03_K01_amp>$(PV_HBL03_K01_amp)</HBL03_K01_amp>
+    <HBL03_K01_phase>$(PV_HBL03_K01_phase)</HBL03_K01_phase>
+    <HBL03_K02_amp>$(PV_HBL03_K02_amp)</HBL03_K02_amp>
+    <HBL03_K02_phase>$(PV_HBL03_K02_phase)</HBL03_K02_phase>
+    <HBL03_K03_amp>$(PV_HBL03_K03_amp)</HBL03_K03_amp>
+    <HBL03_K03_phase>$(PV_HBL03_K03_phase)</HBL03_K03_phase>
+    <HBL03_K04_amp>$(PV_HBL03_K04_amp)</HBL03_K04_amp>
+    <HBL03_K04_phase>$(PV_HBL03_K04_phase)</HBL03_K04_phase>
+    <HBL04_K01_amp>$(PV_HBL04_K01_amp)</HBL04_K01_amp>
+    <HBL04_K01_phase>$(PV_HBL04_K01_phase)</HBL04_K01_phase>
+    <HBL04_K02_amp>$(PV_HBL04_K02_amp)</HBL04_K02_amp>
+    <HBL04_K02_phase>$(PV_HBL04_K02_phase)</HBL04_K02_phase>
+    <HBL04_K03_amp>$(PV_HBL04_K03_amp)</HBL04_K03_amp>
+    <HBL04_K03_phase>$(PV_HBL04_K03_phase)</HBL04_K03_phase>
+    <HBL04_K04_amp>$(PV_HBL04_K04_amp)</HBL04_K04_amp>
+    <HBL04_K04_phase>$(PV_HBL04_K04_phase)</HBL04_K04_phase>
+    <HBL05_K01_amp>$(PV_HBL05_K01_amp)</HBL05_K01_amp>
+    <HBL05_K01_phase>$(PV_HBL05_K01_phase)</HBL05_K01_phase>
+    <HBL05_K02_amp>$(PV_HBL05_K02_amp)</HBL05_K02_amp>
+    <HBL05_K02_phase>$(PV_HBL05_K02_phase)</HBL05_K02_phase>
+    <HBL05_K03_amp>$(PV_HBL05_K03_amp)</HBL05_K03_amp>
+    <HBL05_K03_phase>$(PV_HBL05_K03_phase)</HBL05_K03_phase>
+    <HBL05_K04_amp>$(PV_HBL05_K04_amp)</HBL05_K04_amp>
+    <HBL05_K04_phase>$(PV_HBL05_K04_phase)</HBL05_K04_phase>
+    <HBL06_K01_amp>$(PV_HBL06_K01_amp)</HBL06_K01_amp>
+    <HBL06_K01_phase>$(PV_HBL06_K01_phase)</HBL06_K01_phase>
+    <HBL06_K02_amp>$(PV_HBL06_K02_amp)</HBL06_K02_amp>
+    <HBL06_K02_phase>$(PV_HBL06_K02_phase)</HBL06_K02_phase>
+    <HBL06_K03_amp>$(PV_HBL06_K03_amp)</HBL06_K03_amp>
+    <HBL06_K03_phase>$(PV_HBL06_K03_phase)</HBL06_K03_phase>
+    <HBL06_K04_amp>$(PV_HBL06_K04_amp)</HBL06_K04_amp>
+    <HBL06_K04_phase>$(PV_HBL06_K04_phase)</HBL06_K04_phase>
+    <HBL07_K01_amp>$(PV_HBL07_K01_amp)</HBL07_K01_amp>
+    <HBL07_K01_phase>$(PV_HBL07_K01_phase)</HBL07_K01_phase>
+    <HBL07_K02_amp>$(PV_HBL07_K02_amp)</HBL07_K02_amp>
+    <HBL07_K02_phase>$(PV_HBL07_K02_phase)</HBL07_K02_phase>
+    <HBL07_K03_amp>$(PV_HBL07_K03_amp)</HBL07_K03_amp>
+    <HBL07_K03_phase>$(PV_HBL07_K03_phase)</HBL07_K03_phase>
+    <HBL07_K04_amp>$(PV_HBL07_K04_amp)</HBL07_K04_amp>
+    <HBL07_K04_phase>$(PV_HBL07_K04_phase)</HBL07_K04_phase>
+    <HBL08_K01_amp>$(PV_HBL08_K01_amp)</HBL08_K01_amp>
+    <HBL08_K01_phase>$(PV_HBL08_K01_phase)</HBL08_K01_phase>
+    <HBL08_K02_amp>$(PV_HBL08_K02_amp)</HBL08_K02_amp>
+    <HBL08_K02_phase>$(PV_HBL08_K02_phase)</HBL08_K02_phase>
+    <HBL08_K03_amp>$(PV_HBL08_K03_amp)</HBL08_K03_amp>
+    <HBL08_K03_phase>$(PV_HBL08_K03_phase)</HBL08_K03_phase>
+    <HBL08_K04_amp>$(PV_HBL08_K04_amp)</HBL08_K04_amp>
+    <HBL08_K04_phase>$(PV_HBL08_K04_phase)</HBL08_K04_phase>
+    <HBL09_K01_amp>$(PV_HBL09_K01_amp)</HBL09_K01_amp>
+    <HBL09_K01_phase>$(PV_HBL09_K01_phase)</HBL09_K01_phase>
+    <HBL09_K02_amp>$(PV_HBL09_K02_amp)</HBL09_K02_amp>
+    <HBL09_K02_phase>$(PV_HBL09_K02_phase)</HBL09_K02_phase>
+    <HBL09_K03_amp>$(PV_HBL09_K03_amp)</HBL09_K03_amp>
+    <HBL09_K03_phase>$(PV_HBL09_K03_phase)</HBL09_K03_phase>
+    <HBL09_K04_amp>$(PV_HBL09_K04_amp)</HBL09_K04_amp>
+    <HBL09_K04_phase>$(PV_HBL09_K04_phase)</HBL09_K04_phase>
+    <HBL10_K01_amp>$(PV_HBL10_K01_amp)</HBL10_K01_amp>
+    <HBL10_K01_phase>$(PV_HBL10_K01_phase)</HBL10_K01_phase>
+    <HBL10_K02_amp>$(PV_HBL10_K02_amp)</HBL10_K02_amp>
+    <HBL10_K02_phase>$(PV_HBL10_K02_phase)</HBL10_K02_phase>
+    <HBL10_K03_amp>$(PV_HBL10_K03_amp)</HBL10_K03_amp>
+    <HBL10_K03_phase>$(PV_HBL10_K03_phase)</HBL10_K03_phase>
+    <HBL10_K04_amp>$(PV_HBL10_K04_amp)</HBL10_K04_amp>
+    <HBL10_K04_phase>$(PV_HBL10_K04_phase)</HBL10_K04_phase>
+    <HBL11_K01_amp>$(PV_HBL11_K01_amp)</HBL11_K01_amp>
+    <HBL11_K01_phase>$(PV_HBL11_K01_phase)</HBL11_K01_phase>
+    <HBL11_K02_amp>$(PV_HBL11_K02_amp)</HBL11_K02_amp>
+    <HBL11_K02_phase>$(PV_HBL11_K02_phase)</HBL11_K02_phase>
+    <HBL11_K03_amp>$(PV_HBL11_K03_amp)</HBL11_K03_amp>
+    <HBL11_K03_phase>$(PV_HBL11_K03_phase)</HBL11_K03_phase>
+    <HBL11_K04_amp>$(PV_HBL11_K04_amp)</HBL11_K04_amp>
+    <HBL11_K04_phase>$(PV_HBL11_K04_phase)</HBL11_K04_phase>
+    <HBL12_K01_amp>$(PV_HBL12_K01_amp)</HBL12_K01_amp>
+    <HBL12_K01_phase>$(PV_HBL12_K01_phase)</HBL12_K01_phase>
+    <HBL12_K02_amp>$(PV_HBL12_K02_amp)</HBL12_K02_amp>
+    <HBL12_K02_phase>$(PV_HBL12_K02_phase)</HBL12_K02_phase>
+    <HBL12_K03_amp>$(PV_HBL12_K03_amp)</HBL12_K03_amp>
+    <HBL12_K03_phase>$(PV_HBL12_K03_phase)</HBL12_K03_phase>
+    <HBL12_K04_amp>$(PV_HBL12_K04_amp)</HBL12_K04_amp>
+    <HBL12_K04_phase>$(PV_HBL12_K04_phase)</HBL12_K04_phase>
+    <HBL13_K01_amp>$(PV_HBL13_K01_amp)</HBL13_K01_amp>
+    <HBL13_K01_phase>$(PV_HBL13_K01_phase)</HBL13_K01_phase>
+    <HBL13_K02_amp>$(PV_HBL13_K02_amp)</HBL13_K02_amp>
+    <HBL13_K02_phase>$(PV_HBL13_K02_phase)</HBL13_K02_phase>
+    <HBL13_K03_amp>$(PV_HBL13_K03_amp)</HBL13_K03_amp>
+    <HBL13_K03_phase>$(PV_HBL13_K03_phase)</HBL13_K03_phase>
+    <HBL13_K04_amp>$(PV_HBL13_K04_amp)</HBL13_K04_amp>
+    <HBL13_K04_phase>$(PV_HBL13_K04_phase)</HBL13_K04_phase>
+    <HBL14_K01_amp>$(PV_HBL14_K01_amp)</HBL14_K01_amp>
+    <HBL14_K01_phase>$(PV_HBL14_K01_phase)</HBL14_K01_phase>
+    <HBL14_K02_amp>$(PV_HBL14_K02_amp)</HBL14_K02_amp>
+    <HBL14_K02_phase>$(PV_HBL14_K02_phase)</HBL14_K02_phase>
+    <HBL14_K03_amp>$(PV_HBL14_K03_amp)</HBL14_K03_amp>
+    <HBL14_K03_phase>$(PV_HBL14_K03_phase)</HBL14_K03_phase>
+    <HBL14_K04_amp>$(PV_HBL14_K04_amp)</HBL14_K04_amp>
+    <HBL14_K04_phase>$(PV_HBL14_K04_phase)</HBL14_K04_phase>
+    <HBL15_K01_amp>$(PV_HBL15_K01_amp)</HBL15_K01_amp>
+    <HBL15_K01_phase>$(PV_HBL15_K01_phase)</HBL15_K01_phase>
+    <HBL15_K02_amp>$(PV_HBL15_K02_amp)</HBL15_K02_amp>
+    <HBL15_K02_phase>$(PV_HBL15_K02_phase)</HBL15_K02_phase>
+    <HBL15_K03_amp>$(PV_HBL15_K03_amp)</HBL15_K03_amp>
+    <HBL15_K03_phase>$(PV_HBL15_K03_phase)</HBL15_K03_phase>
+    <HBL15_K04_amp>$(PV_HBL15_K04_amp)</HBL15_K04_amp>
+    <HBL15_K04_phase>$(PV_HBL15_K04_phase)</HBL15_K04_phase>
+    <HBL16_K01_amp>$(PV_HBL16_K01_amp)</HBL16_K01_amp>
+    <HBL16_K01_phase>$(PV_HBL16_K01_phase)</HBL16_K01_phase>
+    <HBL16_K02_amp>$(PV_HBL16_K02_amp)</HBL16_K02_amp>
+    <HBL16_K02_phase>$(PV_HBL16_K02_phase)</HBL16_K02_phase>
+    <HBL16_K03_amp>$(PV_HBL16_K03_amp)</HBL16_K03_amp>
+    <HBL16_K03_phase>$(PV_HBL16_K03_phase)</HBL16_K03_phase>
+    <HBL16_K04_amp>$(PV_HBL16_K04_amp)</HBL16_K04_amp>
+    <HBL16_K04_phase>$(PV_HBL16_K04_phase)</HBL16_K04_phase>
+    <HBL17_K01_amp>$(PV_HBL17_K01_amp)</HBL17_K01_amp>
+    <HBL17_K01_phase>$(PV_HBL17_K01_phase)</HBL17_K01_phase>
+    <HBL17_K02_amp>$(PV_HBL17_K02_amp)</HBL17_K02_amp>
+    <HBL17_K02_phase>$(PV_HBL17_K02_phase)</HBL17_K02_phase>
+    <HBL17_K03_amp>$(PV_HBL17_K03_amp)</HBL17_K03_amp>
+    <HBL17_K03_phase>$(PV_HBL17_K03_phase)</HBL17_K03_phase>
+    <HBL17_K04_amp>$(PV_HBL17_K04_amp)</HBL17_K04_amp>
+    <HBL17_K04_phase>$(PV_HBL17_K04_phase)</HBL17_K04_phase>
+    <HBL18_K01_amp>$(PV_HBL18_K01_amp)</HBL18_K01_amp>
+    <HBL18_K01_phase>$(PV_HBL18_K01_phase)</HBL18_K01_phase>
+    <HBL18_K02_amp>$(PV_HBL18_K02_amp)</HBL18_K02_amp>
+    <HBL18_K02_phase>$(PV_HBL18_K02_phase)</HBL18_K02_phase>
+    <HBL18_K03_amp>$(PV_HBL18_K03_amp)</HBL18_K03_amp>
+    <HBL18_K03_phase>$(PV_HBL18_K03_phase)</HBL18_K03_phase>
+    <HBL18_K04_amp>$(PV_HBL18_K04_amp)</HBL18_K04_amp>
+    <HBL18_K04_phase>$(PV_HBL18_K04_phase)</HBL18_K04_phase>
+    <HBL19_K01_amp>$(PV_HBL19_K01_amp)</HBL19_K01_amp>
+    <HBL19_K01_phase>$(PV_HBL19_K01_phase)</HBL19_K01_phase>
+    <HBL19_K02_amp>$(PV_HBL19_K02_amp)</HBL19_K02_amp>
+    <HBL19_K02_phase>$(PV_HBL19_K02_phase)</HBL19_K02_phase>
+    <HBL19_K03_amp>$(PV_HBL19_K03_amp)</HBL19_K03_amp>
+    <HBL19_K03_phase>$(PV_HBL19_K03_phase)</HBL19_K03_phase>
+    <HBL19_K04_amp>$(PV_HBL19_K04_amp)</HBL19_K04_amp>
+    <HBL19_K04_phase>$(PV_HBL19_K04_phase)</HBL19_K04_phase>
+    <HBL20_K01_amp>$(PV_HBL20_K01_amp)</HBL20_K01_amp>
+    <HBL20_K01_phase>$(PV_HBL20_K01_phase)</HBL20_K01_phase>
+    <HBL20_K02_amp>$(PV_HBL20_K02_amp)</HBL20_K02_amp>
+    <HBL20_K02_phase>$(PV_HBL20_K02_phase)</HBL20_K02_phase>
+    <HBL20_K03_amp>$(PV_HBL20_K03_amp)</HBL20_K03_amp>
+    <HBL20_K03_phase>$(PV_HBL20_K03_phase)</HBL20_K03_phase>
+    <HBL20_K04_amp>$(PV_HBL20_K04_amp)</HBL20_K04_amp>
+    <HBL20_K04_phase>$(PV_HBL20_K04_phase)</HBL20_K04_phase>
+    <HBL21_K01_amp>$(PV_HBL21_K01_amp)</HBL21_K01_amp>
+    <HBL21_K01_phase>$(PV_HBL21_K01_phase)</HBL21_K01_phase>
+    <HBL21_K02_amp>$(PV_HBL21_K02_amp)</HBL21_K02_amp>
+    <HBL21_K02_phase>$(PV_HBL21_K02_phase)</HBL21_K02_phase>
+    <HBL21_K03_amp>$(PV_HBL21_K03_amp)</HBL21_K03_amp>
+    <HBL21_K03_phase>$(PV_HBL21_K03_phase)</HBL21_K03_phase>
+    <HBL21_K04_amp>$(PV_HBL21_K04_amp)</HBL21_K04_amp>
+    <HBL21_K04_phase>$(PV_HBL21_K04_phase)</HBL21_K04_phase>
+    <RFpowerFile>em_rf_rr.bob</RFpowerFile>
+  </macros>
+  <width>2350</width>
+  <height>1240</height>
+  <background_color>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+    </color>
+  </background_color>
+  <widget type="group" version="2.0.0">
+    <name>CurrentPowerGroup_K10-K13</name>
+    <x>20</x>
+    <y>20</y>
+    <width>2130</width>
+    <height>550</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey03-titlebar_7</name>
+      <width>2130</width>
+      <height>550</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 10</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL10_K01_amp)</K01_amp>
+        <K01_phase>$(HBL10_K01_phase)</K01_phase>
+        <K02_amp>$(HBL10_K02_amp)</K02_amp>
+        <K02_phase>$(HBL10_K02_phase)</K02_phase>
+        <K03_amp>$(HBL10_K03_amp)</K03_amp>
+        <K03_phase>$(HBL10_K03_phase)</K03_phase>
+        <K04_amp>$(HBL10_K04_amp)</K04_amp>
+        <K04_phase>$(HBL10_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 10</cavityName>
+        <sectionName>HBL 10</sectionName>
+      </macros>
+      <x>550</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 11</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL11_K01_amp)</K01_amp>
+        <K01_phase>$(HBL11_K01_phase)</K01_phase>
+        <K02_amp>$(HBL11_K02_amp)</K02_amp>
+        <K02_phase>$(HBL11_K02_phase)</K02_phase>
+        <K03_amp>$(HBL11_K03_amp)</K03_amp>
+        <K03_phase>$(HBL11_K03_phase)</K03_phase>
+        <K04_amp>$(HBL11_K04_amp)</K04_amp>
+        <K04_phase>$(HBL11_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 11</cavityName>
+        <sectionName>HBL 11</sectionName>
+      </macros>
+      <x>1080</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 12</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL12_K01_amp)</K01_amp>
+        <K01_phase>$(HBL12_K01_phase)</K01_phase>
+        <K02_amp>$(HBL12_K02_amp)</K02_amp>
+        <K02_phase>$(HBL12_K02_phase)</K02_phase>
+        <K03_amp>$(HBL12_K03_amp)</K03_amp>
+        <K03_phase>$(HBL12_K03_phase)</K03_phase>
+        <K04_amp>$(HBL12_K04_amp)</K04_amp>
+        <K04_phase>$(HBL12_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 12</cavityName>
+        <sectionName>HBL 12</sectionName>
+      </macros>
+      <x>1600</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 09</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL09_K01_amp)</K01_amp>
+        <K01_phase>$(HBL09_K01_phase)</K01_phase>
+        <K02_amp>$(HBL09_K02_amp)</K02_amp>
+        <K02_phase>$(HBL09_K02_phase)</K02_phase>
+        <K03_amp>$(HBL09_K03_amp)</K03_amp>
+        <K03_phase>$(HBL09_K03_phase)</K03_phase>
+        <K04_amp>$(HBL09_K04_amp)</K04_amp>
+        <K04_phase>$(HBL09_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 9</cavityName>
+        <sectionName>HBL 9</sectionName>
+      </macros>
+      <x>20</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>CurrentPowerGroup_K14-K17</name>
+    <x>20</x>
+    <y>590</y>
+    <width>2130</width>
+    <height>550</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey03-titlebar_8</name>
+      <width>2130</width>
+      <height>550</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 14</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL14_K01_amp)</K01_amp>
+        <K01_phase>$(HBL14_K01_phase)</K01_phase>
+        <K02_amp>$(HBL14_K02_amp)</K02_amp>
+        <K02_phase>$(HBL14_K02_phase)</K02_phase>
+        <K03_amp>$(HBL14_K03_amp)</K03_amp>
+        <K03_phase>$(HBL14_K03_phase)</K03_phase>
+        <K04_amp>$(HBL14_K04_amp)</K04_amp>
+        <K04_phase>$(HBL14_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 14</cavityName>
+        <sectionName>HBL 14</sectionName>
+      </macros>
+      <x>550</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 15</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL15_K01_amp)</K01_amp>
+        <K01_phase>$(HBL15_K01_phase)</K01_phase>
+        <K02_amp>$(HBL15_K02_amp)</K02_amp>
+        <K02_phase>$(HBL15_K02_phase)</K02_phase>
+        <K03_amp>$(HBL15_K03_amp)</K03_amp>
+        <K03_phase>$(HBL15_K03_phase)</K03_phase>
+        <K04_amp>$(HBL15_K04_amp)</K04_amp>
+        <K04_phase>$(HBL15_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 15</cavityName>
+        <sectionName>HBL 15</sectionName>
+      </macros>
+      <x>1080</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 16</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL16_K01_amp)</K01_amp>
+        <K01_phase>$(HBL16_K01_phase)</K01_phase>
+        <K02_amp>$(HBL16_K02_amp)</K02_amp>
+        <K02_phase>$(HBL16_K02_phase)</K02_phase>
+        <K03_amp>$(HBL16_K03_amp)</K03_amp>
+        <K03_phase>$(HBL16_K03_phase)</K03_phase>
+        <K04_amp>$(HBL16_K04_amp)</K04_amp>
+        <K04_phase>$(HBL16_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 16</cavityName>
+        <sectionName>HBL 16</sectionName>
+      </macros>
+      <x>1600</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display HBL 13</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(HBL13_K01_amp)</K01_amp>
+        <K01_phase>$(HBL13_K01_phase)</K01_phase>
+        <K02_amp>$(HBL13_K02_amp)</K02_amp>
+        <K02_phase>$(HBL13_K02_phase)</K02_phase>
+        <K03_amp>$(HBL13_K03_amp)</K03_amp>
+        <K03_phase>$(HBL13_K03_phase)</K03_phase>
+        <K04_amp>$(HBL13_K04_amp)</K04_amp>
+        <K04_phase>$(HBL13_K04_phase)</K04_phase>
+        <cavityName>HBL Cavity 13</cavityName>
+        <sectionName>HBL 13</sectionName>
+      </macros>
+      <x>20</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+  </widget>
+</display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_3.bob
similarity index 68%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_3.bob
index 4fa91ac6..f0d8a63d 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_HBL_3.bob
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>Cavities - HBL</name>
+  <name>Cavities - HBL 17-21</name>
   <macros>
-    <RFpowerFile>em_rf_rr.bob</RFpowerFile>
     <HBL01_K01_amp>$(PV_HBL01_K01_amp)</HBL01_K01_amp>
     <HBL01_K01_phase>$(PV_HBL01_K01_phase)</HBL01_K01_phase>
     <HBL01_K02_amp>$(PV_HBL01_K02_amp)</HBL01_K02_amp>
@@ -171,9 +170,10 @@
     <HBL21_K03_phase>$(PV_HBL21_K03_phase)</HBL21_K03_phase>
     <HBL21_K04_amp>$(PV_HBL21_K04_amp)</HBL21_K04_amp>
     <HBL21_K04_phase>$(PV_HBL21_K04_phase)</HBL21_K04_phase>
+    <RFpowerFile>em_rf_rr.bob</RFpowerFile>
   </macros>
-  <width>1200</width>
-  <height>900</height>
+  <width>2180</width>
+  <height>1240</height>
   <background_color>
     <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
@@ -182,8 +182,8 @@
     <name>Signal</name>
     <x>1640</x>
     <y>20</y>
-    <width>700</width>
-    <height>1690</height>
+    <width>530</width>
+    <height>1200</height>
     <style>3</style>
     <background_color>
       <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -191,8 +191,8 @@
     </background_color>
     <widget type="rectangle" version="2.0.0">
       <name>BGGrey03-titlebar_3</name>
-      <width>700</width>
-      <height>1690</height>
+      <width>530</width>
+      <height>1200</height>
       <line_width>0</line_width>
       <background_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -205,7 +205,7 @@
       <name>BGGrey03-title_2</name>
       <text>High Beta Linac Cavities - Power History</text>
       <x>14</x>
-      <width>576</width>
+      <width>470</width>
       <height>50</height>
       <font>
         <font family="Source Sans Pro" style="BOLD_ITALIC" size="24.0">
@@ -221,14 +221,14 @@
       <name>BGGrey03-content-group_2</name>
       <x>15</x>
       <y>50</y>
-      <width>670</width>
-      <height>1620</height>
+      <width>500</width>
+      <height>1130</height>
       <style>3</style>
       <transparent>true</transparent>
       <widget type="rectangle" version="2.0.0">
         <name>BGGrey03-background_3</name>
-        <width>670</width>
-        <height>1620</height>
+        <width>500</width>
+        <height>1130</height>
         <line_width>0</line_width>
         <background_color>
           <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -241,8 +241,8 @@
         <name>LGGrey02_6</name>
         <x>17</x>
         <y>20</y>
-        <width>635</width>
-        <height>1580</height>
+        <width>465</width>
+        <height>1090</height>
         <style>3</style>
         <background_color>
           <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -252,8 +252,8 @@
           <name>X/Y Plot_3</name>
           <x>15</x>
           <y>15</y>
-          <width>605</width>
-          <height>770</height>
+          <width>435</width>
+          <height>530</height>
           <background_color>
             <color name="BACKGROUND" red="220" green="225" blue="221">
             </color>
@@ -262,7 +262,6 @@
             <font family="Source Sans Pro" style="BOLD_ITALIC" size="14.0">
             </font>
           </title_font>
-          <show_toolbar>true</show_toolbar>
           <rules>
             <rule name="MinCurrentLimit" prop_id="y_axes[0].minimum" out_exp="true">
               <exp bool_exp="true">
@@ -474,9 +473,9 @@
         <widget type="xyplot" version="2.0.0">
           <name>X/Y Plot_4</name>
           <x>15</x>
-          <y>790</y>
-          <width>605</width>
-          <height>770</height>
+          <y>550</y>
+          <width>435</width>
+          <height>530</height>
           <background_color>
             <color name="BACKGROUND" red="220" green="225" blue="221">
             </color>
@@ -485,7 +484,6 @@
             <font family="Source Sans Pro" style="BOLD_ITALIC" size="14.0">
             </font>
           </title_font>
-          <show_toolbar>true</show_toolbar>
           <rules>
             <rule name="MinCurrentLimit" prop_id="y_axes[0].minimum" out_exp="true">
               <exp bool_exp="true">
@@ -698,360 +696,16 @@
     </widget>
   </widget>
   <widget type="group" version="2.0.0">
-    <name>CurrentPowerGroup_K01-K03</name>
+    <name>CurrentPowerGroup_K14-K17</name>
     <x>20</x>
     <y>20</y>
     <width>1600</width>
     <height>550</height>
     <style>3</style>
     <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>BGGrey03-titlebar_4</name>
-      <width>1600</width>
-      <height>550</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 01</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL01_K01_amp)</K01_amp>
-        <K01_phase>$(HBL01_K01_phase)</K01_phase>
-        <K02_amp>$(HBL01_K02_amp)</K02_amp>
-        <K02_phase>$(HBL01_K02_phase)</K02_phase>
-        <K03_amp>$(HBL01_K03_amp)</K03_amp>
-        <K03_phase>$(HBL01_K03_phase)</K03_phase>
-        <K04_amp>$(HBL01_K04_amp)</K04_amp>
-        <K04_phase>$(HBL01_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 1</cavityName>
-        <sectionName>HBL 1</sectionName>
-      </macros>
-      <x>20</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 02</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL02_K01_amp)</K01_amp>
-        <K01_phase>$(HBL02_K01_phase)</K01_phase>
-        <K02_amp>$(HBL02_K02_amp)</K02_amp>
-        <K02_phase>$(HBL02_K02_phase)</K02_phase>
-        <K03_amp>$(HBL02_K03_amp)</K03_amp>
-        <K03_phase>$(HBL02_K03_phase)</K03_phase>
-        <K04_amp>$(HBL02_K04_amp)</K04_amp>
-        <K04_phase>$(HBL02_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 2</cavityName>
-        <sectionName>HBL 2</sectionName>
-      </macros>
-      <x>550</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 03</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL03_K01_amp)</K01_amp>
-        <K01_phase>$(HBL03_K01_phase)</K01_phase>
-        <K02_amp>$(HBL03_K02_amp)</K02_amp>
-        <K02_phase>$(HBL03_K02_phase)</K02_phase>
-        <K03_amp>$(HBL03_K03_amp)</K03_amp>
-        <K03_phase>$(HBL03_K03_phase)</K03_phase>
-        <K04_amp>$(HBL03_K04_amp)</K04_amp>
-        <K04_phase>$(HBL03_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 3</cavityName>
-        <sectionName>HBL 3</sectionName>
-      </macros>
-      <x>1070</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>CurrentPowerGroup_K04-K06</name>
-    <x>20</x>
-    <y>590</y>
-    <width>1600</width>
-    <height>550</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>BGGrey03-titlebar_5</name>
-      <width>1600</width>
-      <height>550</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 04</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL04_K01_amp)</K01_amp>
-        <K01_phase>$(HBL04_K01_phase)</K01_phase>
-        <K02_amp>$(HBL04_K02_amp)</K02_amp>
-        <K02_phase>$(HBL04_K02_phase)</K02_phase>
-        <K03_amp>$(HBL04_K03_amp)</K03_amp>
-        <K03_phase>$(HBL04_K03_phase)</K03_phase>
-        <K04_amp>$(HBL04_K04_amp)</K04_amp>
-        <K04_phase>$(HBL04_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 4</cavityName>
-        <sectionName>HBL 4</sectionName>
-      </macros>
-      <x>20</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 05</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL05_K01_amp)</K01_amp>
-        <K01_phase>$(HBL05_K01_phase)</K01_phase>
-        <K02_amp>$(HBL05_K02_amp)</K02_amp>
-        <K02_phase>$(HBL05_K02_phase)</K02_phase>
-        <K03_amp>$(HBL05_K03_amp)</K03_amp>
-        <K03_phase>$(HBL05_K03_phase)</K03_phase>
-        <K04_amp>$(HBL05_K04_amp)</K04_amp>
-        <K04_phase>$(HBL05_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 5</cavityName>
-        <sectionName>HBL 5</sectionName>
-      </macros>
-      <x>550</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 06</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL06_K01_amp)</K01_amp>
-        <K01_phase>$(HBL06_K01_phase)</K01_phase>
-        <K02_amp>$(HBL06_K02_amp)</K02_amp>
-        <K02_phase>$(HBL06_K02_phase)</K02_phase>
-        <K03_amp>$(HBL06_K03_amp)</K03_amp>
-        <K03_phase>$(HBL06_K03_phase)</K03_phase>
-        <K04_amp>$(HBL06_K04_amp)</K04_amp>
-        <K04_phase>$(HBL06_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 6</cavityName>
-        <sectionName>HBL 6</sectionName>
-      </macros>
-      <x>1070</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>CurrentPowerGroup_K07-K09</name>
-    <x>20</x>
-    <y>1160</y>
-    <width>1600</width>
-    <height>550</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>BGGrey03-titlebar_6</name>
-      <width>1600</width>
-      <height>550</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 07</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL07_K01_amp)</K01_amp>
-        <K01_phase>$(HBL07_K01_phase)</K01_phase>
-        <K02_amp>$(HBL07_K02_amp)</K02_amp>
-        <K02_phase>$(HBL07_K02_phase)</K02_phase>
-        <K03_amp>$(HBL07_K03_amp)</K03_amp>
-        <K03_phase>$(HBL07_K03_phase)</K03_phase>
-        <K04_amp>$(HBL07_K04_amp)</K04_amp>
-        <K04_phase>$(HBL07_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 7</cavityName>
-        <sectionName>HBL 7</sectionName>
-      </macros>
-      <x>20</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 08</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL08_K01_amp)</K01_amp>
-        <K01_phase>$(HBL08_K01_phase)</K01_phase>
-        <K02_amp>$(HBL08_K02_amp)</K02_amp>
-        <K02_phase>$(HBL08_K02_phase)</K02_phase>
-        <K03_amp>$(HBL08_K03_amp)</K03_amp>
-        <K03_phase>$(HBL08_K03_phase)</K03_phase>
-        <K04_amp>$(HBL08_K04_amp)</K04_amp>
-        <K04_phase>$(HBL08_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 8</cavityName>
-        <sectionName>HBL 8</sectionName>
-      </macros>
-      <x>550</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 09</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL09_K01_amp)</K01_amp>
-        <K01_phase>$(HBL09_K01_phase)</K01_phase>
-        <K02_amp>$(HBL09_K02_amp)</K02_amp>
-        <K02_phase>$(HBL09_K02_phase)</K02_phase>
-        <K03_amp>$(HBL09_K03_amp)</K03_amp>
-        <K03_phase>$(HBL09_K03_phase)</K03_phase>
-        <K04_amp>$(HBL09_K04_amp)</K04_amp>
-        <K04_phase>$(HBL09_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 9</cavityName>
-        <sectionName>HBL 9</sectionName>
-      </macros>
-      <x>1070</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>CurrentPowerGroup_K10-K13</name>
-    <x>20</x>
-    <y>1730</y>
-    <width>2130</width>
-    <height>550</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>BGGrey03-titlebar_7</name>
-      <width>2130</width>
-      <height>550</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 10</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL10_K01_amp)</K01_amp>
-        <K01_phase>$(HBL10_K01_phase)</K01_phase>
-        <K02_amp>$(HBL10_K02_amp)</K02_amp>
-        <K02_phase>$(HBL10_K02_phase)</K02_phase>
-        <K03_amp>$(HBL10_K03_amp)</K03_amp>
-        <K03_phase>$(HBL10_K03_phase)</K03_phase>
-        <K04_amp>$(HBL10_K04_amp)</K04_amp>
-        <K04_phase>$(HBL10_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 10</cavityName>
-        <sectionName>HBL 10</sectionName>
-      </macros>
-      <x>20</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 11</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL11_K01_amp)</K01_amp>
-        <K01_phase>$(HBL11_K01_phase)</K01_phase>
-        <K02_amp>$(HBL11_K02_amp)</K02_amp>
-        <K02_phase>$(HBL11_K02_phase)</K02_phase>
-        <K03_amp>$(HBL11_K03_amp)</K03_amp>
-        <K03_phase>$(HBL11_K03_phase)</K03_phase>
-        <K04_amp>$(HBL11_K04_amp)</K04_amp>
-        <K04_phase>$(HBL11_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 11</cavityName>
-        <sectionName>HBL 11</sectionName>
-      </macros>
-      <x>550</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 12</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL12_K01_amp)</K01_amp>
-        <K01_phase>$(HBL12_K01_phase)</K01_phase>
-        <K02_amp>$(HBL12_K02_amp)</K02_amp>
-        <K02_phase>$(HBL12_K02_phase)</K02_phase>
-        <K03_amp>$(HBL12_K03_amp)</K03_amp>
-        <K03_phase>$(HBL12_K03_phase)</K03_phase>
-        <K04_amp>$(HBL12_K04_amp)</K04_amp>
-        <K04_phase>$(HBL12_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 12</cavityName>
-        <sectionName>HBL 12</sectionName>
-      </macros>
-      <x>1070</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 13</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL13_K01_amp)</K01_amp>
-        <K01_phase>$(HBL13_K01_phase)</K01_phase>
-        <K02_amp>$(HBL13_K02_amp)</K02_amp>
-        <K02_phase>$(HBL13_K02_phase)</K02_phase>
-        <K03_amp>$(HBL13_K03_amp)</K03_amp>
-        <K03_phase>$(HBL13_K03_phase)</K03_phase>
-        <K04_amp>$(HBL13_K04_amp)</K04_amp>
-        <K04_phase>$(HBL13_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 13</cavityName>
-        <sectionName>HBL 13</sectionName>
-      </macros>
-      <x>1600</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>CurrentPowerGroup_K14-K17</name>
-    <x>20</x>
-    <y>2300</y>
-    <width>2130</width>
-    <height>550</height>
-    <style>3</style>
-    <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>BGGrey03-titlebar_8</name>
-      <width>2130</width>
+      <width>1600</width>
       <height>550</height>
       <line_width>0</line_width>
       <background_color>
@@ -1061,66 +715,6 @@
       <corner_width>10</corner_width>
       <corner_height>10</corner_height>
     </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 14</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL14_K01_amp)</K01_amp>
-        <K01_phase>$(HBL14_K01_phase)</K01_phase>
-        <K02_amp>$(HBL14_K02_amp)</K02_amp>
-        <K02_phase>$(HBL14_K02_phase)</K02_phase>
-        <K03_amp>$(HBL14_K03_amp)</K03_amp>
-        <K03_phase>$(HBL14_K03_phase)</K03_phase>
-        <K04_amp>$(HBL14_K04_amp)</K04_amp>
-        <K04_phase>$(HBL14_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 14</cavityName>
-        <sectionName>HBL 14</sectionName>
-      </macros>
-      <x>20</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 15</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL15_K01_amp)</K01_amp>
-        <K01_phase>$(HBL15_K01_phase)</K01_phase>
-        <K02_amp>$(HBL15_K02_amp)</K02_amp>
-        <K02_phase>$(HBL15_K02_phase)</K02_phase>
-        <K03_amp>$(HBL15_K03_amp)</K03_amp>
-        <K03_phase>$(HBL15_K03_phase)</K03_phase>
-        <K04_amp>$(HBL15_K04_amp)</K04_amp>
-        <K04_phase>$(HBL15_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 15</cavityName>
-        <sectionName>HBL 15</sectionName>
-      </macros>
-      <x>550</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display HBL 16</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(HBL16_K01_amp)</K01_amp>
-        <K01_phase>$(HBL16_K01_phase)</K01_phase>
-        <K02_amp>$(HBL16_K02_amp)</K02_amp>
-        <K02_phase>$(HBL16_K02_phase)</K02_phase>
-        <K03_amp>$(HBL16_K03_amp)</K03_amp>
-        <K03_phase>$(HBL16_K03_phase)</K03_phase>
-        <K04_amp>$(HBL16_K04_amp)</K04_amp>
-        <K04_phase>$(HBL16_K04_phase)</K04_phase>
-        <cavityName>HBL Cavity 16</cavityName>
-        <sectionName>HBL 16</sectionName>
-      </macros>
-      <x>1070</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 17</name>
       <file>EmbedddedWindows/em_cav_rr.bob</file>
@@ -1136,32 +730,11 @@
         <cavityName>HBL Cavity 17</cavityName>
         <sectionName>HBL 17</sectionName>
       </macros>
-      <x>1600</x>
+      <x>20</x>
       <y>20</y>
       <width>510</width>
       <height>515</height>
     </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>CurrentPowerGroup_K18-K21</name>
-    <x>20</x>
-    <y>2870</y>
-    <width>2130</width>
-    <height>550</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>BGGrey03-titlebar_9</name>
-      <width>2130</width>
-      <height>550</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 18</name>
       <file>EmbedddedWindows/em_cav_rr.bob</file>
@@ -1177,7 +750,7 @@
         <cavityName>HBL Cavity 18</cavityName>
         <sectionName>HBL 18</sectionName>
       </macros>
-      <x>20</x>
+      <x>550</x>
       <y>20</y>
       <width>510</width>
       <height>515</height>
@@ -1197,11 +770,32 @@
         <cavityName>HBL Cavity 19</cavityName>
         <sectionName>HBL 19</sectionName>
       </macros>
-      <x>550</x>
+      <x>1070</x>
       <y>20</y>
       <width>510</width>
       <height>515</height>
     </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>CurrentPowerGroup_K18-K21</name>
+    <x>20</x>
+    <y>590</y>
+    <width>1080</width>
+    <height>550</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey03-titlebar_9</name>
+      <width>1080</width>
+      <height>550</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display HBL 20</name>
       <file>EmbedddedWindows/em_cav_rr.bob</file>
@@ -1217,7 +811,7 @@
         <cavityName>HBL Cavity 20</cavityName>
         <sectionName>HBL 20</sectionName>
       </macros>
-      <x>1070</x>
+      <x>20</x>
       <y>20</y>
       <width>510</width>
       <height>515</height>
@@ -1237,7 +831,7 @@
         <cavityName>HBL Cavity 21</cavityName>
         <sectionName>HBL 21</sectionName>
       </macros>
-      <x>1600</x>
+      <x>550</x>
       <y>20</y>
       <width>510</width>
       <height>515</height>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL_1.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL_1.bob
new file mode 100644
index 00000000..7b849342
--- /dev/null
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL_1.bob
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Cavities - MBL 1-6</name>
+  <macros>
+    <RFpowerFile>em_rf_rr.bob</RFpowerFile>
+  </macros>
+  <width>1200</width>
+  <height>900</height>
+  <background_color>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+    </color>
+  </background_color>
+  <widget type="group" version="2.0.0">
+    <name>CurrentPowerGroup_K01-K03</name>
+    <x>20</x>
+    <y>20</y>
+    <width>1600</width>
+    <height>550</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey03-titlebar_4</name>
+      <width>1600</width>
+      <height>550</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display MBL 01</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(MBL01_K01_amp)</K01_amp>
+        <K01_phase>$(MBL01_K01_phase)</K01_phase>
+        <K02_amp>$(MBL01_K02_amp)</K02_amp>
+        <K02_phase>$(MBL01_K02_phase)</K02_phase>
+        <K03_amp>$(MBL01_K03_amp)</K03_amp>
+        <K03_phase>$(MBL01_K03_phase)</K03_phase>
+        <K04_amp>$(MBL01_K04_amp)</K04_amp>
+        <K04_phase>$(MBL01_K04_phase)</K04_phase>
+        <cavityName>MBL Cavity 1</cavityName>
+        <sectionName>MBL 1</sectionName>
+      </macros>
+      <x>20</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display MBL 02</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(MBL02_K01_amp)</K01_amp>
+        <K01_phase>$(MBL02_K01_phase)</K01_phase>
+        <K02_amp>$(MBL02_K02_amp)</K02_amp>
+        <K02_phase>$(MBL02_K02_phase)</K02_phase>
+        <K03_amp>$(MBL02_K03_amp)</K03_amp>
+        <K03_phase>$(MBL02_K03_phase)</K03_phase>
+        <K04_amp>$(MBL02_K04_amp)</K04_amp>
+        <K04_phase>$(MBL02_K04_phase)</K04_phase>
+        <cavityName>MBL Cavity 2</cavityName>
+        <sectionName>MBL 2</sectionName>
+      </macros>
+      <x>550</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display MBL 03</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(MBL03_K01_amp)</K01_amp>
+        <K01_phase>$(MBL03_K01_phase)</K01_phase>
+        <K02_amp>$(MBL03_K02_amp)</K02_amp>
+        <K02_phase>$(MBL03_K02_phase)</K02_phase>
+        <K03_amp>$(MBL03_K03_amp)</K03_amp>
+        <K03_phase>$(MBL03_K03_phase)</K03_phase>
+        <K04_amp>$(MBL03_K04_amp)</K04_amp>
+        <K04_phase>$(MBL03_K04_phase)</K04_phase>
+        <cavityName>MBL Cavity 3</cavityName>
+        <sectionName>MBL 3</sectionName>
+      </macros>
+      <x>1070</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>CurrentPowerGroup_K04-K06</name>
+    <x>20</x>
+    <y>590</y>
+    <width>1600</width>
+    <height>550</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey03-titlebar_5</name>
+      <width>1600</width>
+      <height>550</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display MBL 04</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(MBL04_K01_amp)</K01_amp>
+        <K01_phase>$(MBL04_K01_phase)</K01_phase>
+        <K02_amp>$(MBL04_K02_amp)</K02_amp>
+        <K02_phase>$(MBL04_K02_phase)</K02_phase>
+        <K03_amp>$(MBL04_K03_amp)</K03_amp>
+        <K03_phase>$(MBL04_K03_phase)</K03_phase>
+        <K04_amp>$(MBL04_K04_amp)</K04_amp>
+        <K04_phase>$(MBL04_K04_phase)</K04_phase>
+        <cavityName>MBL Cavity 4</cavityName>
+        <sectionName>MBL 4</sectionName>
+      </macros>
+      <x>20</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display MBL 05</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(MBL05_K01_amp)</K01_amp>
+        <K01_phase>$(MBL05_K01_phase)</K01_phase>
+        <K02_amp>$(MBL05_K02_amp)</K02_amp>
+        <K02_phase>$(MBL05_K02_phase)</K02_phase>
+        <K03_amp>$(MBL05_K03_amp)</K03_amp>
+        <K03_phase>$(MBL05_K03_phase)</K03_phase>
+        <K04_amp>$(MBL05_K04_amp)</K04_amp>
+        <K04_phase>$(MBL05_K04_phase)</K04_phase>
+        <cavityName>MBL Cavity 5</cavityName>
+        <sectionName>MBL 5</sectionName>
+      </macros>
+      <x>550</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display MBL 06</name>
+      <file>EmbedddedWindows/em_cav_rr.bob</file>
+      <macros>
+        <K01_amp>$(MBL06_K01_amp)</K01_amp>
+        <K01_phase>$(MBL06_K01_phase)</K01_phase>
+        <K02_amp>$(MBL06_K02_amp)</K02_amp>
+        <K02_phase>$(MBL06_K02_phase)</K02_phase>
+        <K03_amp>$(MBL06_K03_amp)</K03_amp>
+        <K03_phase>$(MBL06_K03_phase)</K03_phase>
+        <K04_amp>$(MBL06_K04_amp)</K04_amp>
+        <K04_phase>$(MBL06_K04_phase)</K04_phase>
+        <cavityName>MBL Cavity 6</cavityName>
+        <sectionName>MBL 6</sectionName>
+      </macros>
+      <x>1070</x>
+      <y>20</y>
+      <width>510</width>
+      <height>515</height>
+    </widget>
+  </widget>
+</display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL_2.bob
similarity index 78%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL_2.bob
index 3d4a8158..d2e51f65 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_MBL_2.bob
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>Cavities - MBL</name>
+  <name>Cavities - MBL 7-9</name>
+  <class></class>
   <macros>
     <RFpowerFile>em_rf_rr.bob</RFpowerFile>
-
   </macros>
-  <width>1200</width>
-  <height>900</height>
+  <width>2156</width>
+  <height>1240</height>
   <background_color>
     <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
   </background_color>
   <widget type="group" version="2.0.0">
     <name>Signal</name>
-    <x>1640</x>
+    <x>1120</x>
     <y>20</y>
-    <width>700</width>
-    <height>1690</height>
+    <width>1050</width>
+    <height>1200</height>
     <style>3</style>
     <background_color>
       <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -24,8 +24,8 @@
     </background_color>
     <widget type="rectangle" version="2.0.0">
       <name>BGGrey03-titlebar_3</name>
-      <width>700</width>
-      <height>1690</height>
+      <width>1050</width>
+      <height>1200</height>
       <line_width>0</line_width>
       <background_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -54,14 +54,14 @@
       <name>BGGrey03-content-group_2</name>
       <x>15</x>
       <y>50</y>
-      <width>670</width>
-      <height>1620</height>
+      <width>1020</width>
+      <height>1130</height>
       <style>3</style>
       <transparent>true</transparent>
       <widget type="rectangle" version="2.0.0">
         <name>BGGrey03-background_3</name>
-        <width>670</width>
-        <height>1620</height>
+        <width>1020</width>
+        <height>1130</height>
         <line_width>0</line_width>
         <background_color>
           <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -74,8 +74,8 @@
         <name>LGGrey02_6</name>
         <x>17</x>
         <y>20</y>
-        <width>635</width>
-        <height>1580</height>
+        <width>985</width>
+        <height>1090</height>
         <style>3</style>
         <background_color>
           <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -85,8 +85,8 @@
           <name>X/Y Plot_3</name>
           <x>15</x>
           <y>15</y>
-          <width>605</width>
-          <height>770</height>
+          <width>955</width>
+          <height>525</height>
           <background_color>
             <color name="BACKGROUND" red="220" green="225" blue="221">
             </color>
@@ -95,7 +95,6 @@
             <font family="Source Sans Pro" style="BOLD_ITALIC" size="14.0">
             </font>
           </title_font>
-          <show_toolbar>true</show_toolbar>
           <rules>
             <rule name="MinCurrentLimit" prop_id="y_axes[0].minimum" out_exp="true">
               <exp bool_exp="true">
@@ -307,9 +306,9 @@
         <widget type="xyplot" version="2.0.0">
           <name>X/Y Plot_4</name>
           <x>15</x>
-          <y>790</y>
-          <width>605</width>
-          <height>770</height>
+          <y>555</y>
+          <width>955</width>
+          <height>525</height>
           <background_color>
             <color name="BACKGROUND" red="220" green="225" blue="221">
             </color>
@@ -318,7 +317,6 @@
             <font family="Source Sans Pro" style="BOLD_ITALIC" size="14.0">
             </font>
           </title_font>
-          <show_toolbar>true</show_toolbar>
           <rules>
             <rule name="MinCurrentLimit" prop_id="y_axes[0].minimum" out_exp="true">
               <exp bool_exp="true">
@@ -531,178 +529,16 @@
     </widget>
   </widget>
   <widget type="group" version="2.0.0">
-    <name>CurrentPowerGroup_K01-K03</name>
+    <name>CurrentPowerGroup_K07-K08</name>
     <x>20</x>
     <y>20</y>
-    <width>1600</width>
-    <height>550</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>BGGrey03-titlebar_4</name>
-      <width>1600</width>
-      <height>550</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display MBL 01</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(MBL01_K01_amp)</K01_amp>
-        <K01_phase>$(MBL01_K01_phase)</K01_phase>
-        <K02_amp>$(MBL01_K02_amp)</K02_amp>
-        <K02_phase>$(MBL01_K02_phase)</K02_phase>
-        <K03_amp>$(MBL01_K03_amp)</K03_amp>
-        <K03_phase>$(MBL01_K03_phase)</K03_phase>
-        <K04_amp>$(MBL01_K04_amp)</K04_amp>
-        <K04_phase>$(MBL01_K04_phase)</K04_phase>
-        <cavityName>MBL Cavity 1</cavityName>
-        <sectionName>MBL 1</sectionName>
-      </macros>
-      <x>20</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display MBL 02</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(MBL02_K01_amp)</K01_amp>
-        <K01_phase>$(MBL02_K01_phase)</K01_phase>
-        <K02_amp>$(MBL02_K02_amp)</K02_amp>
-        <K02_phase>$(MBL02_K02_phase)</K02_phase>
-        <K03_amp>$(MBL02_K03_amp)</K03_amp>
-        <K03_phase>$(MBL02_K03_phase)</K03_phase>
-        <K04_amp>$(MBL02_K04_amp)</K04_amp>
-        <K04_phase>$(MBL02_K04_phase)</K04_phase>
-        <cavityName>MBL Cavity 2</cavityName>
-        <sectionName>MBL 2</sectionName>
-      </macros>
-      <x>550</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display MBL 03</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(MBL03_K01_amp)</K01_amp>
-        <K01_phase>$(MBL03_K01_phase)</K01_phase>
-        <K02_amp>$(MBL03_K02_amp)</K02_amp>
-        <K02_phase>$(MBL03_K02_phase)</K02_phase>
-        <K03_amp>$(MBL03_K03_amp)</K03_amp>
-        <K03_phase>$(MBL03_K03_phase)</K03_phase>
-        <K04_amp>$(MBL03_K04_amp)</K04_amp>
-        <K04_phase>$(MBL03_K04_phase)</K04_phase>
-        <cavityName>MBL Cavity 3</cavityName>
-        <sectionName>MBL 3</sectionName>
-      </macros>
-      <x>1070</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>CurrentPowerGroup_K04-K06</name>
-    <x>20</x>
-    <y>590</y>
-    <width>1600</width>
-    <height>550</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>BGGrey03-titlebar_5</name>
-      <width>1600</width>
-      <height>550</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color name="GROUP-BORDER" red="150" green="155" blue="151">
-        </color>
-      </background_color>
-      <corner_width>10</corner_width>
-      <corner_height>10</corner_height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display MBL 04</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(MBL04_K01_amp)</K01_amp>
-        <K01_phase>$(MBL04_K01_phase)</K01_phase>
-        <K02_amp>$(MBL04_K02_amp)</K02_amp>
-        <K02_phase>$(MBL04_K02_phase)</K02_phase>
-        <K03_amp>$(MBL04_K03_amp)</K03_amp>
-        <K03_phase>$(MBL04_K03_phase)</K03_phase>
-        <K04_amp>$(MBL04_K04_amp)</K04_amp>
-        <K04_phase>$(MBL04_K04_phase)</K04_phase>
-        <cavityName>MBL Cavity 4</cavityName>
-        <sectionName>MBL 4</sectionName>
-      </macros>
-      <x>20</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display MBL 05</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(MBL05_K01_amp)</K01_amp>
-        <K01_phase>$(MBL05_K01_phase)</K01_phase>
-        <K02_amp>$(MBL05_K02_amp)</K02_amp>
-        <K02_phase>$(MBL05_K02_phase)</K02_phase>
-        <K03_amp>$(MBL05_K03_amp)</K03_amp>
-        <K03_phase>$(MBL05_K03_phase)</K03_phase>
-        <K04_amp>$(MBL05_K04_amp)</K04_amp>
-        <K04_phase>$(MBL05_K04_phase)</K04_phase>
-        <cavityName>MBL Cavity 5</cavityName>
-        <sectionName>MBL 5</sectionName>
-      </macros>
-      <x>550</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-    <widget type="embedded" version="2.0.0">
-      <name>Embedded Display MBL 06</name>
-      <file>EmbedddedWindows/em_cav_rr.bob</file>
-      <macros>
-        <K01_amp>$(MBL06_K01_amp)</K01_amp>
-        <K01_phase>$(MBL06_K01_phase)</K01_phase>
-        <K02_amp>$(MBL06_K02_amp)</K02_amp>
-        <K02_phase>$(MBL06_K02_phase)</K02_phase>
-        <K03_amp>$(MBL06_K03_amp)</K03_amp>
-        <K03_phase>$(MBL06_K03_phase)</K03_phase>
-        <K04_amp>$(MBL06_K04_amp)</K04_amp>
-        <K04_phase>$(MBL06_K04_phase)</K04_phase>
-        <cavityName>MBL Cavity 6</cavityName>
-        <sectionName>MBL 6</sectionName>
-      </macros>
-      <x>1070</x>
-      <y>20</y>
-      <width>510</width>
-      <height>515</height>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>CurrentPowerGroup_K07-K09</name>
-    <x>20</x>
-    <y>1160</y>
-    <width>1600</width>
+    <width>1080</width>
     <height>550</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>BGGrey03-titlebar_6</name>
-      <width>1600</width>
+      <width>1080</width>
       <height>550</height>
       <line_width>0</line_width>
       <background_color>
@@ -752,6 +588,27 @@
       <width>510</width>
       <height>515</height>
     </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>CurrentPowerGroup_K09</name>
+    <x>20</x>
+    <y>590</y>
+    <width>550</width>
+    <height>550</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>BGGrey03-titlebar_7</name>
+      <width>550</width>
+      <height>550</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display MBL 09</name>
       <file>EmbedddedWindows/em_cav_rr.bob</file>
@@ -767,7 +624,7 @@
         <cavityName>MBL Cavity 9</cavityName>
         <sectionName>MBL 9</sectionName>
       </macros>
-      <x>1070</x>
+      <x>20</x>
       <y>20</y>
       <width>510</width>
       <height>515</height>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_NCL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_NCL.bob
index c5d7a6fd..4ca7f33b 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_NCL.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_NCL.bob
@@ -168,7 +168,6 @@
             <font family="Source Sans Pro" style="BOLD_ITALIC" size="14.0">
             </font>
           </title_font>
-          <show_toolbar>true</show_toolbar>
           <rules>
             <rule name="MinCurrentLimit" prop_id="y_axes[0].minimum" out_exp="true">
               <exp bool_exp="true">
@@ -391,7 +390,6 @@
             <font family="Source Sans Pro" style="BOLD_ITALIC" size="14.0">
             </font>
           </title_font>
-          <show_toolbar>true</show_toolbar>
           <rules>
             <rule name="MinCurrentLimit" prop_id="y_axes[0].minimum" out_exp="true">
               <exp bool_exp="true">
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_Spk.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_Spk.bob
index 5a0ce0d9..906dc40d 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_Spk.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavs_Spk.bob
@@ -3,10 +3,6 @@
   <name>Cavities - Spokes</name>
   <class></class>
   <macros>
-    <Spk01_amp>$(PV_Spk01_amp)</Spk01_amp>
-    <Spk01_fwd>$(PV_Spk01_fwd)</Spk01_fwd>
-    <Spk01_phase>$(PV_Spk01_phase)</Spk01_phase>
-    <Spk01_ref>$(PV_Spk01_ref)</Spk01_ref>
     <Spk01_RFPS01_PowerR>$(PV_Spk01_RFPS01_PowerR)</Spk01_RFPS01_PowerR>
     <Spk01_RFPS01_PowerS>$(PV_Spk01_RFPS01_PowerS)</Spk01_RFPS01_PowerS>
     <Spk01_RFPS01_amp>$(PV_Spk01_RFPS01_amp)</Spk01_RFPS01_amp>
@@ -23,10 +19,10 @@
     <Spk01_RFPS04_PowerS>$(PV_Spk01_RFPS04_PowerS)</Spk01_RFPS04_PowerS>
     <Spk01_RFPS04_amp>$(PV_Spk01_RFPS04_amp)</Spk01_RFPS04_amp>
     <Spk01_RFPS04_phase>$(PV_Spk01_RFPS04_phase)</Spk01_RFPS04_phase>
-    <Spk02_amp>$(PV_Spk02_amp)</Spk02_amp>
-    <Spk02_fwd>$(PV_Spk02_fwd)</Spk02_fwd>
-    <Spk02_phase>$(PV_Spk02_phase)</Spk02_phase>
-    <Spk02_ref>$(PV_Spk02_ref)</Spk02_ref>
+    <Spk01_amp>$(PV_Spk01_amp)</Spk01_amp>
+    <Spk01_fwd>$(PV_Spk01_fwd)</Spk01_fwd>
+    <Spk01_phase>$(PV_Spk01_phase)</Spk01_phase>
+    <Spk01_ref>$(PV_Spk01_ref)</Spk01_ref>
     <Spk02_RFPS01_PowerR>$(PV_Spk02_RFPS01_PowerR)</Spk02_RFPS01_PowerR>
     <Spk02_RFPS01_PowerS>$(PV_Spk02_RFPS01_PowerS)</Spk02_RFPS01_PowerS>
     <Spk02_RFPS01_amp>$(PV_Spk02_RFPS01_amp)</Spk02_RFPS01_amp>
@@ -43,10 +39,10 @@
     <Spk02_RFPS04_PowerS>$(PV_Spk02_RFPS04_PowerS)</Spk02_RFPS04_PowerS>
     <Spk02_RFPS04_amp>$(PV_Spk02_RFPS04_amp)</Spk02_RFPS04_amp>
     <Spk02_RFPS04_phase>$(PV_Spk02_RFPS04_phase)</Spk02_RFPS04_phase>
-    <Spk03_amp>$(PV_Spk03_amp)</Spk03_amp>
-    <Spk03_fwd>$(PV_Spk03_fwd)</Spk03_fwd>
-    <Spk03_phase>$(PV_Spk03_phase)</Spk03_phase>
-    <Spk03_ref>$(PV_Spk03_ref)</Spk03_ref>
+    <Spk02_amp>$(PV_Spk02_amp)</Spk02_amp>
+    <Spk02_fwd>$(PV_Spk02_fwd)</Spk02_fwd>
+    <Spk02_phase>$(PV_Spk02_phase)</Spk02_phase>
+    <Spk02_ref>$(PV_Spk02_ref)</Spk02_ref>
     <Spk03_RFPS01_PowerR>$(PV_Spk03_RFPS01_PowerR)</Spk03_RFPS01_PowerR>
     <Spk03_RFPS01_PowerS>$(PV_Spk03_RFPS01_PowerS)</Spk03_RFPS01_PowerS>
     <Spk03_RFPS01_amp>$(PV_Spk03_RFPS01_amp)</Spk03_RFPS01_amp>
@@ -63,10 +59,10 @@
     <Spk03_RFPS04_PowerS>$(PV_Spk03_RFPS04_PowerS)</Spk03_RFPS04_PowerS>
     <Spk03_RFPS04_amp>$(PV_Spk03_RFPS04_amp)</Spk03_RFPS04_amp>
     <Spk03_RFPS04_phase>$(PV_Spk03_RFPS04_phase)</Spk03_RFPS04_phase>
-    <Spk04_amp>$(PV_Spk04_amp)</Spk04_amp>
-    <Spk04_fwd>$(PV_Spk04_fwd)</Spk04_fwd>
-    <Spk04_phase>$(PV_Spk04_phase)</Spk04_phase>
-    <Spk04_ref>$(PV_Spk04_ref)</Spk04_ref>
+    <Spk03_amp>$(PV_Spk03_amp)</Spk03_amp>
+    <Spk03_fwd>$(PV_Spk03_fwd)</Spk03_fwd>
+    <Spk03_phase>$(PV_Spk03_phase)</Spk03_phase>
+    <Spk03_ref>$(PV_Spk03_ref)</Spk03_ref>
     <Spk04_RFPS01_PowerR>$(PV_Spk04_RFPS01_PowerR)</Spk04_RFPS01_PowerR>
     <Spk04_RFPS01_PowerS>$(PV_Spk04_RFPS01_PowerS)</Spk04_RFPS01_PowerS>
     <Spk04_RFPS01_amp>$(PV_Spk04_RFPS01_amp)</Spk04_RFPS01_amp>
@@ -83,10 +79,10 @@
     <Spk04_RFPS04_PowerS>$(PV_Spk04_RFPS04_PowerS)</Spk04_RFPS04_PowerS>
     <Spk04_RFPS04_amp>$(PV_Spk04_RFPS04_amp)</Spk04_RFPS04_amp>
     <Spk04_RFPS04_phase>$(PV_Spk04_RFPS04_phase)</Spk04_RFPS04_phase>
-    <Spk05_amp>$(PV_Spk05_amp)</Spk05_amp>
-    <Spk05_fwd>$(PV_Spk05_fwd)</Spk05_fwd>
-    <Spk05_phase>$(PV_Spk05_phase)</Spk05_phase>
-    <Spk05_ref>$(PV_Spk05_ref)</Spk05_ref>
+    <Spk04_amp>$(PV_Spk04_amp)</Spk04_amp>
+    <Spk04_fwd>$(PV_Spk04_fwd)</Spk04_fwd>
+    <Spk04_phase>$(PV_Spk04_phase)</Spk04_phase>
+    <Spk04_ref>$(PV_Spk04_ref)</Spk04_ref>
     <Spk05_RFPS01_PowerR>$(PV_Spk05_RFPS01_PowerR)</Spk05_RFPS01_PowerR>
     <Spk05_RFPS01_PowerS>$(PV_Spk05_RFPS01_PowerS)</Spk05_RFPS01_PowerS>
     <Spk05_RFPS01_amp>$(PV_Spk05_RFPS01_amp)</Spk05_RFPS01_amp>
@@ -103,10 +99,10 @@
     <Spk05_RFPS04_PowerS>$(PV_Spk05_RFPS04_PowerS)</Spk05_RFPS04_PowerS>
     <Spk05_RFPS04_amp>$(PV_Spk05_RFPS04_amp)</Spk05_RFPS04_amp>
     <Spk05_RFPS04_phase>$(PV_Spk05_RFPS04_phase)</Spk05_RFPS04_phase>
-    <Spk06_amp>$(PV_Spk06_amp)</Spk06_amp>
-    <Spk06_fwd>$(PV_Spk06_fwd)</Spk06_fwd>
-    <Spk06_phase>$(PV_Spk06_phase)</Spk06_phase>
-    <Spk06_ref>$(PV_Spk06_ref)</Spk06_ref>
+    <Spk05_amp>$(PV_Spk05_amp)</Spk05_amp>
+    <Spk05_fwd>$(PV_Spk05_fwd)</Spk05_fwd>
+    <Spk05_phase>$(PV_Spk05_phase)</Spk05_phase>
+    <Spk05_ref>$(PV_Spk05_ref)</Spk05_ref>
     <Spk06_RFPS01_PowerR>$(PV_Spk06_RFPS01_PowerR)</Spk06_RFPS01_PowerR>
     <Spk06_RFPS01_PowerS>$(PV_Spk06_RFPS01_PowerS)</Spk06_RFPS01_PowerS>
     <Spk06_RFPS01_amp>$(PV_Spk06_RFPS01_amp)</Spk06_RFPS01_amp>
@@ -123,10 +119,10 @@
     <Spk06_RFPS04_PowerS>$(PV_Spk06_RFPS04_PowerS)</Spk06_RFPS04_PowerS>
     <Spk06_RFPS04_amp>$(PV_Spk06_RFPS04_amp)</Spk06_RFPS04_amp>
     <Spk06_RFPS04_phase>$(PV_Spk06_RFPS04_phase)</Spk06_RFPS04_phase>
-    <Spk07_amp>$(PV_Spk07_amp)</Spk07_amp>
-    <Spk07_fwd>$(PV_Spk07_fwd)</Spk07_fwd>
-    <Spk07_phase>$(PV_Spk07_phase)</Spk07_phase>
-    <Spk07_ref>$(PV_Spk07_ref)</Spk07_ref>
+    <Spk06_amp>$(PV_Spk06_amp)</Spk06_amp>
+    <Spk06_fwd>$(PV_Spk06_fwd)</Spk06_fwd>
+    <Spk06_phase>$(PV_Spk06_phase)</Spk06_phase>
+    <Spk06_ref>$(PV_Spk06_ref)</Spk06_ref>
     <Spk07_RFPS01_PowerR>$(PV_Spk07_RFPS01_PowerR)</Spk07_RFPS01_PowerR>
     <Spk07_RFPS01_PowerS>$(PV_Spk07_RFPS01_PowerS)</Spk07_RFPS01_PowerS>
     <Spk07_RFPS01_amp>$(PV_Spk07_RFPS01_amp)</Spk07_RFPS01_amp>
@@ -143,6 +139,10 @@
     <Spk07_RFPS04_PowerS>$(PV_Spk07_RFPS04_PowerS)</Spk07_RFPS04_PowerS>
     <Spk07_RFPS04_amp>$(PV_Spk07_RFPS04_amp)</Spk07_RFPS04_amp>
     <Spk07_RFPS04_phase>$(PV_Spk07_RFPS04_phase)</Spk07_RFPS04_phase>
+    <Spk07_amp>$(PV_Spk07_amp)</Spk07_amp>
+    <Spk07_fwd>$(PV_Spk07_fwd)</Spk07_fwd>
+    <Spk07_phase>$(PV_Spk07_phase)</Spk07_phase>
+    <Spk07_ref>$(PV_Spk07_ref)</Spk07_ref>
   </macros>
   <width>2310</width>
   <height>1300</height>
@@ -369,17 +369,17 @@
       <cavityName>Spokes Tetrode 07</cavityName>
       <sectionName>Spk 07</sectionName>
     </macros>
-    <x>20</x>
-    <y>980</y>
+    <x>410</x>
+    <y>500</y>
     <width>370</width>
     <height>460</height>
   </widget>
   <widget type="group" version="2.0.0">
     <name>Signal_1</name>
-    <x>410</x>
+    <x>800</x>
     <y>500</y>
-    <width>1540</width>
-    <height>940</height>
+    <width>1360</width>
+    <height>720</height>
     <style>3</style>
     <background_color>
       <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -387,8 +387,8 @@
     </background_color>
     <widget type="rectangle" version="2.0.0">
       <name>BGGrey03-titlebar_4</name>
-      <width>1540</width>
-      <height>940</height>
+      <width>1360</width>
+      <height>720</height>
       <line_width>0</line_width>
       <background_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -401,7 +401,7 @@
       <name>BGGrey03-title_3</name>
       <text>Spokes Cavities - Power History</text>
       <x>14</x>
-      <width>576</width>
+      <width>1300</width>
       <height>50</height>
       <font>
         <font family="Source Sans Pro" style="BOLD_ITALIC" size="24.0">
@@ -417,14 +417,14 @@
       <name>BGGrey03-content-group_3</name>
       <x>15</x>
       <y>50</y>
-      <width>1510</width>
-      <height>870</height>
+      <width>1330</width>
+      <height>650</height>
       <style>3</style>
       <transparent>true</transparent>
       <widget type="rectangle" version="2.0.0">
         <name>BGGrey03-background_4</name>
-        <width>1510</width>
-        <height>870</height>
+        <width>1330</width>
+        <height>650</height>
         <line_width>0</line_width>
         <background_color>
           <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -437,8 +437,8 @@
         <name>LGGrey02_7</name>
         <x>17</x>
         <y>20</y>
-        <width>1470</width>
-        <height>830</height>
+        <width>1290</width>
+        <height>610</height>
         <style>3</style>
         <background_color>
           <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -448,8 +448,8 @@
           <name>X/Y Plot_5</name>
           <x>15</x>
           <y>15</y>
-          <width>1434</width>
-          <height>395</height>
+          <width>1254</width>
+          <height>285</height>
           <background_color>
             <color name="BACKGROUND" red="220" green="225" blue="221">
             </color>
@@ -458,7 +458,6 @@
             <font family="Source Sans Pro" style="BOLD_ITALIC" size="14.0">
             </font>
           </title_font>
-          <show_toolbar>true</show_toolbar>
           <rules>
             <rule name="MinCurrentLimit" prop_id="y_axes[0].minimum" out_exp="true">
               <exp bool_exp="true">
@@ -636,9 +635,9 @@
         <widget type="xyplot" version="2.0.0">
           <name>X/Y Plot_6</name>
           <x>15</x>
-          <y>425</y>
-          <width>1434</width>
-          <height>395</height>
+          <y>315</y>
+          <width>1254</width>
+          <height>285</height>
           <background_color>
             <color name="BACKGROUND" red="220" green="225" blue="221">
             </color>
@@ -647,7 +646,6 @@
             <font family="Source Sans Pro" style="BOLD_ITALIC" size="14.0">
             </font>
           </title_font>
-          <show_toolbar>true</show_toolbar>
           <x_axis>
             <title>Time</title>
             <autoscale>false</autoscale>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cryogenics.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cryogenics.bob
index 999de1ae..db708797 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cryogenics.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cryogenics.bob
@@ -12,8 +12,8 @@
     <file>../../Cryo/TICP/CrS-TICP_CRYO_LCR/opi/cryo-13-general.bob</file>
     <x>20</x>
     <y>20</y>
-    <width>2200</width>
-    <height>1220</height>
+    <width>2090</width>
+    <height>1190</height>
     <transparent>true</transparent>
   </widget>
 </display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_diagnostics.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_diagnostics.bob
index 9314b3a2..88e0d022 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_diagnostics.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_diagnostics.bob
@@ -509,13 +509,13 @@
     <name>FCGroup</name>
     <x>1460</x>
     <y>600</y>
-    <width>990</width>
+    <width>910</width>
     <height>730</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>MGGrey03-background_5</name>
-      <width>990</width>
+      <width>910</width>
       <height>730</height>
       <line_width>2</line_width>
       <line_color>
@@ -532,7 +532,7 @@
     <widget type="label" version="2.0.0">
       <name>MGGrey03-title_5</name>
       <text>Faraday Cup</text>
-      <width>990</width>
+      <width>910</width>
       <height>50</height>
       <font>
         <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
@@ -548,15 +548,15 @@
     <widget type="spinner" version="2.0.0">
       <name>Spinner_1</name>
       <pv_name>$(MEBTBCM03)</pv_name>
-      <x>820</x>
+      <x>560</x>
       <y>150</y>
       <height>50</height>
     </widget>
     <widget type="spinner" version="2.0.0">
       <name>Spinner</name>
       <pv_name>$(LEBTBCM01)</pv_name>
-      <x>540</x>
-      <y>150</y>
+      <x>330</x>
+      <y>120</y>
       <height>50</height>
     </widget>
   </widget>
@@ -688,16 +688,16 @@
     </widget>
   </widget>
   <widget type="group" version="2.0.0">
-    <name>PhaseGroup_1</name>
+    <name>PhaseGroup</name>
     <x>1770</x>
     <y>280</y>
-    <width>680</width>
+    <width>600</width>
     <height>300</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>MGGrey03-background_17</name>
-      <width>680</width>
+      <width>600</width>
       <height>300</height>
       <line_width>2</line_width>
       <line_color>
@@ -714,7 +714,7 @@
     <widget type="label" version="2.0.0">
       <name>MGGrey03-title_15</name>
       <text>Phase Scan</text>
-      <width>680</width>
+      <width>600</width>
       <height>50</height>
       <font>
         <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
@@ -732,13 +732,13 @@
     <name>PowerGroup</name>
     <x>1890</x>
     <y>20</y>
-    <width>560</width>
+    <width>480</width>
     <height>240</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>MGGrey03-background_18</name>
-      <width>560</width>
+      <width>480</width>
       <height>240</height>
       <line_width>2</line_width>
       <line_color>
@@ -755,7 +755,7 @@
     <widget type="label" version="2.0.0">
       <name>MGGrey03-title_16</name>
       <text>Beam Power</text>
-      <width>560</width>
+      <width>480</width>
       <height>50</height>
       <font>
         <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
@@ -772,7 +772,7 @@
       <name>BeamPowerPlot</name>
       <x>20</x>
       <y>50</y>
-      <width>520</width>
+      <width>440</width>
       <height>180</height>
       <background_color>
         <color name="Transparent" red="255" green="255" blue="255" alpha="0">
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_magnets.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_magnets.bob
index 9c264e52..db4a6d21 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_magnets.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_magnets.bob
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>Magnets</name>
+  <class></class>
   <macros>
     <controlbool>$(loc://controlbool)</controlbool>
   </macros>
-  <width>1200</width>
-  <height>900</height>
+  <width>2330</width>
+  <height>1236</height>
   <background_color>
     <color name="BACKGROUND" red="220" green="225" blue="221">
     </color>
@@ -13,7 +14,7 @@
   <widget type="rectangle" version="2.0.0">
     <name>Rectangle_39</name>
     <width>200</width>
-    <height>1342</height>
+    <height>1236</height>
     <line_width>0</line_width>
     <background_color>
       <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
@@ -39,7 +40,7 @@
       </tab>
     </tabs>
     <width>2150</width>
-    <height>1342</height>
+    <height>1236</height>
     <tab_width>200</tab_width>
     <tab_height>40</tab_height>
     <tab_spacing>10</tab_spacing>
@@ -61,7 +62,7 @@
           <ROOT>$(ROOT)</ROOT>
           <boolpv>loc://magcontrolbool</boolpv>
           <detachwindowpath>collectedOPIs_01_mags_lebtmebt.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>LEBT and MEBT magnets</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -74,7 +75,7 @@
           <ROOT>$(ROOT)</ROOT>
           <boolpv>loc://magcontrolbool</boolpv>
           <detachwindowpath>collectedOPIs_01_mags_dtl.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>DTL magnets</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -87,7 +88,7 @@
           <ROOT>$(ROOT)</ROOT>
           <boolpv>loc://magcontrolbool</boolpv>
           <detachwindowpath>collectedOPIs_01_mags_CH.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>CH (Horizontal Corrector) magnets</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -100,7 +101,7 @@
           <ROOT>$(ROOT)</ROOT>
           <boolpv>loc://magcontrolbool</boolpv>
           <detachwindowpath>collectedOPIs_01_mags_CV.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>CV (Vertical Corrector) magnets</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -113,7 +114,7 @@
           <ROOT>$(ROOT)</ROOT>
           <boolpv>loc://magcontrolbool</boolpv>
           <detachwindowpath>collectedOPIs_01_mags_others.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>ISrc and Focusing magnets</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mainOverview.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mainOverview.bob
index 006c719d..d588e5ab 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mainOverview.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_mainOverview.bob
@@ -6,7 +6,7 @@
     <RFpowerFile>./EmbedddedWindows/em_rf_rr_less.bob</RFpowerFile>
   </macros>
   <width>2350</width>
-  <height>1342</height>
+  <height>1240</height>
   <background_color>
     <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
@@ -25,7 +25,7 @@
     <x>20</x>
     <y>20</y>
     <width>1350</width>
-    <height>1300</height>
+    <height>1200</height>
     <show_toolbar>false</show_toolbar>
   </widget>
   <widget type="group" version="2.0.0">
@@ -337,7 +337,7 @@
     <x>1390</x>
     <y>720</y>
     <width>460</width>
-    <height>600</height>
+    <height>500</height>
   </widget>
   <widget type="group" version="2.0.0">
     <name>CurrentPowerGroup</name>
@@ -480,6 +480,6 @@
     <x>1870</x>
     <y>720</y>
     <width>460</width>
-    <height>600</height>
+    <height>500</height>
   </widget>
 </display>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_system.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_system.bob
index cd91e1a3..8bd8df26 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_system.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_system.bob
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>System</name>
-  <width>1200</width>
-  <height>900</height>
+  <width>2350</width>
+  <height>1238</height>
   <background_color>
     <color name="BACKGROUND" red="220" green="225" blue="221">
     </color>
   </background_color>
   <widget type="rectangle" version="2.0.0">
     <name>Rectangle_40</name>
+    <class></class>
     <width>200</width>
-    <height>1342</height>
+    <height>1238</height>
     <line_width>0</line_width>
     <background_color>
       <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
@@ -42,8 +43,8 @@
         <group_name></group_name>
       </tab>
     </tabs>
-    <width>2460</width>
-    <height>1322</height>
+    <width>2370</width>
+    <height>1238</height>
     <tab_width>200</tab_width>
     <tab_height>40</tab_height>
     <tab_spacing>10</tab_spacing>
@@ -60,9 +61,13 @@
     <name>DetachButton</name>
     <actions>
       <action type="open_display">
-        <file>collectedOPIs_01_systs_ints_overview.bob</file>
+        <file>detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
+          <detachwindowpath>collectedOPIs_01_systs_ints_overview.bob</detachwindowpath>
+          <windowheight>1300</windowheight>
+          <windowtitle>NCL Machine State Overview</windowtitle>
+          <windowwidth>2350</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach Interlocks Overview</description>
@@ -72,7 +77,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_systs_ints_NCL.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>NCL Interlocks</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -84,7 +89,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_systs_ints_SCL.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>SCL Interlocks</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -96,7 +101,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_systs_ints_target.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>Target Interlocks</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -108,7 +113,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_systs_ints_pss.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>PSS Overview</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -120,7 +125,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_systs_ints_history.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>Interlocks History</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -132,7 +137,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_systs_valvesflows.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
+          <windowheight>1300</windowheight>
           <windowtitle>Valves, Flows and Temperatures Overview</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -140,9 +145,13 @@
         <description>Detach Valves and Flows</description>
       </action>
       <action type="open_display">
-        <file>$(ROOT)/ess-opis/ess-opis/NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_LCR/cryo-00-main.bob</file>
+        <file>detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
+          <detachwindowpath>../../Cryo/TICP/CrS-TICP_CRYO_LCR/cryo-00-main.bob</detachwindowpath>
+          <windowheight>1300</windowheight>
+          <windowtitle>Cryogenics</windowtitle>
+          <windowwidth>2350</windowwidth>
         </macros>
         <target>window</target>
         <description>Launch Cryogenics</description>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_interlocks.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_interlocks.bob
index 3c3134a9..a31313c3 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_interlocks.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_interlocks.bob
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>Systems - Interlocks</name>
-  <width>1200</width>
-  <height>900</height>
+  <class></class>
+  <width>2156</width>
+  <height>1226</height>
   <background_color>
     <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
@@ -10,7 +11,7 @@
   <widget type="rectangle" version="2.0.0">
     <name>Rectangle_39</name>
     <width>200</width>
-    <height>1310</height>
+    <height>1226</height>
     <line_width>0</line_width>
     <background_color>
       <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
@@ -49,7 +50,7 @@
         <group_name></group_name>
       </tab>
       <tab>
-        <name>PSS</name>
+        <name>ODH</name>
         <file>collectedOPIs_01_systs_ints_pss.bob</file>
         <macros>
         </macros>
@@ -63,8 +64,8 @@
         <group_name></group_name>
       </tab>
     </tabs>
-    <width>2240</width>
-    <height>1300</height>
+    <width>2156</width>
+    <height>1226</height>
     <tab_width>200</tab_width>
     <tab_height>40</tab_height>
     <tab_spacing>10</tab_spacing>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_NCL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_NCL.bob
index c67cdfe2..fb92ddd2 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_NCL.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_NCL.bob
@@ -1727,7 +1727,7 @@
   </widget>
   <widget type="group" version="2.0.0">
     <name>ResetGroup</name>
-    <x>1240</x>
+    <x>1590</x>
     <y>20</y>
     <width>330</width>
     <style>3</style>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_SCL.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_SCL.bob
index fa6705c9..b6160f34 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_SCL.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_SCL.bob
@@ -1727,7 +1727,7 @@
   </widget>
   <widget type="group" version="2.0.0">
     <name>ResetGroup</name>
-    <x>1240</x>
+    <x>1590</x>
     <y>20</y>
     <width>330</width>
     <style>3</style>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_history.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_history.bob
index bb81445e..e574b0fe 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_history.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_history.bob
@@ -11,8 +11,8 @@
     <name>Interlocks Table</name>
     <x>20</x>
     <y>70</y>
-    <width>2050</width>
-    <height>1140</height>
+    <width>1906</width>
+    <height>1130</height>
     <columns>
       <column>
         <name>Timestamp</name>
@@ -26,7 +26,7 @@
       </column>
       <column>
         <name>Description of Interlock(s)</name>
-        <width>1790</width>
+        <width>1650</width>
         <editable>true</editable>
       </column>
     </columns>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_overview.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_overview.bob
index 59f19b01..eb6774c0 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_overview.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_overview.bob
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>Systems - Overview</name>
+  <class></class>
   <macros>
     <Interlock01>PSS</Interlock01>
     <Interlock02>PLC</Interlock02>
@@ -13,7 +14,7 @@
     <section03>Target</section03>
     <section04>Beamlines</section04>
   </macros>
-  <width>1900</width>
+  <width>1730</width>
   <height>960</height>
   <background_color>
     <color name="Transparent" red="255" green="255" blue="255" alpha="0">
@@ -250,7 +251,7 @@
   </widget>
   <widget type="group" version="2.0.0">
     <name>ResetGroup</name>
-    <x>1670</x>
+    <x>1590</x>
     <y>20</y>
     <width>330</width>
     <style>3</style>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_target.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_target.bob
index 4fd1df0c..307253fa 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_target.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_ints_target.bob
@@ -1048,7 +1048,7 @@
   </widget>
   <widget type="group" version="2.0.0">
     <name>ResetGroup</name>
-    <x>760</x>
+    <x>1590</x>
     <y>20</y>
     <width>330</width>
     <style>3</style>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_valvesflows.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_valvesflows.bob
index f06ae160..14dcb922 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_valvesflows.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_systs_valvesflows.bob
@@ -46,13 +46,13 @@
     <x>20</x>
     <y>20</y>
     <width>1070</width>
-    <height>1210</height>
+    <height>1180</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>BGGrey03-titlebar_4</name>
       <width>1070</width>
-      <height>1210</height>
+      <height>1180</height>
       <line_width>0</line_width>
       <background_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -120,26 +120,13 @@
         <horizontal_alignment>1</horizontal_alignment>
         <vertical_alignment>1</vertical_alignment>
       </widget>
-      <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_60</name>
-        <file>$(RR_FlowsFile)</file>
-        <macros>
-          <name>LEBT N2</name>
-          <pv_curr>$(flow_n2)</pv_curr>
-        </macros>
-        <x>817</x>
-        <y>503</y>
-        <width>250</width>
-        <height>50</height>
-        <transparent>true</transparent>
-      </widget>
     </widget>
     <widget type="group" version="2.0.0">
       <name>HBL1_valves</name>
       <x>20</x>
       <y>670</y>
       <width>330</width>
-      <height>520</height>
+      <height>490</height>
       <style>3</style>
       <background_color>
         <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -148,7 +135,7 @@
       <widget type="rectangle" version="2.0.0">
         <name>MGGrey03-background_5</name>
         <width>330</width>
-        <height>520</height>
+        <height>490</height>
         <line_width>2</line_width>
         <line_color>
           <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -183,7 +170,7 @@
       <x>370</x>
       <y>670</y>
       <width>330</width>
-      <height>520</height>
+      <height>490</height>
       <style>3</style>
       <background_color>
         <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -192,7 +179,7 @@
       <widget type="rectangle" version="2.0.0">
         <name>MGGrey03-background_7</name>
         <width>330</width>
-        <height>520</height>
+        <height>490</height>
         <line_width>2</line_width>
         <line_color>
           <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -271,7 +258,7 @@
       <x>720</x>
       <y>670</y>
       <width>330</width>
-      <height>520</height>
+      <height>490</height>
       <style>3</style>
       <background_color>
         <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -280,7 +267,7 @@
       <widget type="rectangle" version="2.0.0">
         <name>MGGrey03-background_13</name>
         <width>330</width>
-        <height>520</height>
+        <height>490</height>
         <line_width>2</line_width>
         <line_color>
           <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -530,13 +517,13 @@
     <x>1110</x>
     <y>20</y>
     <width>640</width>
-    <height>290</height>
+    <height>240</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>BGGrey03-titlebar_5</name>
       <width>640</width>
-      <height>290</height>
+      <height>240</height>
       <line_width>0</line_width>
       <background_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -566,7 +553,7 @@
       <x>20</x>
       <y>50</y>
       <width>290</width>
-      <height>220</height>
+      <height>170</height>
       <style>3</style>
       <background_color>
         <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -575,7 +562,7 @@
       <widget type="rectangle" version="2.0.0">
         <name>MGGrey03-background</name>
         <width>290</width>
-        <height>220</height>
+        <height>170</height>
         <line_width>2</line_width>
         <line_color>
           <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -636,7 +623,7 @@
       <x>330</x>
       <y>50</y>
       <width>290</width>
-      <height>220</height>
+      <height>170</height>
       <style>3</style>
       <background_color>
         <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -645,7 +632,7 @@
       <widget type="rectangle" version="2.0.0">
         <name>MGGrey03-background_8</name>
         <width>290</width>
-        <height>220</height>
+        <height>170</height>
         <line_width>2</line_width>
         <line_color>
           <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -679,7 +666,7 @@
   <widget type="group" version="2.0.0">
     <name>PressureGroup</name>
     <x>1110</x>
-    <y>690</y>
+    <y>640</y>
     <width>640</width>
     <height>540</height>
     <style>3</style>
@@ -908,15 +895,15 @@
   <widget type="group" version="2.0.0">
     <name>PressureHistoryGroup</name>
     <x>1770</x>
-    <y>830</y>
-    <width>450</width>
-    <height>400</height>
+    <y>810</y>
+    <width>370</width>
+    <height>380</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>BGGrey03-titlebar_7</name>
-      <width>450</width>
-      <height>400</height>
+      <width>370</width>
+      <height>380</height>
       <line_width>0</line_width>
       <background_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -928,7 +915,7 @@
     <widget type="label" version="2.0.0">
       <name>BGGrey03-title_5</name>
       <text>Pressure History</text>
-      <width>450</width>
+      <width>370</width>
       <height>50</height>
       <font>
         <font family="Source Sans Pro" style="BOLD_ITALIC" size="24.0">
@@ -945,8 +932,8 @@
       <name>Strip Chart</name>
       <x>20</x>
       <y>50</y>
-      <width>410</width>
-      <height>330</height>
+      <width>330</width>
+      <height>310</height>
       <show_toolbar>false</show_toolbar>
       <show_legend>true</show_legend>
       <y_axes>
@@ -1080,13 +1067,13 @@
     <name>FlowHistoryGroup</name>
     <x>1770</x>
     <y>20</y>
-    <width>450</width>
+    <width>370</width>
     <height>370</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>BGGrey03-titlebar_8</name>
-      <width>450</width>
+      <width>370</width>
       <height>370</height>
       <line_width>0</line_width>
       <background_color>
@@ -1099,7 +1086,7 @@
     <widget type="label" version="2.0.0">
       <name>BGGrey03-title_6</name>
       <text>Flow History</text>
-      <width>450</width>
+      <width>370</width>
       <height>50</height>
       <font>
         <font family="Source Sans Pro" style="BOLD_ITALIC" size="24.0">
@@ -1116,7 +1103,7 @@
       <name>Strip Chart_1</name>
       <x>20</x>
       <y>50</y>
-      <width>410</width>
+      <width>330</width>
       <show_toolbar>false</show_toolbar>
       <show_legend>true</show_legend>
       <y_axes>
@@ -1174,7 +1161,7 @@
   <widget type="group" version="2.0.0">
     <name>TempGroup</name>
     <x>1110</x>
-    <y>330</y>
+    <y>280</y>
     <width>640</width>
     <height>340</height>
     <style>3</style>
@@ -1326,14 +1313,14 @@
     <name>TemperatureHistoryGroup</name>
     <x>1770</x>
     <y>410</y>
-    <width>450</width>
-    <height>400</height>
+    <width>370</width>
+    <height>380</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>BGGrey03-titlebar_12</name>
-      <width>450</width>
-      <height>400</height>
+      <width>370</width>
+      <height>380</height>
       <line_width>0</line_width>
       <background_color>
         <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -1345,7 +1332,7 @@
     <widget type="label" version="2.0.0">
       <name>BGGrey03-title_10</name>
       <text>Temperature History</text>
-      <width>450</width>
+      <width>370</width>
       <height>50</height>
       <font>
         <font family="Source Sans Pro" style="BOLD_ITALIC" size="24.0">
@@ -1362,8 +1349,8 @@
       <name>Strip Chart_4</name>
       <x>20</x>
       <y>50</y>
-      <width>410</width>
-      <height>330</height>
+      <width>330</width>
+      <height>310</height>
       <show_toolbar>false</show_toolbar>
       <show_legend>true</show_legend>
       <y_axes>
@@ -1493,4 +1480,17 @@
       </traces>
     </widget>
   </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_60</name>
+    <file>$(RR_FlowsFile)</file>
+    <macros>
+      <name>LEBT N2</name>
+      <pv_curr>$(flow_n2)</pv_curr>
+    </macros>
+    <x>1207</x>
+    <y>523</y>
+    <width>250</width>
+    <height>50</height>
+    <transparent>true</transparent>
+  </widget>
 </display>
-- 
GitLab