diff --git a/10-Top/bcmioc/top.bob b/10-Top/bcmioc/top.bob
index 3522846b115a0db250c8a992479e0c8a9d6071ea..8c76e63385de2df0029a0669763fc995ddafcb9f 100644
--- a/10-Top/bcmioc/top.bob
+++ b/10-Top/bcmioc/top.bob
@@ -4,8 +4,8 @@
   <macros>
     <TITLE>BCM IOC</TITLE>
   </macros>
-  <width>1250</width>
-  <height>810</height>
+  <width>1300</width>
+  <height>740</height>
   <background_color>
     <color name="BACKGROUND" red="220" green="225" blue="221">
     </color>
@@ -102,10 +102,10 @@
       <SYSTEM8>ISrc-010:ISS-HVPf</SYSTEM8>
       <SYSTEM9>DTL-030:PBI-BCM-001</SYSTEM9>
     </macros>
-    <x>20</x>
-    <y>70</y>
-    <width>470</width>
-    <height>200</height>
+    <x>10</x>
+    <y>60</y>
+    <width>410</width>
+    <height>170</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_1</name>
@@ -127,8 +127,8 @@
       <SYSTEM8>LAB-009:PBI-BCM-008</SYSTEM8>
       <SYSTEM9>LAB-009:PBI-BCM-009</SYSTEM9>
     </macros>
-    <x>20</x>
-    <y>250</y>
+    <x>830</x>
+    <y>230</y>
     <width>410</width>
     <height>200</height>
   </widget>
@@ -152,10 +152,10 @@
       <SYSTEM8>ISrc-010:ISS-HVPf-CPU-002</SYSTEM8>
       <SYSTEM9>DTL-030:PBI-BCM-001</SYSTEM9>
     </macros>
-    <x>20</x>
-    <y>610</y>
-    <width>470</width>
-    <height>200</height>
+    <x>10</x>
+    <y>230</y>
+    <width>410</width>
+    <height>176</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_2</name>
@@ -177,8 +177,8 @@
       <SYSTEM8>LAB-008:PBI-BCM-008</SYSTEM8>
       <SYSTEM9>LAB-008:PBI-BCM-009</SYSTEM9>
     </macros>
-    <x>20</x>
-    <y>430</y>
+    <x>830</x>
+    <y>60</y>
     <width>470</width>
     <height>200</height>
   </widget>
@@ -202,8 +202,8 @@
       <SYSTEM8>LAB-011:PBI-BCM-008</SYSTEM8>
       <SYSTEM9>LAB-011:PBI-BCM-009</SYSTEM9>
     </macros>
-    <x>430</x>
-    <y>70</y>
+    <x>830</x>
+    <y>400</y>
     <width>470</width>
     <height>200</height>
   </widget>
@@ -227,8 +227,8 @@
       <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008</SYSTEM8>
       <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009</SYSTEM9>
     </macros>
-    <x>430</x>
-    <y>250</y>
+    <x>10</x>
+    <y>400</y>
     <width>410</width>
     <height>170</height>
   </widget>
@@ -252,8 +252,8 @@
       <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008</SYSTEM8>
       <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009</SYSTEM9>
     </macros>
-    <x>430</x>
-    <y>430</y>
+    <x>10</x>
+    <y>570</y>
     <width>410</width>
     <height>170</height>
   </widget>
@@ -277,8 +277,8 @@
       <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008</SYSTEM8>
       <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009</SYSTEM9>
     </macros>
-    <x>430</x>
-    <y>610</y>
+    <x>420</x>
+    <y>60</y>
     <width>410</width>
     <height>170</height>
   </widget>
@@ -302,8 +302,8 @@
       <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008</SYSTEM8>
       <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009</SYSTEM9>
     </macros>
-    <x>840</x>
-    <y>70</y>
+    <x>420</x>
+    <y>230</y>
     <width>410</width>
     <height>170</height>
   </widget>
