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 2aaa3c4d575eab9d8bc5383e5afbaf4231d79573..8753cc61367ce682048a4d80a849b02d04e29a20 100755
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Main_OPI_Navigator.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Main_OPI_Navigator.bob
@@ -272,9 +272,9 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_system.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1240</windowheight>
           <windowtitle>Main Overview</windowtitle>
-          <windowwidth>2500</windowwidth>
+          <windowwidth>2380</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach System</description>
@@ -286,7 +286,7 @@
           <detachwindowpath>collectedOPIs_01_diagnostics.bob</detachwindowpath>
           <windowheight>1300</windowheight>
           <windowtitle>Proton Beam Instrumentation</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>2400</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach PBI</description>
@@ -296,7 +296,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_beamsettings.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>800</windowheight>
           <windowtitle>Beam Settings</windowtitle>
           <windowwidth>2440</windowwidth>
         </macros>
@@ -308,7 +308,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_magnets.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1240</windowheight>
           <windowtitle>Magnet Controls Overview</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
@@ -320,7 +320,7 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_cavities.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1240</windowheight>
           <windowtitle>Cavities Overview</windowtitle>
           <windowwidth>2500</windowwidth>
         </macros>
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 118adb511676bdd508ce5f3ebac8c530088836cf..49d0773a02b239ff4d375a813ff847e42bcf27f5 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavities.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_cavities.bob
@@ -124,9 +124,9 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_cavs_MBL_1.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1200</windowheight>
           <windowtitle>MBL Cavities 1-6</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>2100</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach MBL 1-6</description>
@@ -148,9 +148,9 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_cavs_HBL_1.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1200</windowheight>
           <windowtitle>HBL Cavities 1-8</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>2180</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach HBL 1-8</description>
@@ -160,9 +160,9 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_cavs_HBL_2.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1200</windowheight>
           <windowtitle>HBL Cavities 9-16</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>2180</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach HBL 9-16</description>
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 db4a6d21f3b96bf1d98f2faac494a5e3a4694081..ffb721c8d9c261f39c6090e5cc9af8a1db4c6e7d 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_magnets.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_magnets.bob
@@ -62,9 +62,9 @@
           <ROOT>$(ROOT)</ROOT>
           <boolpv>loc://magcontrolbool</boolpv>
           <detachwindowpath>collectedOPIs_01_mags_lebtmebt.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1220</windowheight>
           <windowtitle>LEBT and MEBT magnets</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>1946</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach LEBT+MEBT</description>
@@ -75,9 +75,9 @@
           <ROOT>$(ROOT)</ROOT>
           <boolpv>loc://magcontrolbool</boolpv>
           <detachwindowpath>collectedOPIs_01_mags_dtl.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1220</windowheight>
           <windowtitle>DTL magnets</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>1946</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach DTL</description>
@@ -88,9 +88,9 @@
           <ROOT>$(ROOT)</ROOT>
           <boolpv>loc://magcontrolbool</boolpv>
           <detachwindowpath>collectedOPIs_01_mags_CH.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1220</windowheight>
           <windowtitle>CH (Horizontal Corrector) magnets</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>1946</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach CH</description>
@@ -101,9 +101,9 @@
           <ROOT>$(ROOT)</ROOT>
           <boolpv>loc://magcontrolbool</boolpv>
           <detachwindowpath>collectedOPIs_01_mags_CV.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1220</windowheight>
           <windowtitle>CV (Vertical Corrector) magnets</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>1946</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach CV</description>
@@ -114,9 +114,9 @@
           <ROOT>$(ROOT)</ROOT>
           <boolpv>loc://magcontrolbool</boolpv>
           <detachwindowpath>collectedOPIs_01_mags_others.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1220</windowheight>
           <windowtitle>ISrc and Focusing magnets</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>1946</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach Others</description>
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 8bd8df26cc4c9b71514f997fcc9bda9caeaf50c7..7b53dfb3680b97ce728f2a883f5e5bd2a7943bcb 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_system.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/collectedOPIs_01_system.bob
@@ -67,7 +67,7 @@
           <detachwindowpath>collectedOPIs_01_systs_ints_overview.bob</detachwindowpath>
           <windowheight>1300</windowheight>
           <windowtitle>NCL Machine State Overview</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>2100</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach Interlocks Overview</description>
@@ -77,9 +77,9 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_systs_ints_NCL.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1220</windowheight>
           <windowtitle>NCL Interlocks</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>1946</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach NCL Interlocks</description>
@@ -89,9 +89,9 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_systs_ints_SCL.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1220</windowheight>
           <windowtitle>SCL Interlocks</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>1946</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach SCL Interlocks</description>
@@ -101,9 +101,9 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_systs_ints_target.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1220</windowheight>
           <windowtitle>Target Interlocks</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>1946</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach Target Interlocks</description>
@@ -113,21 +113,21 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_systs_ints_pss.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
-          <windowtitle>PSS Overview</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowheight>1220</windowheight>
+          <windowtitle>ODH</windowtitle>
+          <windowwidth>1946</windowwidth>
         </macros>
         <target>window</target>
-        <description>Detach PSS Overview</description>
+        <description>Detach ODH</description>
       </action>
       <action type="open_display">
         <file>detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_systs_ints_history.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1220</windowheight>
           <windowtitle>Interlocks History</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>1946</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach History</description>
@@ -137,9 +137,9 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>collectedOPIs_01_systs_valvesflows.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1220</windowheight>
           <windowtitle>Valves, Flows and Temperatures Overview</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>1946</windowwidth>
         </macros>
         <target>window</target>
         <description>Detach Valves and Flows</description>
@@ -149,9 +149,9 @@
         <macros>
           <ROOT>$(ROOT)</ROOT>
           <detachwindowpath>../../Cryo/TICP/CrS-TICP_CRYO_LCR/cryo-00-main.bob</detachwindowpath>
-          <windowheight>1300</windowheight>
+          <windowheight>1220</windowheight>
           <windowtitle>Cryogenics</windowtitle>
-          <windowwidth>2350</windowwidth>
+          <windowwidth>1946</windowwidth>
         </macros>
         <target>window</target>
         <description>Launch Cryogenics</description>
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 e574b0fe839806cbce0be4163187b53343ad9a57..d404a6b8bcb7b77f840c08ecdd0521cdb1ff8081 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
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>Interlocks History</name>
-  <width>1200</width>
-  <height>900</height>
+  <class></class>
+  <width>1946</width>
+  <height>1220</height>
   <background_color>
     <color name="BACKGROUND" red="220" green="225" blue="221">
     </color>
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 eb6774c0ae2285173712d04f532e9b5cc45cba55..ac89d43e6181595a6103bae507cae973bcbba4c9 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
@@ -14,7 +14,7 @@
     <section03>Target</section03>
     <section04>Beamlines</section04>
   </macros>
-  <width>1730</width>
+  <width>1940</width>
   <height>960</height>
   <background_color>
     <color name="Transparent" red="255" green="255" blue="255" alpha="0">