@@ -327,8 +327,8 @@
       <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008</SYSTEM8>
       <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009</SYSTEM9>
     </macros>
-    <x>840</x>
-    <y>250</y>
+    <x>420</x>
+    <y>400</y>
     <width>410</width>
     <height>170</height>
   </widget>
diff --git a/99-Shared/adsis8300bcm/acct_m.bob b/99-Shared/adsis8300bcm/acct_m.bob
index 6797fdfecad39ca81115f6ef181ba823337540e2..6867dddef591d87c3d848680477c221896fef3be 100644
--- a/99-Shared/adsis8300bcm/acct_m.bob
+++ b/99-Shared/adsis8300bcm/acct_m.bob
@@ -2414,7 +2414,7 @@ pvs[1].setValue(dec)]]></text>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_23</name>
     <pv_name>$(P)$(R)$(ID)ErrantWindowEnd</pv_name>
-    <x>1066</x>
+    <x>980</x>
     <y>1037</y>
     <width>80</width>
     <height>30</height>
@@ -2431,7 +2431,7 @@ pvs[1].setValue(dec)]]></text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_116</name>
     <pv_name>$(P)$(R)$(ID)ErrantWindowEndR</pv_name>
-    <x>975</x>
+    <x>1071</x>
     <y>1037</y>
     <width>80</width>
     <height>30</height>
@@ -2450,7 +2450,7 @@ pvs[1].setValue(dec)]]></text>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_22</name>
     <pv_name>$(P)$(R)$(ID)ErrantWindowStart</pv_name>
-    <x>1066</x>
+    <x>980</x>
     <y>997</y>
     <width>80</width>
     <height>30</height>
@@ -2467,7 +2467,7 @@ pvs[1].setValue(dec)]]></text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_115</name>
     <pv_name>$(P)$(R)$(ID)ErrantWindowStartR</pv_name>
-    <x>975</x>
+    <x>1071</x>
     <y>997</y>
     <width>80</width>
     <height>30</height>
@@ -2882,7 +2882,7 @@ pvs[1].setValue(dec)]]></text>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_31</name>
-    <x>965</x>
+    <x>969</x>
     <y>950</y>
     <width>190</width>
     <height>130</height>
diff --git a/99-Shared/adsis8300bcm/bcm_inst.bob b/99-Shared/adsis8300bcm/bcm_inst.bob
index 00238bdd5807f0b2d66028e280fdaf15b823082b..15b721cc8d311ee2df50352f01855f005d580716 100644
--- a/99-Shared/adsis8300bcm/bcm_inst.bob
+++ b/99-Shared/adsis8300bcm/bcm_inst.bob
@@ -2,36 +2,67 @@
 <display version="2.0.0">
   <name>BCM_INST</name>
   <width>400</width>
-  <height>170</height>
+  <height>160</height>
   <background_color>
     <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
   </background_color>
+  <scripts>
+    <script file="EmbeddedPy">
+      <text><![CDATA[# Embedded python script
+from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
+from org.phoebus.framework.macros import MacroHandler
+
+bcm_macros = widget.getPropertyValue('macros')
+hv_en = bcm_macros.getValue('HV_EN')
+
+led_2 = ScriptUtil.findWidgetByName(widget, 'LED_2')
+led_2 .setPropertyValue('Visible', hv_en)
+led_3 = ScriptUtil.findWidgetByName(widget, 'LED_3')
+led_3 .setPropertyValue('Visible', hv_en)
+
+lbl2 = ScriptUtil.findWidgetByName(widget, 'Label_2')
+lbl2 .setPropertyValue('Visible', hv_en)
+
+lbl3 = ScriptUtil.findWidgetByName(widget, 'Label_3)
+lbl3 .setPropertyValue('Visible', hv_en)
+]]></text>
+      <pv_name>$(P)$(R)Acquire</pv_name>
+    </script>
+  </scripts>
   <widget type="rectangle" version="2.0.0">
-    <name>BGGrey03-titlebar_6</name>
+    <name>BGGrey03-titlebar_10</name>
     <width>400</width>
-    <height>170</height>
-    <line_width>0</line_width>
-    <background_color>
+    <height>160</height>
+    <line_width>2</line_width>
+    <line_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
     </background_color>
     <corner_width>10</corner_width>
     <corner_height>10</corner_height>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
+    <name>BGGrey03-background_20</name>
     <x>10</x>
-    <y>38</y>
+    <y>33</y>
     <width>380</width>
     <height>120</height>
-    <line_width>0</line_width>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
     <background_color>
       <color name="Background" red="220" green="225" blue="221">
       </color>
     </background_color>
-    <corner_width>10</corner_width>
-    <corner_height>10</corner_height>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>LED_63</name>
@@ -72,16 +103,16 @@
       </action>
     </actions>
     <text>$(P)$(R)</text>
-    <x>30</x>
+    <x>20</x>
     <y>48</y>
-    <width>250</width>
+    <width>240</width>
     <height>92</height>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED</name>
     <pv_name>$(P)$(R)BeamPermitFPGAR</pv_name>
-    <x>360</x>
+    <x>362</x>
     <y>50</y>
     <off_color>
       <color name="MAJOR" red="252" green="13" blue="27">
@@ -92,7 +123,7 @@
   <widget type="led" version="2.0.0">
     <name>LED_1</name>
     <pv_name>$(P)$(R)ReadyFPGAR</pv_name>
-    <x>360</x>
+    <x>362</x>
     <y>72</y>
     <off_color>
       <color name="MAJOR" red="252" green="13" blue="27">
@@ -103,7 +134,7 @@
   <widget type="led" version="2.0.0">
     <name>LED_2</name>
     <pv_name>$(P)$(R)HighVoltageOKR</pv_name>
-    <x>360</x>
+    <x>362</x>
     <y>94</y>
     <off_color>
       <color name="MAJOR" red="252" green="13" blue="27">
@@ -114,7 +145,7 @@
   <widget type="led" version="2.0.0">
     <name>LED_3</name>
     <pv_name>$(P)$(R)HighVoltagePresenceR</pv_name>
-    <x>360</x>
+    <x>362</x>
     <y>116</y>
     <off_color>
       <color name="MAJOR" red="252" green="13" blue="27">
@@ -124,31 +155,37 @@
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>BEAM_P</text>
-    <x>290</x>
+    <text>Beam Permit</text>
+    <x>269</x>
     <y>50</y>
-    <width>60</width>
+    <width>88</width>
+    <height>21</height>
+    <auto_size>true</auto_size>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_1</name>
-    <text>BCM_R</text>
-    <x>290</x>
+    <text>BCM Ready</text>
+    <x>269</x>
     <y>72</y>
-    <width>70</width>
+    <width>75</width>
+    <height>21</height>
+    <auto_size>true</auto_size>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_2</name>
-    <text>HV_OK</text>
-    <x>290</x>
+    <text>HV OK</text>
+    <x>269</x>
     <y>95</y>
     <width>64</width>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_3</name>
-    <text>HV_PR</text>
-    <x>290</x>
+    <text>HV Presence</text>
+    <x>269</x>
     <y>116</y>
-    <width>64</width>
+    <width>84</width>
+    <height>21</height>
+    <auto_size>true</auto_size>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_4</name>
@@ -169,14 +206,14 @@
   <widget type="led" version="2.0.0">
     <name>LED_4</name>
     <pv_name>$(P)$(R)Acquire</pv_name>
-    <x>31</x>
+    <x>21</x>
     <y>49</y>
     <square>true</square>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_5</name>
-    <text>Acquire</text>
-    <x>55</x>
+    <text>Acquiring</text>
+    <x>50</x>
     <y>48</y>
     <width>70</width>
   </widget>