diff --git a/10-Top/bpmioc/support/instance.bob b/10-Top/bpmioc/support/instance.bob
index 6baca49d41b0753180f0d44e7597fea0e66b155f..f288e45a84ce48e19d2a4e30df1bc8a7f19d24ac 100644
--- a/10-Top/bpmioc/support/instance.bob
+++ b/10-Top/bpmioc/support/instance.bob
@@ -702,7 +702,7 @@ M7 - FRU Communication Lost</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>BGGrey02-title_31</name>
-    <text>RFFE</text>
+    <text>$(RFFE_NAME)</text>
     <x>1610</x>
     <width>110</width>
     <height>30</height>
diff --git a/10-Top/bpmioc/top.bob b/10-Top/bpmioc/top.bob
index 7eee3c8f055a888132ec986cd3ced37ae0c1f02d..29cb6176a71f011f8635dce9252ab548ee8c0c01 100644
--- a/10-Top/bpmioc/top.bob
+++ b/10-Top/bpmioc/top.bob
@@ -232,6 +232,130 @@
             <height>520</height>
             <style>3</style>
             <transparent>true</transparent>
+            <widget type="group" version="2.0.0">
+              <name>RFFE</name>
+              <x>1610</x>
+              <width>110</width>
+              <height>430</height>
+              <style>3</style>
+              <transparent>true</transparent>
+              <widget type="rectangle" version="2.0.0">
+                <name>RFFEBackground</name>
+                <width>110</width>
+                <height>430</height>
+                <line_width>0</line_width>
+                <background_color>
+                  <color red="150" green="155" blue="151" alpha="90">
+                  </color>
+                </background_color>
+                <corner_width>5</corner_width>
+                <corner_height>5</corner_height>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>RFFEHeader</name>
+                <text>RFFE</text>
+                <x>10</x>
+                <width>90</width>
+                <height>30</height>
+                <font>
+                  <font family="Source Sans Pro" style="BOLD" size="14.0">
+                  </font>
+                </font>
+                <horizontal_alignment>1</horizontal_alignment>
+                <vertical_alignment>1</vertical_alignment>
+              </widget>
+            </widget>
+            <widget type="group" version="2.0.0">
+              <name>IPMI</name>
+              <x>1480</x>
+              <width>90</width>
+              <height>430</height>
+              <style>3</style>
+              <transparent>true</transparent>
+              <widget type="rectangle" version="2.0.0">
+                <name>IPMIBackground</name>
+                <width>90</width>
+                <height>430</height>
+                <line_width>0</line_width>
+                <background_color>
+                  <color red="150" green="155" blue="151" alpha="90">
+                  </color>
+                </background_color>
+                <corner_width>5</corner_width>
+                <corner_height>5</corner_height>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>IPMIHeader</name>
+                <text>IPMI Manager</text>
+                <width>90</width>
+                <height>30</height>
+                <font>
+                  <font family="Source Sans Pro" style="BOLD" size="14.0">
+                  </font>
+                </font>
+                <horizontal_alignment>1</horizontal_alignment>
+                <vertical_alignment>1</vertical_alignment>
+              </widget>
+              <widget type="action_button" version="3.0.0">
+                <name>IPMIDetails</name>
+                <actions>
+                  <action type="open_display">
+                    <file>../../99-Shared/ipmi-pbi-bpm01/chassis/Chassis.bob</file>
+                    <macros>
+                      <CRATE_NUM>1</CRATE_NUM>
+                      <IOCNAME>PBI-BPM01:SC-IOC-107</IOCNAME>
+                      <IOC_PREF>PBI-BPM01:SC-IOC-$(CRATE_NUM)07:</IOC_PREF>
+                      <MTCA_PREF>PBI-BPM01:Ctrl-MTCA-$(CRATE_NUM)00:</MTCA_PREF>
+                      <NAME_MODE>0</NAME_MODE>
+                      <P>PBI-BPM01:Ctrl</P>
+                      <SLOT10_IDX></SLOT10_IDX>
+                      <SLOT10_MODULE></SLOT10_MODULE>
+                      <SLOT11_IDX></SLOT11_IDX>
+                      <SLOT11_MODULE></SLOT11_MODULE>
+                      <SLOT12_IDX></SLOT12_IDX>
+                      <SLOT12_MODULE></SLOT12_MODULE>
+                      <SLOT17_MODULE></SLOT17_MODULE>
+                      <SLOT18_MODULE></SLOT18_MODULE>
+                      <SLOT19_MODULE>RTM</SLOT19_MODULE>
+                      <SLOT1_IDX>01</SLOT1_IDX>
+                      <SLOT1_MODULE>CPU</SLOT1_MODULE>
+                      <SLOT20_MODULE></SLOT20_MODULE>
+                      <SLOT21_MODULE>RTM</SLOT21_MODULE>
+                      <SLOT22_MODULE></SLOT22_MODULE>
+                      <SLOT23_MODULE>RTM</SLOT23_MODULE>
+                      <SLOT24_MODULE></SLOT24_MODULE>
+                      <SLOT25_MODULE>RTM</SLOT25_MODULE>
+                      <SLOT26_MODULE></SLOT26_MODULE>
+                      <SLOT27_MODULE></SLOT27_MODULE>
+                      <SLOT28_MODULE></SLOT28_MODULE>
+                      <SLOT2_IDX>01</SLOT2_IDX>
+                      <SLOT2_MODULE>EVR</SLOT2_MODULE>
+                      <SLOT3_IDX>10</SLOT3_IDX>
+                      <SLOT3_MODULE>AMC</SLOT3_MODULE>
+                      <SLOT4_IDX></SLOT4_IDX>
+                      <SLOT4_MODULE></SLOT4_MODULE>
+                      <SLOT5_IDX>20</SLOT5_IDX>
+                      <SLOT5_MODULE>AMC</SLOT5_MODULE>
+                      <SLOT6_IDX></SLOT6_IDX>
+                      <SLOT6_MODULE></SLOT6_MODULE>
+                      <SLOT7_IDX>30</SLOT7_IDX>
+                      <SLOT7_MODULE>AMC</SLOT7_MODULE>
+                      <SLOT8_IDX></SLOT8_IDX>
+                      <SLOT8_MODULE></SLOT8_MODULE>
+                      <SLOT9_IDX>40</SLOT9_IDX>
+                      <SLOT9_MODULE>AMC</SLOT9_MODULE>
+                    </macros>
+                    <target>window</target>
+                    <description>Carrier1</description>
+                  </action>
+                </actions>
+                <text>Details</text>
+                <x>10</x>
+                <y>30</y>
+                <width>70</width>
+                <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
+              </widget>
+            </widget>
             <widget type="embedded" version="2.0.0">
               <name>AMC-110</name>
               <macros>
@@ -372,17 +496,16 @@
               <resize>2</resize>
             </widget>
             <widget type="group" version="2.0.0">
-              <name>RFFE</name>
-              <x>1610</x>
-              <width>110</width>
+              <name>Arrays</name>
+              <x>475</x>
+              <width>70</width>
               <height>430</height>
               <style>3</style>
               <transparent>true</transparent>
               <widget type="label" version="2.0.0">
-                <name>RFFEHeader</name>
-                <text>RFFE</text>
-                <x>10</x>
-                <width>90</width>
+                <name>ArraysHeader</name>
+                <text>Arrays</text>
+                <width>70</width>
                 <height>30</height>
                 <font>
                   <font family="Source Sans Pro" style="BOLD" size="14.0">
@@ -392,23 +515,89 @@
                 <vertical_alignment>1</vertical_alignment>
               </widget>
               <widget type="action_button" version="3.0.0">
-                <name>RFFEDetails</name>
+                <name>ArraysStart</name>
                 <actions>
-                  <action type="open_display">
-                    <file>../bpmrffeioc/top.bob</file>
-                    <target>window</target>
-                    <description>Open RFFE Launcher</description>
+                  <action type="write_pv">
+                    <pv_name>loc://trigTransfArrays</pv_name>
+                    <value>1</value>
+                    <description>Set Acquisition to START</description>
                   </action>
                 </actions>
-                <text>Details</text>
-                <x>20</x>
+                <pv_name>loc://trigTransfArrays(0)</pv_name>
+                <text>Yes</text>
                 <y>30</y>
-                <width>70</width>
-                <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
+                <width>34</width>
+                <font>
+                  <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+                  </font>
+                </font>
+                <scripts>
+                  <script file="EmbeddedPy" check_connections="false">
+                    <text><![CDATA[# Embedded python script
+from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
+
+action_ = PVUtil.getInt(pvs[0]);
+
+if (action_ == 1):
+	pvs[1].write(1)
+	pvs[2].write(1)
+	pvs[3].write(1)
+	pvs[4].write(1)
+
+
+]]></text>
+                    <pv_name>loc://trigTransfArrays</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-110:TransferArrays</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-120:TransferArrays</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-130:TransferArrays</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-140:TransferArrays</pv_name>
+                  </script>
+                </scripts>
+              </widget>
+              <widget type="action_button" version="3.0.0">
+                <name>ArraysStop</name>
+                <actions>
+                  <action type="write_pv">
+                    <pv_name>loc://trigStopTransfArrays</pv_name>
+                    <value>1</value>
+                    <description>Set Acquisition to START</description>
+                  </action>
+                </actions>
+                <pv_name>loc://trigStopTransfArrays(0)</pv_name>
+                <text>No</text>
+                <x>34</x>
+                <y>30</y>
+                <width>34</width>
+                <font>
+                  <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+                  </font>
+                </font>
+                <scripts>
+                  <script file="EmbeddedPy" check_connections="false">
+                    <text><![CDATA[# Embedded python script
+from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
+
+action_ = PVUtil.getInt(pvs[0]);
+
+if (action_ == 1):
+	pvs[1].write(0)
+	pvs[2].write(0)
+	pvs[3].write(0)
+	pvs[4].write(0)
+
+
+]]></text>
+                    <pv_name>loc://trigStopTransfArrays</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-110:TransferArrays</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-120:TransferArrays</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-130:TransferArrays</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-140:TransferArrays</pv_name>
+                  </script>
+                </scripts>
               </widget>
               <widget type="rectangle" version="2.0.0">
-                <name>RFFEBackground</name>
-                <width>110</width>
+                <name>ArraysBackground</name>
+                <width>70</width>
                 <height>430</height>
                 <line_width>0</line_width>
                 <background_color>
@@ -420,16 +609,16 @@
               </widget>
             </widget>
             <widget type="group" version="2.0.0">
-              <name>IPMI</name>
-              <x>1480</x>
-              <width>90</width>
+              <name>AcqCtrl</name>
+              <x>396</x>
+              <width>70</width>
               <height>430</height>
               <style>3</style>
               <transparent>true</transparent>
               <widget type="label" version="2.0.0">
-                <name>IPMIHeader</name>
-                <text>IPMI Manager</text>
-                <width>90</width>
+                <name>AcqCtrlHeader</name>
+                <text>Acq. Ctrl</text>
+                <width>70</width>
                 <height>30</height>
                 <font>
                   <font family="Source Sans Pro" style="BOLD" size="14.0">
@@ -439,211 +628,7 @@
                 <vertical_alignment>1</vertical_alignment>
               </widget>
               <widget type="action_button" version="3.0.0">
-                <name>IPMIDetails</name>
-                <actions>
-                  <action type="open_display">
-                    <file>../../99-Shared/ipmi-pbi-bpm01/chassis/Chassis.bob</file>
-                    <macros>
-                      <CRATE_NUM>1</CRATE_NUM>
-                      <IOCNAME>PBI-BPM01:SC-IOC-107</IOCNAME>
-                      <IOC_PREF>PBI-BPM01:SC-IOC-$(CRATE_NUM)07:</IOC_PREF>
-                      <MTCA_PREF>PBI-BPM01:Ctrl-MTCA-$(CRATE_NUM)00:</MTCA_PREF>
-                      <NAME_MODE>0</NAME_MODE>
-                      <P>PBI-BPM01:Ctrl</P>
-                      <SLOT10_IDX></SLOT10_IDX>
-                      <SLOT10_MODULE></SLOT10_MODULE>
-                      <SLOT11_IDX></SLOT11_IDX>
-                      <SLOT11_MODULE></SLOT11_MODULE>
-                      <SLOT12_IDX></SLOT12_IDX>
-                      <SLOT12_MODULE></SLOT12_MODULE>
-                      <SLOT17_MODULE></SLOT17_MODULE>
-                      <SLOT18_MODULE></SLOT18_MODULE>
-                      <SLOT19_MODULE>RTM</SLOT19_MODULE>
-                      <SLOT1_IDX>01</SLOT1_IDX>
-                      <SLOT1_MODULE>CPU</SLOT1_MODULE>
-                      <SLOT20_MODULE></SLOT20_MODULE>
-                      <SLOT21_MODULE>RTM</SLOT21_MODULE>
-                      <SLOT22_MODULE></SLOT22_MODULE>
-                      <SLOT23_MODULE>RTM</SLOT23_MODULE>
-                      <SLOT24_MODULE></SLOT24_MODULE>
-                      <SLOT25_MODULE>RTM</SLOT25_MODULE>
-                      <SLOT26_MODULE></SLOT26_MODULE>
-                      <SLOT27_MODULE></SLOT27_MODULE>
-                      <SLOT28_MODULE></SLOT28_MODULE>
-                      <SLOT2_IDX>01</SLOT2_IDX>
-                      <SLOT2_MODULE>EVR</SLOT2_MODULE>
-                      <SLOT3_IDX>10</SLOT3_IDX>
-                      <SLOT3_MODULE>AMC</SLOT3_MODULE>
-                      <SLOT4_IDX></SLOT4_IDX>
-                      <SLOT4_MODULE></SLOT4_MODULE>
-                      <SLOT5_IDX>20</SLOT5_IDX>
-                      <SLOT5_MODULE>AMC</SLOT5_MODULE>
-                      <SLOT6_IDX></SLOT6_IDX>
-                      <SLOT6_MODULE></SLOT6_MODULE>
-                      <SLOT7_IDX>30</SLOT7_IDX>
-                      <SLOT7_MODULE>AMC</SLOT7_MODULE>
-                      <SLOT8_IDX></SLOT8_IDX>
-                      <SLOT8_MODULE></SLOT8_MODULE>
-                      <SLOT9_IDX>40</SLOT9_IDX>
-                      <SLOT9_MODULE>AMC</SLOT9_MODULE>
-                    </macros>
-                    <target>window</target>
-                    <description>Carrier1</description>
-                  </action>
-                </actions>
-                <text>Details</text>
-                <x>10</x>
-                <y>30</y>
-                <width>70</width>
-                <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
-              </widget>
-              <widget type="rectangle" version="2.0.0">
-                <name>IPMIBackground</name>
-                <width>90</width>
-                <height>430</height>
-                <line_width>0</line_width>
-                <background_color>
-                  <color red="150" green="155" blue="151" alpha="90">
-                  </color>
-                </background_color>
-                <corner_width>5</corner_width>
-                <corner_height>5</corner_height>
-              </widget>
-            </widget>
-            <widget type="group" version="2.0.0">
-              <name>Arrays</name>
-              <x>475</x>
-              <width>70</width>
-              <height>430</height>
-              <style>3</style>
-              <transparent>true</transparent>
-              <widget type="label" version="2.0.0">
-                <name>ArraysHeader</name>
-                <text>Arrays</text>
-                <width>70</width>
-                <height>30</height>
-                <font>
-                  <font family="Source Sans Pro" style="BOLD" size="14.0">
-                  </font>
-                </font>
-                <horizontal_alignment>1</horizontal_alignment>
-                <vertical_alignment>1</vertical_alignment>
-              </widget>
-              <widget type="action_button" version="3.0.0">
-                <name>ArraysStart</name>
-                <actions>
-                  <action type="write_pv">
-                    <pv_name>loc://trigTransfArrays</pv_name>
-                    <value>1</value>
-                    <description>Set Acquisition to START</description>
-                  </action>
-                </actions>
-                <pv_name>loc://trigTransfArrays(0)</pv_name>
-                <text>Yes</text>
-                <y>30</y>
-                <width>34</width>
-                <font>
-                  <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-                  </font>
-                </font>
-                <scripts>
-                  <script file="EmbeddedPy" check_connections="false">
-                    <text><![CDATA[# Embedded python script
-from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
-
-action_ = PVUtil.getInt(pvs[0]);
-
-if (action_ == 1):
-	pvs[1].write(1)
-	pvs[2].write(1)
-	pvs[3].write(1)
-	pvs[4].write(1)
-
-
-]]></text>
-                    <pv_name>loc://trigTransfArrays</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-110:TransferArrays</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-120:TransferArrays</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-130:TransferArrays</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-140:TransferArrays</pv_name>
-                  </script>
-                </scripts>
-              </widget>
-              <widget type="action_button" version="3.0.0">
-                <name>ArraysStop</name>
-                <actions>
-                  <action type="write_pv">
-                    <pv_name>loc://trigStopTransfArrays</pv_name>
-                    <value>1</value>
-                    <description>Set Acquisition to START</description>
-                  </action>
-                </actions>
-                <pv_name>loc://trigStopTransfArrays(0)</pv_name>
-                <text>No</text>
-                <x>34</x>
-                <y>30</y>
-                <width>34</width>
-                <font>
-                  <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-                  </font>
-                </font>
-                <scripts>
-                  <script file="EmbeddedPy" check_connections="false">
-                    <text><![CDATA[# Embedded python script
-from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
-
-action_ = PVUtil.getInt(pvs[0]);
-
-if (action_ == 1):
-	pvs[1].write(0)
-	pvs[2].write(0)
-	pvs[3].write(0)
-	pvs[4].write(0)
-
-
-]]></text>
-                    <pv_name>loc://trigStopTransfArrays</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-110:TransferArrays</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-120:TransferArrays</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-130:TransferArrays</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-140:TransferArrays</pv_name>
-                  </script>
-                </scripts>
-              </widget>
-              <widget type="rectangle" version="2.0.0">
-                <name>ArraysBackground</name>
-                <width>70</width>
-                <height>430</height>
-                <line_width>0</line_width>
-                <background_color>
-                  <color red="150" green="155" blue="151" alpha="90">
-                  </color>
-                </background_color>
-                <corner_width>5</corner_width>
-                <corner_height>5</corner_height>
-              </widget>
-            </widget>
-            <widget type="group" version="2.0.0">
-              <name>AcqCtrl</name>
-              <x>396</x>
-              <width>70</width>
-              <height>430</height>
-              <style>3</style>
-              <transparent>true</transparent>
-              <widget type="label" version="2.0.0">
-                <name>AcqCtrlHeader</name>
-                <text>Acq. Ctrl</text>
-                <width>70</width>
-                <height>30</height>
-                <font>
-                  <font family="Source Sans Pro" style="BOLD" size="14.0">
-                  </font>
-                </font>
-                <horizontal_alignment>1</horizontal_alignment>
-                <vertical_alignment>1</vertical_alignment>
-              </widget>
-              <widget type="action_button" version="3.0.0">
-                <name>AcqCtrlStart</name>
+                <name>AcqCtrlStart</name>
                 <actions>
                   <action type="write_pv">
                     <pv_name>loc://trigAcquistion</pv_name>
@@ -746,50 +731,175 @@ if (action_ == 1):
             <height>520</height>
             <style>3</style>
             <transparent>true</transparent>
-            <widget type="embedded" version="2.0.0">
-              <name>AMC-210</name>
-              <macros>
-                <AMC_NAME>Ctrl-AMC-210</AMC_NAME>
-                <BPM_TITLE>DTL-010 BPM 2/3</BPM_TITLE>
-                <CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
-                <IOCNAME>PBI-BPM01:SC-IOC-201</IOCNAME>
-                <PAIR_BPMMan>BPM02-03</PAIR_BPMMan>
-                <P_BPMMan>PBI-BPM::</P_BPMMan>
-                <R1_BPMMan>BPM02-</R1_BPMMan>
-                <R2_BPMMan>BPM03-</R2_BPMMan>
-                <RFFE_NAME>PBI-BPMFE-150</RFFE_NAME>
-                <RTM_NAME>Ctrl-RTM-210</RTM_NAME>
-                <S1_BPMMan>DTL-</S1_BPMMan>
-                <S2_BPMMan>DTL-</S2_BPMMan>
-                <SYSTEM1>DTL-010:PBI-BPM-002:</SYSTEM1>
-                <SYSTEM2>DTL-010:PBI-BPM-003:</SYSTEM2>
-              </macros>
-              <file>support/instance.opi</file>
-              <y>70</y>
-              <width>1740</width>
-              <height>80</height>
-              <resize>2</resize>
+            <widget type="group" version="2.0.0">
+              <name>RFFE</name>
+              <x>1610</x>
+              <width>110</width>
+              <height>430</height>
+              <style>3</style>
               <transparent>true</transparent>
-              <actions>
-              </actions>
-              <border_color>
-                <color red="0" green="128" blue="255">
-                </color>
-              </border_color>
+              <widget type="rectangle" version="2.0.0">
+                <name>RFFEBackground</name>
+                <width>110</width>
+                <height>430</height>
+                <line_width>0</line_width>
+                <background_color>
+                  <color red="150" green="155" blue="151" alpha="90">
+                  </color>
+                </background_color>
+                <corner_width>5</corner_width>
+                <corner_height>5</corner_height>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>RFFEHeader</name>
+                <text>RFFE</text>
+                <x>10</x>
+                <width>90</width>
+                <height>30</height>
+                <font>
+                  <font family="Source Sans Pro" style="BOLD" size="14.0">
+                  </font>
+                </font>
+                <horizontal_alignment>1</horizontal_alignment>
+                <vertical_alignment>1</vertical_alignment>
+              </widget>
             </widget>
-            <widget type="embedded" version="2.0.0">
-              <name>AMC-220</name>
-              <macros>
-                <AMC_NAME>Ctrl-AMC-220</AMC_NAME>
-                <BPM_TITLE>DTL-010 BPM 4/5</BPM_TITLE>
-                <CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
-                <IOCNAME>PBI-BPM01:SC-IOC-202</IOCNAME>
-                <PAIR_BPMMan>BPM04-05</PAIR_BPMMan>
-                <P_BPMMan>PBI-BPM::</P_BPMMan>
-                <R1_BPMMan>BPM04-</R1_BPMMan>
-                <R2_BPMMan>BPM05-</R2_BPMMan>
-                <RFFE_NAME>PBI-BPMFE-160</RFFE_NAME>
-                <RTM_NAME>Ctrl-RTM-220</RTM_NAME>
+            <widget type="group" version="2.0.0">
+              <name>IPMI</name>
+              <x>1480</x>
+              <y>3</y>
+              <width>90</width>
+              <height>430</height>
+              <style>3</style>
+              <transparent>true</transparent>
+              <widget type="rectangle" version="2.0.0">
+                <name>IPMIBackground</name>
+                <width>90</width>
+                <height>430</height>
+                <line_width>0</line_width>
+                <background_color>
+                  <color red="150" green="155" blue="151" alpha="90">
+                  </color>
+                </background_color>
+                <corner_width>5</corner_width>
+                <corner_height>5</corner_height>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>IPMIHeader</name>
+                <text>IPMI Manager</text>
+                <width>90</width>
+                <height>30</height>
+                <font>
+                  <font family="Source Sans Pro" style="BOLD" size="14.0">
+                  </font>
+                </font>
+                <horizontal_alignment>1</horizontal_alignment>
+                <vertical_alignment>1</vertical_alignment>
+              </widget>
+              <widget type="action_button" version="3.0.0">
+                <name>IPMIDetails</name>
+                <actions>
+                  <action type="open_display">
+                    <file>../../99-Shared/ipmi-pbi-bpm01/chassis/Chassis.bob</file>
+                    <macros>
+                      <CRATE_NUM>2</CRATE_NUM>
+                      <IOCNAME>PBI-BPM01:SC-IOC-115</IOCNAME>
+                      <IOC_PREF>PBI-BPM01:SC-IOC-115:</IOC_PREF>
+                      <MTCA_PREF>PBI-BPM01:Ctrl-MTCA-$(CRATE_NUM)00:</MTCA_PREF>
+                      <NAME_MODE>0</NAME_MODE>
+                      <P>PBI-BPM01:Ctrl</P>
+                      <SLOT10_IDX></SLOT10_IDX>
+                      <SLOT10_MODULE></SLOT10_MODULE>
+                      <SLOT11_IDX></SLOT11_IDX>
+                      <SLOT11_MODULE></SLOT11_MODULE>
+                      <SLOT12_IDX></SLOT12_IDX>
+                      <SLOT12_MODULE></SLOT12_MODULE>
+                      <SLOT17_MODULE></SLOT17_MODULE>
+                      <SLOT18_MODULE></SLOT18_MODULE>
+                      <SLOT19_MODULE>RTM</SLOT19_MODULE>
+                      <SLOT1_IDX>01</SLOT1_IDX>
+                      <SLOT1_MODULE>EVR</SLOT1_MODULE>
+                      <SLOT20_MODULE>RTM</SLOT20_MODULE>
+                      <SLOT21_MODULE>RTM</SLOT21_MODULE>
+                      <SLOT22_MODULE>RTM</SLOT22_MODULE>
+                      <SLOT23_MODULE></SLOT23_MODULE>
+                      <SLOT24_MODULE></SLOT24_MODULE>
+                      <SLOT25_MODULE></SLOT25_MODULE>
+                      <SLOT26_MODULE></SLOT26_MODULE>
+                      <SLOT27_MODULE></SLOT27_MODULE>
+                      <SLOT28_MODULE></SLOT28_MODULE>
+                      <SLOT2_IDX>01</SLOT2_IDX>
+                      <SLOT2_MODULE>CPU</SLOT2_MODULE>
+                      <SLOT3_IDX>10</SLOT3_IDX>
+                      <SLOT3_MODULE>AMC</SLOT3_MODULE>
+                      <SLOT4_IDX>20</SLOT4_IDX>
+                      <SLOT4_MODULE>AMC</SLOT4_MODULE>
+                      <SLOT5_IDX>30</SLOT5_IDX>
+                      <SLOT5_MODULE>AMC</SLOT5_MODULE>
+                      <SLOT6_IDX>40</SLOT6_IDX>
+                      <SLOT6_MODULE>AMC</SLOT6_MODULE>
+                      <SLOT7_IDX></SLOT7_IDX>
+                      <SLOT7_MODULE></SLOT7_MODULE>
+                      <SLOT8_IDX></SLOT8_IDX>
+                      <SLOT8_MODULE></SLOT8_MODULE>
+                      <SLOT9_IDX></SLOT9_IDX>
+                      <SLOT9_MODULE></SLOT9_MODULE>
+                    </macros>
+                    <target>window</target>
+                    <description>Carrier1</description>
+                  </action>
+                </actions>
+                <text>Details</text>
+                <x>10</x>
+                <y>30</y>
+                <width>70</width>
+                <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
+              </widget>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>AMC-210</name>
+              <macros>
+                <AMC_NAME>Ctrl-AMC-210</AMC_NAME>
+                <BPM_TITLE>DTL-010 BPM 2/3</BPM_TITLE>
+                <CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
+                <IOCNAME>PBI-BPM01:SC-IOC-201</IOCNAME>
+                <PAIR_BPMMan>BPM02-03</PAIR_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <R1_BPMMan>BPM02-</R1_BPMMan>
+                <R2_BPMMan>BPM03-</R2_BPMMan>
+                <RFFE_NAME>PBI-BPMFE-150</RFFE_NAME>
+                <RTM_NAME>Ctrl-RTM-210</RTM_NAME>
+                <S1_BPMMan>DTL-</S1_BPMMan>
+                <S2_BPMMan>DTL-</S2_BPMMan>
+                <SYSTEM1>DTL-010:PBI-BPM-002:</SYSTEM1>
+                <SYSTEM2>DTL-010:PBI-BPM-003:</SYSTEM2>
+              </macros>
+              <file>support/instance.opi</file>
+              <y>70</y>
+              <width>1740</width>
+              <height>80</height>
+              <resize>2</resize>
+              <transparent>true</transparent>
+              <actions>
+              </actions>
+              <border_color>
+                <color red="0" green="128" blue="255">
+                </color>
+              </border_color>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>AMC-220</name>
+              <macros>
+                <AMC_NAME>Ctrl-AMC-220</AMC_NAME>
+                <BPM_TITLE>DTL-010 BPM 4/5</BPM_TITLE>
+                <CONTROL_GROUP>PBI-BPM01</CONTROL_GROUP>
+                <IOCNAME>PBI-BPM01:SC-IOC-202</IOCNAME>
+                <PAIR_BPMMan>BPM04-05</PAIR_BPMMan>
+                <P_BPMMan>PBI-BPM::</P_BPMMan>
+                <R1_BPMMan>BPM04-</R1_BPMMan>
+                <R2_BPMMan>BPM05-</R2_BPMMan>
+                <RFFE_NAME>PBI-BPMFE-160</RFFE_NAME>
+                <RTM_NAME>Ctrl-RTM-220</RTM_NAME>
                 <S1_BPMMan>DTL-</S1_BPMMan>
                 <S2_BPMMan>DTL-</S2_BPMMan>
                 <SYSTEM1>DTL-010:PBI-BPM-004:</SYSTEM1>
@@ -885,17 +995,16 @@ if (action_ == 1):
               <resize>2</resize>
             </widget>
             <widget type="group" version="2.0.0">
-              <name>RFFE</name>
-              <x>1610</x>
-              <width>110</width>
-              <height>430</height>
+              <name>AcqCtrl</name>
+              <x>396</x>
+              <width>70</width>
+              <height>432</height>
               <style>3</style>
               <transparent>true</transparent>
               <widget type="label" version="2.0.0">
-                <name>RFFEHeader</name>
-                <text>RFFE</text>
-                <x>10</x>
-                <width>90</width>
+                <name>AcqCtrlHeader</name>
+                <text>Acq. Ctrl</text>
+                <width>70</width>
                 <height>30</height>
                 <font>
                   <font family="Source Sans Pro" style="BOLD" size="14.0">
@@ -905,24 +1014,91 @@ if (action_ == 1):
                 <vertical_alignment>1</vertical_alignment>
               </widget>
               <widget type="action_button" version="3.0.0">
-                <name>RFFEDetails</name>
+                <name>AcqCtrlStart</name>
                 <actions>
-                  <action type="open_display">
-                    <file>../bpmrffeioc/top.bob</file>
-                    <target>window</target>
-                    <description>Open RFFE Launcher</description>
+                  <action type="write_pv">
+                    <pv_name>loc://trigAcquistion2</pv_name>
+                    <value>1</value>
+                    <description>Set Acquisition to START</description>
                   </action>
                 </actions>
-                <text>Details</text>
-                <x>20</x>
+                <pv_name>loc://trigAcquistion2(0)</pv_name>
+                <text>Start</text>
+                <x>1</x>
                 <y>30</y>
-                <width>70</width>
-                <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
+                <width>34</width>
+                <font>
+                  <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+                  </font>
+                </font>
+                <scripts>
+                  <script file="EmbeddedPy" check_connections="false">
+                    <text><![CDATA[# Embedded python script
+from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
+
+action_ = PVUtil.getInt(pvs[0]);
+
+if (action_ == 1):
+	pvs[1].write(1)
+	pvs[2].write(1)
+	pvs[3].write(1)
+	pvs[4].write(1)
+
+
+]]></text>
+                    <pv_name>loc://trigAcquistion2</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-210:Acquire</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-220:Acquire</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-230:Acquire</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-240:Acquire</pv_name>
+                  </script>
+                </scripts>
+              </widget>
+              <widget type="action_button" version="3.0.0">
+                <name>AcqCtrlStop</name>
+                <actions>
+                  <action type="write_pv">
+                    <pv_name>loc://trigStopAcquistion2</pv_name>
+                    <value>1</value>
+                    <description>Set Acquisition to STOP</description>
+                  </action>
+                </actions>
+                <pv_name>loc://trigStopAcquistion2(0)</pv_name>
+                <text>Stop</text>
+                <x>35</x>
+                <y>30</y>
+                <width>34</width>
+                <font>
+                  <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
+                  </font>
+                </font>
+                <scripts>
+                  <script file="EmbeddedPy" check_connections="false">
+                    <text><![CDATA[# Embedded python script
+from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
+
+action_ = PVUtil.getInt(pvs[0]);
+
+if (action_ == 1):
+	pvs[1].write(0)
+	pvs[2].write(0)
+	pvs[3].write(0)
+	pvs[4].write(0)
+
+
+]]></text>
+                    <pv_name>loc://trigStopAcquistion2</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-210:Acquire</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-220:Acquire</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-230:Acquire</pv_name>
+                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-240:Acquire</pv_name>
+                  </script>
+                </scripts>
               </widget>
               <widget type="rectangle" version="2.0.0">
-                <name>RFFEBackground</name>
-                <width>110</width>
-                <height>430</height>
+                <name>AcqCtrlBackground</name>
+                <width>70</width>
+                <height>432</height>
                 <line_width>0</line_width>
                 <background_color>
                   <color red="150" green="155" blue="151" alpha="90">
@@ -933,17 +1109,16 @@ if (action_ == 1):
               </widget>
             </widget>
             <widget type="group" version="2.0.0">
-              <name>IPMI</name>
-              <x>1480</x>
-              <y>3</y>
-              <width>90</width>
-              <height>430</height>
+              <name>Arrays</name>
+              <x>475</x>
+              <width>70</width>
+              <height>432</height>
               <style>3</style>
               <transparent>true</transparent>
               <widget type="label" version="2.0.0">
-                <name>IPMIHeader</name>
-                <text>IPMI Manager</text>
-                <width>90</width>
+                <name>ArraysHeader</name>
+                <text>Arrays</text>
+                <width>70</width>
                 <height>30</height>
                 <font>
                   <font family="Source Sans Pro" style="BOLD" size="14.0">
@@ -953,212 +1128,7 @@ if (action_ == 1):
                 <vertical_alignment>1</vertical_alignment>
               </widget>
               <widget type="action_button" version="3.0.0">
-                <name>IPMIDetails</name>
-                <actions>
-                  <action type="open_display">
-                    <file>../../99-Shared/ipmi-pbi-bpm01/chassis/Chassis.bob</file>
-                    <macros>
-                      <CRATE_NUM>2</CRATE_NUM>
-                      <IOCNAME>PBI-BPM01:SC-IOC-115</IOCNAME>
-                      <IOC_PREF>PBI-BPM01:SC-IOC-115:</IOC_PREF>
-                      <MTCA_PREF>PBI-BPM01:Ctrl-MTCA-$(CRATE_NUM)00:</MTCA_PREF>
-                      <NAME_MODE>0</NAME_MODE>
-                      <P>PBI-BPM01:Ctrl</P>
-                      <SLOT10_IDX></SLOT10_IDX>
-                      <SLOT10_MODULE></SLOT10_MODULE>
-                      <SLOT11_IDX></SLOT11_IDX>
-                      <SLOT11_MODULE></SLOT11_MODULE>
-                      <SLOT12_IDX></SLOT12_IDX>
-                      <SLOT12_MODULE></SLOT12_MODULE>
-                      <SLOT17_MODULE></SLOT17_MODULE>
-                      <SLOT18_MODULE></SLOT18_MODULE>
-                      <SLOT19_MODULE>RTM</SLOT19_MODULE>
-                      <SLOT1_IDX>01</SLOT1_IDX>
-                      <SLOT1_MODULE>EVR</SLOT1_MODULE>
-                      <SLOT20_MODULE>RTM</SLOT20_MODULE>
-                      <SLOT21_MODULE>RTM</SLOT21_MODULE>
-                      <SLOT22_MODULE>RTM</SLOT22_MODULE>
-                      <SLOT23_MODULE></SLOT23_MODULE>
-                      <SLOT24_MODULE></SLOT24_MODULE>
-                      <SLOT25_MODULE></SLOT25_MODULE>
-                      <SLOT26_MODULE></SLOT26_MODULE>
-                      <SLOT27_MODULE></SLOT27_MODULE>
-                      <SLOT28_MODULE></SLOT28_MODULE>
-                      <SLOT2_IDX>01</SLOT2_IDX>
-                      <SLOT2_MODULE>CPU</SLOT2_MODULE>
-                      <SLOT3_IDX>10</SLOT3_IDX>
-                      <SLOT3_MODULE>AMC</SLOT3_MODULE>
-                      <SLOT4_IDX>20</SLOT4_IDX>
-                      <SLOT4_MODULE>AMC</SLOT4_MODULE>
-                      <SLOT5_IDX>30</SLOT5_IDX>
-                      <SLOT5_MODULE>AMC</SLOT5_MODULE>
-                      <SLOT6_IDX>40</SLOT6_IDX>
-                      <SLOT6_MODULE>AMC</SLOT6_MODULE>
-                      <SLOT7_IDX></SLOT7_IDX>
-                      <SLOT7_MODULE></SLOT7_MODULE>
-                      <SLOT8_IDX></SLOT8_IDX>
-                      <SLOT8_MODULE></SLOT8_MODULE>
-                      <SLOT9_IDX></SLOT9_IDX>
-                      <SLOT9_MODULE></SLOT9_MODULE>
-                    </macros>
-                    <target>window</target>
-                    <description>Carrier1</description>
-                  </action>
-                </actions>
-                <text>Details</text>
-                <x>10</x>
-                <y>30</y>
-                <width>70</width>
-                <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
-              </widget>
-              <widget type="rectangle" version="2.0.0">
-                <name>IPMIBackground</name>
-                <width>90</width>
-                <height>430</height>
-                <line_width>0</line_width>
-                <background_color>
-                  <color red="150" green="155" blue="151" alpha="90">
-                  </color>
-                </background_color>
-                <corner_width>5</corner_width>
-                <corner_height>5</corner_height>
-              </widget>
-            </widget>
-            <widget type="group" version="2.0.0">
-              <name>AcqCtrl</name>
-              <x>396</x>
-              <width>70</width>
-              <height>432</height>
-              <style>3</style>
-              <transparent>true</transparent>
-              <widget type="label" version="2.0.0">
-                <name>AcqCtrlHeader</name>
-                <text>Acq. Ctrl</text>
-                <width>70</width>
-                <height>30</height>
-                <font>
-                  <font family="Source Sans Pro" style="BOLD" size="14.0">
-                  </font>
-                </font>
-                <horizontal_alignment>1</horizontal_alignment>
-                <vertical_alignment>1</vertical_alignment>
-              </widget>
-              <widget type="action_button" version="3.0.0">
-                <name>AcqCtrlStart</name>
-                <actions>
-                  <action type="write_pv">
-                    <pv_name>loc://trigAcquistion2</pv_name>
-                    <value>1</value>
-                    <description>Set Acquisition to START</description>
-                  </action>
-                </actions>
-                <pv_name>loc://trigAcquistion2(0)</pv_name>
-                <text>Start</text>
-                <x>1</x>
-                <y>30</y>
-                <width>34</width>
-                <font>
-                  <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-                  </font>
-                </font>
-                <scripts>
-                  <script file="EmbeddedPy" check_connections="false">
-                    <text><![CDATA[# Embedded python script
-from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
-
-action_ = PVUtil.getInt(pvs[0]);
-
-if (action_ == 1):
-	pvs[1].write(1)
-	pvs[2].write(1)
-	pvs[3].write(1)
-	pvs[4].write(1)
-
-
-]]></text>
-                    <pv_name>loc://trigAcquistion2</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-210:Acquire</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-220:Acquire</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-230:Acquire</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-240:Acquire</pv_name>
-                  </script>
-                </scripts>
-              </widget>
-              <widget type="action_button" version="3.0.0">
-                <name>AcqCtrlStop</name>
-                <actions>
-                  <action type="write_pv">
-                    <pv_name>loc://trigStopAcquistion2</pv_name>
-                    <value>1</value>
-                    <description>Set Acquisition to STOP</description>
-                  </action>
-                </actions>
-                <pv_name>loc://trigStopAcquistion2(0)</pv_name>
-                <text>Stop</text>
-                <x>35</x>
-                <y>30</y>
-                <width>34</width>
-                <font>
-                  <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-                  </font>
-                </font>
-                <scripts>
-                  <script file="EmbeddedPy" check_connections="false">
-                    <text><![CDATA[# Embedded python script
-from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
-
-action_ = PVUtil.getInt(pvs[0]);
-
-if (action_ == 1):
-	pvs[1].write(0)
-	pvs[2].write(0)
-	pvs[3].write(0)
-	pvs[4].write(0)
-
-
-]]></text>
-                    <pv_name>loc://trigStopAcquistion2</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-210:Acquire</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-220:Acquire</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-230:Acquire</pv_name>
-                    <pv_name trigger="false">PBI-BPM01:Ctrl-AMC-240:Acquire</pv_name>
-                  </script>
-                </scripts>
-              </widget>
-              <widget type="rectangle" version="2.0.0">
-                <name>AcqCtrlBackground</name>
-                <width>70</width>
-                <height>432</height>
-                <line_width>0</line_width>
-                <background_color>
-                  <color red="150" green="155" blue="151" alpha="90">
-                  </color>
-                </background_color>
-                <corner_width>5</corner_width>
-                <corner_height>5</corner_height>
-              </widget>
-            </widget>
-            <widget type="group" version="2.0.0">
-              <name>Arrays</name>
-              <x>475</x>
-              <width>70</width>
-              <height>432</height>
-              <style>3</style>
-              <transparent>true</transparent>
-              <widget type="label" version="2.0.0">
-                <name>ArraysHeader</name>
-                <text>Arrays</text>
-                <width>70</width>
-                <height>30</height>
-                <font>
-                  <font family="Source Sans Pro" style="BOLD" size="14.0">
-                  </font>
-                </font>
-                <horizontal_alignment>1</horizontal_alignment>
-                <vertical_alignment>1</vertical_alignment>
-              </widget>
-              <widget type="action_button" version="3.0.0">
-                <name>ArraysStart</name>
+                <name>ArraysStart</name>
                 <actions>
                   <action type="write_pv">
                     <pv_name>loc://trigTransfArrays2</pv_name>
@@ -2494,121 +2464,38 @@ if (action_ == 1):
             <height>520</height>
             <style>3</style>
             <transparent>true</transparent>
-            <widget type="embedded" version="2.0.0">
-              <name>AMC-110</name>
-              <macros>
-                <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
-                <BPM_TITLE>DTL-030 BPM 1/2</BPM_TITLE>
-                <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
-                <IOCNAME>PBI-BPM02:SC-IOC-101</IOCNAME>
-                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
-                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
-                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
-                <R1_BPMMan>BPM01-</R1_BPMMan>
-                <R2_BPMMan>BPM02-</R2_BPMMan>
-                <RFFE_NAME>PBI-BPMFE-110</RFFE_NAME>
-                <RTM_NAME>Ctrl-RTM-110</RTM_NAME>
-                <S1_BPMMan>DTL-</S1_BPMMan>
-                <S2_BPMMan>DTL-</S2_BPMMan>
-                <SYSTEM1>DTL-030:PBI-BPM-001:</SYSTEM1>
-                <SYSTEM2>DTL-030:PBI-BPM-002:</SYSTEM2>
-                <SYSTEM_P>DTL-030</SYSTEM_P>
-              </macros>
-              <file>support/instance.opi</file>
-              <y>71</y>
-              <width>1740</width>
-              <height>80</height>
-              <resize>2</resize>
+            <widget type="group" version="2.0.0">
+              <name>RFFE</name>
+              <x>1610</x>
+              <width>110</width>
+              <height>430</height>
+              <style>3</style>
               <transparent>true</transparent>
-              <actions>
-              </actions>
-              <border_color>
-                <color red="0" green="128" blue="255">
-                </color>
-              </border_color>
-            </widget>
-            <widget type="embedded" version="2.0.0">
-              <name>AMC-120</name>
-              <macros>
-                <AMC_NAME>Ctrl-AMC-120</AMC_NAME>
-                <BPM_TITLE>DTL-040 BPM 1/2</BPM_TITLE>
-                <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
-                <IOCNAME>PBI-BPM02:SC-IOC-102</IOCNAME>
-                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
-                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
-                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
-                <R1_BPMMan>BPM01-</R1_BPMMan>
-                <R2_BPMMan>BPM02-</R2_BPMMan>
-                <RFFE_NAME>PBI-BPMFE-120</RFFE_NAME>
-                <RTM_NAME>Ctrl-RTM-120</RTM_NAME>
-                <S1_BPMMan>DTL-</S1_BPMMan>
-                <S2_BPMMan>DTL-</S2_BPMMan>
-                <SYSTEM1>DTL-040:PBI-BPM-001:</SYSTEM1>
-                <SYSTEM2>DTL-040:PBI-BPM-002:</SYSTEM2>
-                <SYSTEM_P>DTL-040</SYSTEM_P>
-              </macros>
-              <file>support/instance.opi</file>
-              <y>161</y>
-              <width>1740</width>
-              <height>80</height>
-              <resize>2</resize>
-              <transparent>true</transparent>
-              <actions>
-              </actions>
-              <border_color>
-                <color red="0" green="128" blue="255">
-                </color>
-              </border_color>
-            </widget>
-            <widget type="embedded" version="2.0.0">
-              <name>AMC-130</name>
-              <macros>
-                <AMC_NAME>Ctrl-AMC-130</AMC_NAME>
-                <BPM_TITLE>DTL-050 BPM 1/2</BPM_TITLE>
-                <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
-                <IOCNAME>PBI-BPM02:SC-IOC-103</IOCNAME>
-                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
-                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
-                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
-                <R1_BPMMan>BPM01-</R1_BPMMan>
-                <R2_BPMMan>BPM02-</R2_BPMMan>
-                <RFFE_NAME>PBI-BPMFE-130</RFFE_NAME>
-                <RTM_NAME>Ctrl-RTM-130</RTM_NAME>
-                <S1_BPMMan>DTL-</S1_BPMMan>
-                <S2_BPMMan>DTL-</S2_BPMMan>
-                <SYSTEM1>DTL-050:PBI-BPM-001:</SYSTEM1>
-                <SYSTEM2>DTL-050:PBI-BPM-002:</SYSTEM2>
-                <SYSTEM_P>DTL-050</SYSTEM_P>
-              </macros>
-              <file>support/instance.opi</file>
-              <y>251</y>
-              <width>1740</width>
-              <height>80</height>
-              <resize>2</resize>
-              <transparent>true</transparent>
-              <actions>
-              </actions>
-              <border_color>
-                <color red="0" green="128" blue="255">
-                </color>
-              </border_color>
-            </widget>
-            <widget type="embedded" version="2.0.0">
-              <name>EVR-101</name>
-              <macros>
-                <EVR>PBI-BPM02:Ctrl-EVR-101</EVR>
-                <EVR_OPI>../../../99-Shared/mrfioc2_new/evr-mtca-300u.bob</EVR_OPI>
-                <P>PBI-BPM02:</P>
-                <R>Ctrl-EVR-101:</R>
-              </macros>
-              <file>support/evr-instance.bob</file>
-              <y>440</y>
-              <width>1010</width>
-              <height>65</height>
-              <resize>2</resize>
+              <widget type="rectangle" version="2.0.0">
+                <name>RFFEBackground</name>
+                <width>110</width>
+                <height>430</height>
+                <line_width>0</line_width>
+                <background_color>
+                  <color red="150" green="155" blue="151" alpha="90">
+                  </color>
+                </background_color>
+                <corner_width>5</corner_width>
+                <corner_height>5</corner_height>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>RFFEHeader</name>
+                <text>RFFE</text>
+                <x>10</x>
+                <width>90</width>
+                <height>30</height>
+                <font>
+                  <font family="Source Sans Pro" style="BOLD" size="14.0">
+                  </font>
+                </font>
+                <horizontal_alignment>1</horizontal_alignment>
+                <vertical_alignment>1</vertical_alignment>
+              </widget>
             </widget>
             <widget type="group" version="2.0.0">
               <name>IPMI</name>
@@ -2617,6 +2504,18 @@ if (action_ == 1):
               <height>430</height>
               <style>3</style>
               <transparent>true</transparent>
+              <widget type="rectangle" version="2.0.0">
+                <name>IPMIBackground</name>
+                <width>90</width>
+                <height>430</height>
+                <line_width>0</line_width>
+                <background_color>
+                  <color red="150" green="155" blue="151" alpha="90">
+                  </color>
+                </background_color>
+                <corner_width>5</corner_width>
+                <corner_height>5</corner_height>
+              </widget>
               <widget type="label" version="2.0.0">
                 <name>IPMIHeader</name>
                 <text>IPMI Manager</text>
@@ -2688,31 +2587,134 @@ if (action_ == 1):
                 <width>70</width>
                 <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
               </widget>
-              <widget type="rectangle" version="2.0.0">
-                <name>IPMIBackground</name>
-                <width>90</width>
-                <height>430</height>
-                <line_width>0</line_width>
-                <background_color>
-                  <color red="150" green="155" blue="151" alpha="90">
-                  </color>
-                </background_color>
-                <corner_width>5</corner_width>
-                <corner_height>5</corner_height>
-              </widget>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>AMC-110</name>
+              <macros>
+                <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
+                <BPM_TITLE>DTL-030 BPM 1/2</BPM_TITLE>
+                <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
+                <IOCNAME>PBI-BPM02:SC-IOC-101</IOCNAME>
+                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
+                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
+                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
+                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <R1_BPMMan>BPM01-</R1_BPMMan>
+                <R2_BPMMan>BPM02-</R2_BPMMan>
+                <RFFE_NAME>PBI-BPMFE-110</RFFE_NAME>
+                <RTM_NAME>Ctrl-RTM-110</RTM_NAME>
+                <S1_BPMMan>DTL-</S1_BPMMan>
+                <S2_BPMMan>DTL-</S2_BPMMan>
+                <SYSTEM1>DTL-030:PBI-BPM-001:</SYSTEM1>
+                <SYSTEM2>DTL-030:PBI-BPM-002:</SYSTEM2>
+                <SYSTEM_P>DTL-030</SYSTEM_P>
+              </macros>
+              <file>support/instance.opi</file>
+              <y>71</y>
+              <width>1740</width>
+              <height>80</height>
+              <resize>2</resize>
+              <transparent>true</transparent>
+              <actions>
+              </actions>
+              <border_color>
+                <color red="0" green="128" blue="255">
+                </color>
+              </border_color>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>AMC-120</name>
+              <macros>
+                <AMC_NAME>Ctrl-AMC-120</AMC_NAME>
+                <BPM_TITLE>DTL-040 BPM 1/2</BPM_TITLE>
+                <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
+                <IOCNAME>PBI-BPM02:SC-IOC-102</IOCNAME>
+                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
+                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
+                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
+                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <R1_BPMMan>BPM01-</R1_BPMMan>
+                <R2_BPMMan>BPM02-</R2_BPMMan>
+                <RFFE_NAME>PBI-BPMFE-120</RFFE_NAME>
+                <RTM_NAME>Ctrl-RTM-120</RTM_NAME>
+                <S1_BPMMan>DTL-</S1_BPMMan>
+                <S2_BPMMan>DTL-</S2_BPMMan>
+                <SYSTEM1>DTL-040:PBI-BPM-001:</SYSTEM1>
+                <SYSTEM2>DTL-040:PBI-BPM-002:</SYSTEM2>
+                <SYSTEM_P>DTL-040</SYSTEM_P>
+              </macros>
+              <file>support/instance.opi</file>
+              <y>161</y>
+              <width>1740</width>
+              <height>80</height>
+              <resize>2</resize>
+              <transparent>true</transparent>
+              <actions>
+              </actions>
+              <border_color>
+                <color red="0" green="128" blue="255">
+                </color>
+              </border_color>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>AMC-130</name>
+              <macros>
+                <AMC_NAME>Ctrl-AMC-130</AMC_NAME>
+                <BPM_TITLE>DTL-050 BPM 1/2</BPM_TITLE>
+                <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
+                <IOCNAME>PBI-BPM02:SC-IOC-103</IOCNAME>
+                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
+                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
+                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
+                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <R1_BPMMan>BPM01-</R1_BPMMan>
+                <R2_BPMMan>BPM02-</R2_BPMMan>
+                <RFFE_NAME>PBI-BPMFE-130</RFFE_NAME>
+                <RTM_NAME>Ctrl-RTM-130</RTM_NAME>
+                <S1_BPMMan>DTL-</S1_BPMMan>
+                <S2_BPMMan>DTL-</S2_BPMMan>
+                <SYSTEM1>DTL-050:PBI-BPM-001:</SYSTEM1>
+                <SYSTEM2>DTL-050:PBI-BPM-002:</SYSTEM2>
+                <SYSTEM_P>DTL-050</SYSTEM_P>
+              </macros>
+              <file>support/instance.opi</file>
+              <y>251</y>
+              <width>1740</width>
+              <height>80</height>
+              <resize>2</resize>
+              <transparent>true</transparent>
+              <actions>
+              </actions>
+              <border_color>
+                <color red="0" green="128" blue="255">
+                </color>
+              </border_color>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>EVR-101</name>
+              <macros>
+                <EVR>PBI-BPM02:Ctrl-EVR-101</EVR>
+                <EVR_OPI>../../../99-Shared/mrfioc2_new/evr-mtca-300u.bob</EVR_OPI>
+                <P>PBI-BPM02:</P>
+                <R>Ctrl-EVR-101:</R>
+              </macros>
+              <file>support/evr-instance.bob</file>
+              <y>440</y>
+              <width>1010</width>
+              <height>65</height>
+              <resize>2</resize>
             </widget>
             <widget type="group" version="2.0.0">
-              <name>RFFE</name>
-              <x>1610</x>
-              <width>110</width>
+              <name>Arrays</name>
+              <x>475</x>
+              <width>70</width>
               <height>430</height>
               <style>3</style>
               <transparent>true</transparent>
               <widget type="label" version="2.0.0">
-                <name>RFFEHeader</name>
-                <text>RFFE</text>
-                <x>10</x>
-                <width>90</width>
+                <name>ArraysHeader</name>
+                <text>Arrays</text>
+                <width>70</width>
                 <height>30</height>
                 <font>
                   <font family="Source Sans Pro" style="BOLD" size="14.0">
@@ -2722,63 +2724,16 @@ if (action_ == 1):
                 <vertical_alignment>1</vertical_alignment>
               </widget>
               <widget type="action_button" version="3.0.0">
-                <name>RFFEDetails</name>
+                <name>ArraysStart</name>
                 <actions>
-                  <action type="open_display">
-                    <file>../bpmrffeioc/top.bob</file>
-                    <target>window</target>
-                    <description>Open RFFE Launcher</description>
+                  <action type="write_pv">
+                    <pv_name>loc://trigTransfArraysBPM02-IOC01</pv_name>
+                    <value>1</value>
+                    <description>Set Acquisition to START</description>
                   </action>
                 </actions>
-                <text>Details</text>
-                <x>20</x>
-                <y>30</y>
-                <width>70</width>
-                <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
-              </widget>
-              <widget type="rectangle" version="2.0.0">
-                <name>RFFEBackground</name>
-                <width>110</width>
-                <height>430</height>
-                <line_width>0</line_width>
-                <background_color>
-                  <color red="150" green="155" blue="151" alpha="90">
-                  </color>
-                </background_color>
-                <corner_width>5</corner_width>
-                <corner_height>5</corner_height>
-              </widget>
-            </widget>
-            <widget type="group" version="2.0.0">
-              <name>Arrays</name>
-              <x>475</x>
-              <width>70</width>
-              <height>430</height>
-              <style>3</style>
-              <transparent>true</transparent>
-              <widget type="label" version="2.0.0">
-                <name>ArraysHeader</name>
-                <text>Arrays</text>
-                <width>70</width>
-                <height>30</height>
-                <font>
-                  <font family="Source Sans Pro" style="BOLD" size="14.0">
-                  </font>
-                </font>
-                <horizontal_alignment>1</horizontal_alignment>
-                <vertical_alignment>1</vertical_alignment>
-              </widget>
-              <widget type="action_button" version="3.0.0">
-                <name>ArraysStart</name>
-                <actions>
-                  <action type="write_pv">
-                    <pv_name>loc://trigTransfArraysBPM02-IOC01</pv_name>
-                    <value>1</value>
-                    <description>Set Acquisition to START</description>
-                  </action>
-                </actions>
-                <pv_name>loc://trigTransfArraysBPM02-IOC01(0)</pv_name>
-                <text>Yes</text>
+                <pv_name>loc://trigTransfArraysBPM02-IOC01(0)</pv_name>
+                <text>Yes</text>
                 <y>30</y>
                 <width>34</width>
                 <font>
@@ -2981,121 +2936,38 @@ if (action_ == 1):
             <height>520</height>
             <style>3</style>
             <transparent>true</transparent>
-            <widget type="embedded" version="2.0.0">
-              <name>AMC-210</name>
-              <macros>
-                <AMC_NAME>Ctrl-AMC-210</AMC_NAME>
-                <BPM_TITLE>SPK-010 BPM 1/2</BPM_TITLE>
-                <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
-                <IOCNAME>PBI-BPM02:SC-IOC-201</IOCNAME>
-                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
-                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
-                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
-                <R1_BPMMan>BPM01-</R1_BPMMan>
-                <R2_BPMMan>BPM02-</R2_BPMMan>
-                <RFFE_NAME>PBI-BPMFE-210</RFFE_NAME>
-                <RTM_NAME>Ctrl-RTM-210</RTM_NAME>
-                <S1_BPMMan>SPK-</S1_BPMMan>
-                <S2_BPMMan>SPK-</S2_BPMMan>
-                <SYSTEM1>SPK-010:PBI-BPM-001:</SYSTEM1>
-                <SYSTEM2>SPK-010:PBI-BPM-002:</SYSTEM2>
-                <SYSTEM_P>SPK-010</SYSTEM_P>
-              </macros>
-              <file>support/instance.opi</file>
-              <y>71</y>
-              <width>1740</width>
-              <height>80</height>
-              <resize>2</resize>
-              <transparent>true</transparent>
-              <actions>
-              </actions>
-              <border_color>
-                <color red="0" green="128" blue="255">
-                </color>
-              </border_color>
-            </widget>
-            <widget type="embedded" version="2.0.0">
-              <name>AMC-220</name>
-              <macros>
-                <AMC_NAME>Ctrl-AMC-220</AMC_NAME>
-                <BPM_TITLE>SPK-020 BPM 1/SPK-030 BPM 1</BPM_TITLE>
-                <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
-                <IOCNAME>PBI-BPM02:SC-IOC-202</IOCNAME>
-                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
-                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
-                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
-                <R1_BPMMan>BPM01-</R1_BPMMan>
-                <R2_BPMMan>BPM02-</R2_BPMMan>
-                <RFFE_NAME>PBI-BPMFE-220</RFFE_NAME>
-                <RTM_NAME>Ctrl-RTM-220</RTM_NAME>
-                <S1_BPMMan>SPK-</S1_BPMMan>
-                <S2_BPMMan>SPK-</S2_BPMMan>
-                <SYSTEM1>SPK-020:PBI-BPM-001:</SYSTEM1>
-                <SYSTEM2>SPK-030:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>SPK-020</SYSTEM_P>
-              </macros>
-              <file>support/instance.opi</file>
-              <y>161</y>
-              <width>1740</width>
-              <height>80</height>
-              <resize>2</resize>
-              <transparent>true</transparent>
-              <actions>
-              </actions>
-              <border_color>
-                <color red="0" green="128" blue="255">
-                </color>
-              </border_color>
-            </widget>
-            <widget type="embedded" version="2.0.0">
-              <name>AMC-230</name>
-              <macros>
-                <AMC_NAME>Ctrl-AMC-230</AMC_NAME>
-                <BPM_TITLE>SPK-040 BPM 1/SPK-050 BPM 1</BPM_TITLE>
-                <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
-                <IOCNAME>PBI-BPM02:SC-IOC-203</IOCNAME>
-                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
-                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
-                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
-                <R1_BPMMan>BPM01-</R1_BPMMan>
-                <R2_BPMMan>BPM02-</R2_BPMMan>
-                <RFFE_NAME>PBI-BPMFE-230</RFFE_NAME>
-                <RTM_NAME>Ctrl-RTM-230</RTM_NAME>
-                <S1_BPMMan>SPK-</S1_BPMMan>
-                <S2_BPMMan>SPK-</S2_BPMMan>
-                <SYSTEM1>SPK-040:PBI-BPM-001:</SYSTEM1>
-                <SYSTEM2>SPK-050:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>SPK-040</SYSTEM_P>
-              </macros>
-              <file>support/instance.opi</file>
-              <y>251</y>
-              <width>1740</width>
-              <height>80</height>
-              <resize>2</resize>
+            <widget type="group" version="2.0.0">
+              <name>RFFE</name>
+              <x>1610</x>
+              <width>110</width>
+              <height>430</height>
+              <style>3</style>
               <transparent>true</transparent>
-              <actions>
-              </actions>
-              <border_color>
-                <color red="0" green="128" blue="255">
-                </color>
-              </border_color>
-            </widget>
-            <widget type="embedded" version="2.0.0">
-              <name>EVR-201</name>
-              <macros>
-                <EVR>PBI-BPM02:Ctrl-EVR-201</EVR>
-                <EVR_OPI>../../../99-Shared/mrfioc2_new/evr-mtca-300u.bob</EVR_OPI>
-                <P>PBI-BPM02:</P>
-                <R>Ctrl-EVR-201:</R>
-              </macros>
-              <file>support/evr-instance.bob</file>
-              <y>440</y>
-              <width>1010</width>
-              <height>65</height>
-              <resize>2</resize>
+              <widget type="rectangle" version="2.0.0">
+                <name>RFFEBackground</name>
+                <width>110</width>
+                <height>430</height>
+                <line_width>0</line_width>
+                <background_color>
+                  <color red="150" green="155" blue="151" alpha="90">
+                  </color>
+                </background_color>
+                <corner_width>5</corner_width>
+                <corner_height>5</corner_height>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>RFFEHeader</name>
+                <text>RFFE</text>
+                <x>10</x>
+                <width>90</width>
+                <height>30</height>
+                <font>
+                  <font family="Source Sans Pro" style="BOLD" size="14.0">
+                  </font>
+                </font>
+                <horizontal_alignment>1</horizontal_alignment>
+                <vertical_alignment>1</vertical_alignment>
+              </widget>
             </widget>
             <widget type="group" version="2.0.0">
               <name>IPMI</name>
@@ -3104,6 +2976,18 @@ if (action_ == 1):
               <height>430</height>
               <style>3</style>
               <transparent>true</transparent>
+              <widget type="rectangle" version="2.0.0">
+                <name>IPMIBackground</name>
+                <width>90</width>
+                <height>430</height>
+                <line_width>0</line_width>
+                <background_color>
+                  <color red="150" green="155" blue="151" alpha="90">
+                  </color>
+                </background_color>
+                <corner_width>5</corner_width>
+                <corner_height>5</corner_height>
+              </widget>
               <widget type="label" version="2.0.0">
                 <name>IPMIHeader</name>
                 <text>IPMI Manager</text>
@@ -3175,66 +3059,122 @@ if (action_ == 1):
                 <width>70</width>
                 <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
               </widget>
-              <widget type="rectangle" version="2.0.0">
-                <name>IPMIBackground</name>
-                <width>90</width>
-                <height>430</height>
-                <line_width>0</line_width>
-                <background_color>
-                  <color red="150" green="155" blue="151" alpha="90">
-                  </color>
-                </background_color>
-                <corner_width>5</corner_width>
-                <corner_height>5</corner_height>
-              </widget>
             </widget>
-            <widget type="group" version="2.0.0">
-              <name>RFFE</name>
-              <x>1610</x>
-              <width>110</width>
-              <height>430</height>
-              <style>3</style>
+            <widget type="embedded" version="2.0.0">
+              <name>AMC-210</name>
+              <macros>
+                <AMC_NAME>Ctrl-AMC-210</AMC_NAME>
+                <BPM_TITLE>SPK-010 BPM 1/2</BPM_TITLE>
+                <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
+                <IOCNAME>PBI-BPM02:SC-IOC-201</IOCNAME>
+                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
+                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
+                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
+                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <R1_BPMMan>BPM01-</R1_BPMMan>
+                <R2_BPMMan>BPM02-</R2_BPMMan>
+                <RFFE_NAME>PBI-BPMFE-210</RFFE_NAME>
+                <RTM_NAME>Ctrl-RTM-210</RTM_NAME>
+                <S1_BPMMan>SPK-</S1_BPMMan>
+                <S2_BPMMan>SPK-</S2_BPMMan>
+                <SYSTEM1>SPK-010:PBI-BPM-001:</SYSTEM1>
+                <SYSTEM2>SPK-010:PBI-BPM-002:</SYSTEM2>
+                <SYSTEM_P>SPK-010</SYSTEM_P>
+              </macros>
+              <file>support/instance.opi</file>
+              <y>71</y>
+              <width>1740</width>
+              <height>80</height>
+              <resize>2</resize>
               <transparent>true</transparent>
-              <widget type="label" version="2.0.0">
-                <name>RFFEHeader</name>
-                <text>RFFE</text>
-                <x>10</x>
-                <width>90</width>
-                <height>30</height>
-                <font>
-                  <font family="Source Sans Pro" style="BOLD" size="14.0">
-                  </font>
-                </font>
-                <horizontal_alignment>1</horizontal_alignment>
-                <vertical_alignment>1</vertical_alignment>
-              </widget>
-              <widget type="action_button" version="3.0.0">
-                <name>RFFEDetails</name>
-                <actions>
-                  <action type="open_display">
-                    <file>../bpmrffeioc/top.bob</file>
-                    <target>window</target>
-                    <description>Open RFFE Launcher</description>
-                  </action>
-                </actions>
-                <text>Details</text>
-                <x>20</x>
-                <y>30</y>
-                <width>70</width>
-                <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
-              </widget>
-              <widget type="rectangle" version="2.0.0">
-                <name>RFFEBackground</name>
-                <width>110</width>
-                <height>430</height>
-                <line_width>0</line_width>
-                <background_color>
-                  <color red="150" green="155" blue="151" alpha="90">
-                  </color>
-                </background_color>
-                <corner_width>5</corner_width>
-                <corner_height>5</corner_height>
-              </widget>
+              <actions>
+              </actions>
+              <border_color>
+                <color red="0" green="128" blue="255">
+                </color>
+              </border_color>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>AMC-220</name>
+              <macros>
+                <AMC_NAME>Ctrl-AMC-220</AMC_NAME>
+                <BPM_TITLE>SPK-020 BPM 1/SPK-030 BPM 1</BPM_TITLE>
+                <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
+                <IOCNAME>PBI-BPM02:SC-IOC-202</IOCNAME>
+                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
+                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
+                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
+                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <R1_BPMMan>BPM01-</R1_BPMMan>
+                <R2_BPMMan>BPM02-</R2_BPMMan>
+                <RFFE_NAME>PBI-BPMFE-220</RFFE_NAME>
+                <RTM_NAME>Ctrl-RTM-220</RTM_NAME>
+                <S1_BPMMan>SPK-</S1_BPMMan>
+                <S2_BPMMan>SPK-</S2_BPMMan>
+                <SYSTEM1>SPK-020:PBI-BPM-001:</SYSTEM1>
+                <SYSTEM2>SPK-030:PBI-BPM-001:</SYSTEM2>
+                <SYSTEM_P>SPK-020</SYSTEM_P>
+              </macros>
+              <file>support/instance.opi</file>
+              <y>161</y>
+              <width>1740</width>
+              <height>80</height>
+              <resize>2</resize>
+              <transparent>true</transparent>
+              <actions>
+              </actions>
+              <border_color>
+                <color red="0" green="128" blue="255">
+                </color>
+              </border_color>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>AMC-230</name>
+              <macros>
+                <AMC_NAME>Ctrl-AMC-230</AMC_NAME>
+                <BPM_TITLE>SPK-040 BPM 1/SPK-050 BPM 1</BPM_TITLE>
+                <CONTROL_GROUP>PBI-BPM02</CONTROL_GROUP>
+                <IOCNAME>PBI-BPM02:SC-IOC-203</IOCNAME>
+                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
+                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
+                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
+                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <R1_BPMMan>BPM01-</R1_BPMMan>
+                <R2_BPMMan>BPM02-</R2_BPMMan>
+                <RFFE_NAME>PBI-BPMFE-230</RFFE_NAME>
+                <RTM_NAME>Ctrl-RTM-230</RTM_NAME>
+                <S1_BPMMan>SPK-</S1_BPMMan>
+                <S2_BPMMan>SPK-</S2_BPMMan>
+                <SYSTEM1>SPK-040:PBI-BPM-001:</SYSTEM1>
+                <SYSTEM2>SPK-050:PBI-BPM-001:</SYSTEM2>
+                <SYSTEM_P>SPK-040</SYSTEM_P>
+              </macros>
+              <file>support/instance.opi</file>
+              <y>251</y>
+              <width>1740</width>
+              <height>80</height>
+              <resize>2</resize>
+              <transparent>true</transparent>
+              <actions>
+              </actions>
+              <border_color>
+                <color red="0" green="128" blue="255">
+                </color>
+              </border_color>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>EVR-201</name>
+              <macros>
+                <EVR>PBI-BPM02:Ctrl-EVR-201</EVR>
+                <EVR_OPI>../../../99-Shared/mrfioc2_new/evr-mtca-300u.bob</EVR_OPI>
+                <P>PBI-BPM02:</P>
+                <R>Ctrl-EVR-201:</R>
+              </macros>
+              <file>support/evr-instance.bob</file>
+              <y>440</y>
+              <width>1010</width>
+              <height>65</height>
+              <resize>2</resize>
             </widget>
             <widget type="group" version="2.0.0">
               <name>Arrays</name>
@@ -4537,6 +4477,130 @@ if (action_ == 1):
             <height>520</height>
             <style>3</style>
             <transparent>true</transparent>
+            <widget type="group" version="2.0.0">
+              <name>RFFE</name>
+              <x>1610</x>
+              <width>110</width>
+              <height>430</height>
+              <style>3</style>
+              <transparent>true</transparent>
+              <widget type="rectangle" version="2.0.0">
+                <name>RFFEBackground</name>
+                <width>110</width>
+                <height>430</height>
+                <line_width>0</line_width>
+                <background_color>
+                  <color red="150" green="155" blue="151" alpha="90">
+                  </color>
+                </background_color>
+                <corner_width>5</corner_width>
+                <corner_height>5</corner_height>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>RFFEHeader</name>
+                <text>RFFE</text>
+                <x>10</x>
+                <width>90</width>
+                <height>30</height>
+                <font>
+                  <font family="Source Sans Pro" style="BOLD" size="14.0">
+                  </font>
+                </font>
+                <horizontal_alignment>1</horizontal_alignment>
+                <vertical_alignment>1</vertical_alignment>
+              </widget>
+            </widget>
+            <widget type="group" version="2.0.0">
+              <name>IPMI</name>
+              <x>1480</x>
+              <width>90</width>
+              <height>430</height>
+              <style>3</style>
+              <transparent>true</transparent>
+              <widget type="rectangle" version="2.0.0">
+                <name>IPMIBackground</name>
+                <width>90</width>
+                <height>430</height>
+                <line_width>0</line_width>
+                <background_color>
+                  <color red="150" green="155" blue="151" alpha="90">
+                  </color>
+                </background_color>
+                <corner_width>5</corner_width>
+                <corner_height>5</corner_height>
+              </widget>
+              <widget type="label" version="2.0.0">
+                <name>IPMIHeader</name>
+                <text>IPMI Manager</text>
+                <width>90</width>
+                <height>30</height>
+                <font>
+                  <font family="Source Sans Pro" style="BOLD" size="14.0">
+                  </font>
+                </font>
+                <horizontal_alignment>1</horizontal_alignment>
+                <vertical_alignment>1</vertical_alignment>
+              </widget>
+              <widget type="action_button" version="3.0.0">
+                <name>IPMIDetails</name>
+                <actions>
+                  <action type="open_display">
+                    <file>../../99-Shared/ipmi-pbi-bpm01/chassis/Chassis.bob</file>
+                    <macros>
+                      <CRATE_NUM>1</CRATE_NUM>
+                      <IOCNAME>PBI-BPM03:SC-IOC-107</IOCNAME>
+                      <IOC_PREF>PBI-BPM03:SC-IOC-$(CRATE_NUM)07:</IOC_PREF>
+                      <MTCA_PREF>PBI-BPM03:Ctrl-MTCA-$(CRATE_NUM)00:</MTCA_PREF>
+                      <NAME_MODE>0</NAME_MODE>
+                      <P>PBI-BPM03:Ctrl</P>
+                      <SLOT10_IDX></SLOT10_IDX>
+                      <SLOT10_MODULE></SLOT10_MODULE>
+                      <SLOT11_IDX></SLOT11_IDX>
+                      <SLOT11_MODULE></SLOT11_MODULE>
+                      <SLOT12_IDX></SLOT12_IDX>
+                      <SLOT12_MODULE></SLOT12_MODULE>
+                      <SLOT17_MODULE></SLOT17_MODULE>
+                      <SLOT18_MODULE></SLOT18_MODULE>
+                      <SLOT19_MODULE>RTM</SLOT19_MODULE>
+                      <SLOT1_IDX>01</SLOT1_IDX>
+                      <SLOT1_MODULE>CPU</SLOT1_MODULE>
+                      <SLOT20_MODULE></SLOT20_MODULE>
+                      <SLOT21_MODULE>RTM</SLOT21_MODULE>
+                      <SLOT22_MODULE></SLOT22_MODULE>
+                      <SLOT23_MODULE>RTM</SLOT23_MODULE>
+                      <SLOT24_MODULE></SLOT24_MODULE>
+                      <SLOT25_MODULE>RTM</SLOT25_MODULE>
+                      <SLOT26_MODULE></SLOT26_MODULE>
+                      <SLOT27_MODULE></SLOT27_MODULE>
+                      <SLOT28_MODULE></SLOT28_MODULE>
+                      <SLOT2_IDX>01</SLOT2_IDX>
+                      <SLOT2_MODULE>EVR</SLOT2_MODULE>
+                      <SLOT3_IDX>10</SLOT3_IDX>
+                      <SLOT3_MODULE>AMC</SLOT3_MODULE>
+                      <SLOT4_IDX></SLOT4_IDX>
+                      <SLOT4_MODULE></SLOT4_MODULE>
+                      <SLOT5_IDX>20</SLOT5_IDX>
+                      <SLOT5_MODULE>AMC</SLOT5_MODULE>
+                      <SLOT6_IDX></SLOT6_IDX>
+                      <SLOT6_MODULE></SLOT6_MODULE>
+                      <SLOT7_IDX>30</SLOT7_IDX>
+                      <SLOT7_MODULE>AMC</SLOT7_MODULE>
+                      <SLOT8_IDX></SLOT8_IDX>
+                      <SLOT8_MODULE></SLOT8_MODULE>
+                      <SLOT9_IDX>40</SLOT9_IDX>
+                      <SLOT9_MODULE>AMC</SLOT9_MODULE>
+                    </macros>
+                    <target>window</target>
+                    <description>Carrier1</description>
+                  </action>
+                </actions>
+                <text>Details</text>
+                <x>10</x>
+                <y>30</y>
+                <width>70</width>
+                <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
+              </widget>
+            </widget>
             <widget type="embedded" version="2.0.0">
               <name>AMC-110</name>
               <macros>
@@ -4657,174 +4721,35 @@ if (action_ == 1):
                 <S1_BPMMan>SPK-</S1_BPMMan>
                 <S2_BPMMan>SPK-</S2_BPMMan>
                 <SYSTEM1>SPK-120:PBI-BPM-001:</SYSTEM1>
-                <SYSTEM2>SPK-130:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>SPK-120</SYSTEM_P>
-              </macros>
-              <file>support/instance.opi</file>
-              <y>340</y>
-              <width>1740</width>
-              <height>80</height>
-              <resize>2</resize>
-              <transparent>true</transparent>
-              <actions>
-              </actions>
-              <border_color>
-                <color red="0" green="128" blue="255">
-                </color>
-              </border_color>
-            </widget>
-            <widget type="embedded" version="2.0.0">
-              <name>EVR-101</name>
-              <macros>
-                <EVR>PBI-BPM03:Ctrl-EVR-101</EVR>
-                <EVR_OPI>../../../99-Shared/mrfioc2_new/evr-mtca-300u.bob</EVR_OPI>
-                <P>PBI-BPM03:</P>
-                <R>Ctrl-EVR-101:</R>
-              </macros>
-              <file>support/evr-instance.bob</file>
-              <y>440</y>
-              <width>1010</width>
-              <height>65</height>
-              <resize>2</resize>
-            </widget>
-            <widget type="group" version="2.0.0">
-              <name>RFFE</name>
-              <x>1610</x>
-              <width>110</width>
-              <height>430</height>
-              <style>3</style>
-              <transparent>true</transparent>
-              <widget type="label" version="2.0.0">
-                <name>RFFEHeader</name>
-                <text>RFFE</text>
-                <x>10</x>
-                <width>90</width>
-                <height>30</height>
-                <font>
-                  <font family="Source Sans Pro" style="BOLD" size="14.0">
-                  </font>
-                </font>
-                <horizontal_alignment>1</horizontal_alignment>
-                <vertical_alignment>1</vertical_alignment>
-              </widget>
-              <widget type="action_button" version="3.0.0">
-                <name>RFFEDetails</name>
-                <actions>
-                  <action type="open_display">
-                    <file>../bpmrffeioc/top.bob</file>
-                    <target>window</target>
-                    <description>Open RFFE Launcher</description>
-                  </action>
-                </actions>
-                <text>Details</text>
-                <x>20</x>
-                <y>30</y>
-                <width>70</width>
-                <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
-              </widget>
-              <widget type="rectangle" version="2.0.0">
-                <name>RFFEBackground</name>
-                <width>110</width>
-                <height>430</height>
-                <line_width>0</line_width>
-                <background_color>
-                  <color red="150" green="155" blue="151" alpha="90">
-                  </color>
-                </background_color>
-                <corner_width>5</corner_width>
-                <corner_height>5</corner_height>
-              </widget>
-            </widget>
-            <widget type="group" version="2.0.0">
-              <name>IPMI</name>
-              <x>1480</x>
-              <width>90</width>
-              <height>430</height>
-              <style>3</style>
+                <SYSTEM2>SPK-130:PBI-BPM-001:</SYSTEM2>
+                <SYSTEM_P>SPK-120</SYSTEM_P>
+              </macros>
+              <file>support/instance.opi</file>
+              <y>340</y>
+              <width>1740</width>
+              <height>80</height>
+              <resize>2</resize>
               <transparent>true</transparent>
-              <widget type="label" version="2.0.0">
-                <name>IPMIHeader</name>
-                <text>IPMI Manager</text>
-                <width>90</width>
-                <height>30</height>
-                <font>
-                  <font family="Source Sans Pro" style="BOLD" size="14.0">
-                  </font>
-                </font>
-                <horizontal_alignment>1</horizontal_alignment>
-                <vertical_alignment>1</vertical_alignment>
-              </widget>
-              <widget type="action_button" version="3.0.0">
-                <name>IPMIDetails</name>
-                <actions>
-                  <action type="open_display">
-                    <file>../../99-Shared/ipmi-pbi-bpm01/chassis/Chassis.bob</file>
-                    <macros>
-                      <CRATE_NUM>1</CRATE_NUM>
-                      <IOCNAME>PBI-BPM03:SC-IOC-107</IOCNAME>
-                      <IOC_PREF>PBI-BPM03:SC-IOC-$(CRATE_NUM)07:</IOC_PREF>
-                      <MTCA_PREF>PBI-BPM03:Ctrl-MTCA-$(CRATE_NUM)00:</MTCA_PREF>
-                      <NAME_MODE>0</NAME_MODE>
-                      <P>PBI-BPM03:Ctrl</P>
-                      <SLOT10_IDX></SLOT10_IDX>
-                      <SLOT10_MODULE></SLOT10_MODULE>
-                      <SLOT11_IDX></SLOT11_IDX>
-                      <SLOT11_MODULE></SLOT11_MODULE>
-                      <SLOT12_IDX></SLOT12_IDX>
-                      <SLOT12_MODULE></SLOT12_MODULE>
-                      <SLOT17_MODULE></SLOT17_MODULE>
-                      <SLOT18_MODULE></SLOT18_MODULE>
-                      <SLOT19_MODULE>RTM</SLOT19_MODULE>
-                      <SLOT1_IDX>01</SLOT1_IDX>
-                      <SLOT1_MODULE>CPU</SLOT1_MODULE>
-                      <SLOT20_MODULE></SLOT20_MODULE>
-                      <SLOT21_MODULE>RTM</SLOT21_MODULE>
-                      <SLOT22_MODULE></SLOT22_MODULE>
-                      <SLOT23_MODULE>RTM</SLOT23_MODULE>
-                      <SLOT24_MODULE></SLOT24_MODULE>
-                      <SLOT25_MODULE>RTM</SLOT25_MODULE>
-                      <SLOT26_MODULE></SLOT26_MODULE>
-                      <SLOT27_MODULE></SLOT27_MODULE>
-                      <SLOT28_MODULE></SLOT28_MODULE>
-                      <SLOT2_IDX>01</SLOT2_IDX>
-                      <SLOT2_MODULE>EVR</SLOT2_MODULE>
-                      <SLOT3_IDX>10</SLOT3_IDX>
-                      <SLOT3_MODULE>AMC</SLOT3_MODULE>
-                      <SLOT4_IDX></SLOT4_IDX>
-                      <SLOT4_MODULE></SLOT4_MODULE>
-                      <SLOT5_IDX>20</SLOT5_IDX>
-                      <SLOT5_MODULE>AMC</SLOT5_MODULE>
-                      <SLOT6_IDX></SLOT6_IDX>
-                      <SLOT6_MODULE></SLOT6_MODULE>
-                      <SLOT7_IDX>30</SLOT7_IDX>
-                      <SLOT7_MODULE>AMC</SLOT7_MODULE>
-                      <SLOT8_IDX></SLOT8_IDX>
-                      <SLOT8_MODULE></SLOT8_MODULE>
-                      <SLOT9_IDX>40</SLOT9_IDX>
-                      <SLOT9_MODULE>AMC</SLOT9_MODULE>
-                    </macros>
-                    <target>window</target>
-                    <description>Carrier1</description>
-                  </action>
-                </actions>
-                <text>Details</text>
-                <x>10</x>
-                <y>30</y>
-                <width>70</width>
-                <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
-              </widget>
-              <widget type="rectangle" version="2.0.0">
-                <name>IPMIBackground</name>
-                <width>90</width>
-                <height>430</height>
-                <line_width>0</line_width>
-                <background_color>
-                  <color red="150" green="155" blue="151" alpha="90">
-                  </color>
-                </background_color>
-                <corner_width>5</corner_width>
-                <corner_height>5</corner_height>
-              </widget>
+              <actions>
+              </actions>
+              <border_color>
+                <color red="0" green="128" blue="255">
+                </color>
+              </border_color>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>EVR-101</name>
+              <macros>
+                <EVR>PBI-BPM03:Ctrl-EVR-101</EVR>
+                <EVR_OPI>../../../99-Shared/mrfioc2_new/evr-mtca-300u.bob</EVR_OPI>
+                <P>PBI-BPM03:</P>
+                <R>Ctrl-EVR-101:</R>
+              </macros>
+              <file>support/evr-instance.bob</file>
+              <y>440</y>
+              <width>1010</width>
+              <height>65</height>
+              <resize>2</resize>
             </widget>
             <widget type="group" version="2.0.0">
               <name>Arrays</name>
@@ -5681,88 +5606,6 @@ if (action_ == 1):
             <height>520</height>
             <style>3</style>
             <transparent>true</transparent>
-            <widget type="embedded" version="2.0.0">
-              <name>AMC-110</name>
-              <macros>
-                <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
-                <BPM_TITLE>MBL-010 BPM 1/MBL-020 BPM 1</BPM_TITLE>
-                <CONTROL_GROUP>PBI-BPM04</CONTROL_GROUP>
-                <IOCNAME>PBI-BPM04:SC-IOC-101</IOCNAME>
-                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
-                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
-                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
-                <R1_BPMMan>BPM01-</R1_BPMMan>
-                <R2_BPMMan>BPM02-</R2_BPMMan>
-                <RFFE_NAME>PBI-BPMFE-110</RFFE_NAME>
-                <RTM_NAME>Ctrl-RTM-110</RTM_NAME>
-                <S1_BPMMan>MBL-</S1_BPMMan>
-                <S2_BPMMan>MBL-</S2_BPMMan>
-                <SYSTEM1>MBL-010:PBI-BPM-001:</SYSTEM1>
-                <SYSTEM2>MBL-020:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>MBL-010</SYSTEM_P>
-              </macros>
-              <file>support/instance.opi</file>
-              <y>70</y>
-              <width>1740</width>
-              <height>80</height>
-              <resize>2</resize>
-              <transparent>true</transparent>
-              <actions>
-              </actions>
-              <border_color>
-                <color red="0" green="128" blue="255">
-                </color>
-              </border_color>
-            </widget>
-            <widget type="embedded" version="2.0.0">
-              <name>AMC-120</name>
-              <macros>
-                <AMC_NAME>Ctrl-AMC-120</AMC_NAME>
-                <BPM_TITLE>MBL-030 BPM 1/MBL-040 BPM 1</BPM_TITLE>
-                <CONTROL_GROUP>PBI-BPM04</CONTROL_GROUP>
-                <IOCNAME>PBI-BPM04:SC-IOC-102</IOCNAME>
-                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
-                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
-                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
-                <R1_BPMMan>BPM01-</R1_BPMMan>
-                <R2_BPMMan>BPM02-</R2_BPMMan>
-                <RFFE_NAME>PBI-BPMFE-120</RFFE_NAME>
-                <RTM_NAME>Ctrl-RTM-120</RTM_NAME>
-                <S1_BPMMan>MBL-</S1_BPMMan>
-                <S2_BPMMan>MBL-</S2_BPMMan>
-                <SYSTEM1>MBL-030:PBI-BPM-001:</SYSTEM1>
-                <SYSTEM2>MBL-040:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>MBL-030</SYSTEM_P>
-              </macros>
-              <file>support/instance.opi</file>
-              <y>160</y>
-              <width>1740</width>
-              <height>80</height>
-              <resize>2</resize>
-              <transparent>true</transparent>
-              <actions>
-              </actions>
-              <border_color>
-                <color red="0" green="128" blue="255">
-                </color>
-              </border_color>
-            </widget>
-            <widget type="embedded" version="2.0.0">
-              <name>EVR-101</name>
-              <macros>
-                <EVR>PBI-BPM04:Ctrl-EVR-101</EVR>
-                <EVR_OPI>../../../99-Shared/mrfioc2_new/evr-mtca-300u.bob</EVR_OPI>
-                <P>PBI-BPM04:</P>
-                <R>Ctrl-EVR-101:</R>
-              </macros>
-              <file>support/evr-instance.bob</file>
-              <y>440</y>
-              <width>1010</width>
-              <height>65</height>
-              <resize>2</resize>
-            </widget>
             <widget type="group" version="2.0.0">
               <name>RFFE</name>
               <x>1610</x>
@@ -5770,6 +5613,18 @@ if (action_ == 1):
               <height>430</height>
               <style>3</style>
               <transparent>true</transparent>
+              <widget type="rectangle" version="2.0.0">
+                <name>RFFEBackground</name>
+                <width>110</width>
+                <height>430</height>
+                <line_width>0</line_width>
+                <background_color>
+                  <color red="150" green="155" blue="151" alpha="90">
+                  </color>
+                </background_color>
+                <corner_width>5</corner_width>
+                <corner_height>5</corner_height>
+              </widget>
               <widget type="label" version="2.0.0">
                 <name>RFFEHeader</name>
                 <text>RFFE</text>
@@ -5783,24 +5638,17 @@ if (action_ == 1):
                 <horizontal_alignment>1</horizontal_alignment>
                 <vertical_alignment>1</vertical_alignment>
               </widget>
-              <widget type="action_button" version="3.0.0">
-                <name>RFFEDetails</name>
-                <actions>
-                  <action type="open_display">
-                    <file>../bpmrffeioc/top.bob</file>
-                    <target>window</target>
-                    <description>Open RFFE Launcher</description>
-                  </action>
-                </actions>
-                <text>Details</text>
-                <x>20</x>
-                <y>30</y>
-                <width>70</width>
-                <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
-              </widget>
+            </widget>
+            <widget type="group" version="2.0.0">
+              <name>IPMI</name>
+              <x>1480</x>
+              <width>90</width>
+              <height>430</height>
+              <style>3</style>
+              <transparent>true</transparent>
               <widget type="rectangle" version="2.0.0">
-                <name>RFFEBackground</name>
-                <width>110</width>
+                <name>IPMIBackground</name>
+                <width>90</width>
                 <height>430</height>
                 <line_width>0</line_width>
                 <background_color>
@@ -5810,14 +5658,6 @@ if (action_ == 1):
                 <corner_width>5</corner_width>
                 <corner_height>5</corner_height>
               </widget>
-            </widget>
-            <widget type="group" version="2.0.0">
-              <name>IPMI</name>
-              <x>1480</x>
-              <width>90</width>
-              <height>430</height>
-              <style>3</style>
-              <transparent>true</transparent>
               <widget type="label" version="2.0.0">
                 <name>IPMIHeader</name>
                 <text>IPMI Manager</text>
@@ -5889,18 +5729,88 @@ if (action_ == 1):
                 <width>70</width>
                 <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
               </widget>
-              <widget type="rectangle" version="2.0.0">
-                <name>IPMIBackground</name>
-                <width>90</width>
-                <height>430</height>
-                <line_width>0</line_width>
-                <background_color>
-                  <color red="150" green="155" blue="151" alpha="90">
-                  </color>
-                </background_color>
-                <corner_width>5</corner_width>
-                <corner_height>5</corner_height>
-              </widget>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>AMC-110</name>
+              <macros>
+                <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
+                <BPM_TITLE>MBL-010 BPM 1/MBL-020 BPM 1</BPM_TITLE>
+                <CONTROL_GROUP>PBI-BPM04</CONTROL_GROUP>
+                <IOCNAME>PBI-BPM04:SC-IOC-101</IOCNAME>
+                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
+                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
+                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
+                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <R1_BPMMan>BPM01-</R1_BPMMan>
+                <R2_BPMMan>BPM02-</R2_BPMMan>
+                <RFFE_NAME>PBI-BPMFE-110</RFFE_NAME>
+                <RTM_NAME>Ctrl-RTM-110</RTM_NAME>
+                <S1_BPMMan>MBL-</S1_BPMMan>
+                <S2_BPMMan>MBL-</S2_BPMMan>
+                <SYSTEM1>MBL-010:PBI-BPM-001:</SYSTEM1>
+                <SYSTEM2>MBL-020:PBI-BPM-001:</SYSTEM2>
+                <SYSTEM_P>MBL-010</SYSTEM_P>
+              </macros>
+              <file>support/instance.opi</file>
+              <y>70</y>
+              <width>1740</width>
+              <height>80</height>
+              <resize>2</resize>
+              <transparent>true</transparent>
+              <actions>
+              </actions>
+              <border_color>
+                <color red="0" green="128" blue="255">
+                </color>
+              </border_color>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>AMC-120</name>
+              <macros>
+                <AMC_NAME>Ctrl-AMC-120</AMC_NAME>
+                <BPM_TITLE>MBL-030 BPM 1/MBL-040 BPM 1</BPM_TITLE>
+                <CONTROL_GROUP>PBI-BPM04</CONTROL_GROUP>
+                <IOCNAME>PBI-BPM04:SC-IOC-102</IOCNAME>
+                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
+                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
+                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
+                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <R1_BPMMan>BPM01-</R1_BPMMan>
+                <R2_BPMMan>BPM02-</R2_BPMMan>
+                <RFFE_NAME>PBI-BPMFE-120</RFFE_NAME>
+                <RTM_NAME>Ctrl-RTM-120</RTM_NAME>
+                <S1_BPMMan>MBL-</S1_BPMMan>
+                <S2_BPMMan>MBL-</S2_BPMMan>
+                <SYSTEM1>MBL-030:PBI-BPM-001:</SYSTEM1>
+                <SYSTEM2>MBL-040:PBI-BPM-001:</SYSTEM2>
+                <SYSTEM_P>MBL-030</SYSTEM_P>
+              </macros>
+              <file>support/instance.opi</file>
+              <y>160</y>
+              <width>1740</width>
+              <height>80</height>
+              <resize>2</resize>
+              <transparent>true</transparent>
+              <actions>
+              </actions>
+              <border_color>
+                <color red="0" green="128" blue="255">
+                </color>
+              </border_color>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>EVR-101</name>
+              <macros>
+                <EVR>PBI-BPM04:Ctrl-EVR-101</EVR>
+                <EVR_OPI>../../../99-Shared/mrfioc2_new/evr-mtca-300u.bob</EVR_OPI>
+                <P>PBI-BPM04:</P>
+                <R>Ctrl-EVR-101:</R>
+              </macros>
+              <file>support/evr-instance.bob</file>
+              <y>440</y>
+              <width>1010</width>
+              <height>65</height>
+              <resize>2</resize>
             </widget>
             <widget type="group" version="2.0.0">
               <name>Arrays</name>
@@ -6581,88 +6491,6 @@ if (action_ == 1):
             <height>520</height>
             <style>3</style>
             <transparent>true</transparent>
-            <widget type="embedded" version="2.0.0">
-              <name>AMC-110</name>
-              <macros>
-                <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
-                <BPM_TITLE>MBL-050 BPM 1/MBL-060 BPM 1</BPM_TITLE>
-                <CONTROL_GROUP>PBI-BPM05</CONTROL_GROUP>
-                <IOCNAME>PBI-BPM05:SC-IOC-101</IOCNAME>
-                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
-                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
-                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
-                <R1_BPMMan>BPM01-</R1_BPMMan>
-                <R2_BPMMan>BPM02-</R2_BPMMan>
-                <RFFE_NAME>PBI-BPMFE-110</RFFE_NAME>
-                <RTM_NAME>Ctrl-RTM-110</RTM_NAME>
-                <S1_BPMMan>MBL-</S1_BPMMan>
-                <S2_BPMMan>MBL-</S2_BPMMan>
-                <SYSTEM1>MBL-050:PBI-BPM-001:</SYSTEM1>
-                <SYSTEM2>MBL-060:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>MBL-050</SYSTEM_P>
-              </macros>
-              <file>support/instance.opi</file>
-              <y>70</y>
-              <width>1740</width>
-              <height>80</height>
-              <resize>2</resize>
-              <transparent>true</transparent>
-              <actions>
-              </actions>
-              <border_color>
-                <color red="0" green="128" blue="255">
-                </color>
-              </border_color>
-            </widget>
-            <widget type="embedded" version="2.0.0">
-              <name>AMC-120</name>
-              <macros>
-                <AMC_NAME>Ctrl-AMC-120</AMC_NAME>
-                <BPM_TITLE>MBL-070 BPM 1/MBL-080 BPM 1</BPM_TITLE>
-                <CONTROL_GROUP>PBI-BPM05</CONTROL_GROUP>
-                <IOCNAME>PBI-BPM05:SC-IOC-102</IOCNAME>
-                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
-                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
-                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
-                <R1_BPMMan>BPM01-</R1_BPMMan>
-                <R2_BPMMan>BPM02-</R2_BPMMan>
-                <RFFE_NAME>PBI-BPMFE-120</RFFE_NAME>
-                <RTM_NAME>Ctrl-RTM-120</RTM_NAME>
-                <S1_BPMMan>MBL-</S1_BPMMan>
-                <S2_BPMMan>MBL-</S2_BPMMan>
-                <SYSTEM1>MBL-070:PBI-BPM-001:</SYSTEM1>
-                <SYSTEM2>MBL-080:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>MBL-070</SYSTEM_P>
-              </macros>
-              <file>support/instance.opi</file>
-              <y>160</y>
-              <width>1740</width>
-              <height>80</height>
-              <resize>2</resize>
-              <transparent>true</transparent>
-              <actions>
-              </actions>
-              <border_color>
-                <color red="0" green="128" blue="255">
-                </color>
-              </border_color>
-            </widget>
-            <widget type="embedded" version="2.0.0">
-              <name>EVR-101</name>
-              <macros>
-                <EVR>PBI-BPM05:Ctrl-EVR-101</EVR>
-                <EVR_OPI>../../../99-Shared/mrfioc2_new/evr-mtca-300u.bob</EVR_OPI>
-                <P>PBI-BPM05:</P>
-                <R>Ctrl-EVR-101:</R>
-              </macros>
-              <file>support/evr-instance.bob</file>
-              <y>440</y>
-              <width>1010</width>
-              <height>65</height>
-              <resize>2</resize>
-            </widget>
             <widget type="group" version="2.0.0">
               <name>RFFE</name>
               <x>1610</x>
@@ -6670,6 +6498,18 @@ if (action_ == 1):
               <height>430</height>
               <style>3</style>
               <transparent>true</transparent>
+              <widget type="rectangle" version="2.0.0">
+                <name>RFFEBackground</name>
+                <width>110</width>
+                <height>430</height>
+                <line_width>0</line_width>
+                <background_color>
+                  <color red="150" green="155" blue="151" alpha="90">
+                  </color>
+                </background_color>
+                <corner_width>5</corner_width>
+                <corner_height>5</corner_height>
+              </widget>
               <widget type="label" version="2.0.0">
                 <name>RFFEHeader</name>
                 <text>RFFE</text>
@@ -6683,24 +6523,17 @@ if (action_ == 1):
                 <horizontal_alignment>1</horizontal_alignment>
                 <vertical_alignment>1</vertical_alignment>
               </widget>
-              <widget type="action_button" version="3.0.0">
-                <name>RFFEDetails</name>
-                <actions>
-                  <action type="open_display">
-                    <file>../bpmrffeioc/top.bob</file>
-                    <target>window</target>
-                    <description>Open RFFE Launcher</description>
-                  </action>
-                </actions>
-                <text>Details</text>
-                <x>20</x>
-                <y>30</y>
-                <width>70</width>
-                <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
-              </widget>
+            </widget>
+            <widget type="group" version="2.0.0">
+              <name>IPMI</name>
+              <x>1480</x>
+              <width>90</width>
+              <height>430</height>
+              <style>3</style>
+              <transparent>true</transparent>
               <widget type="rectangle" version="2.0.0">
-                <name>RFFEBackground</name>
-                <width>110</width>
+                <name>IPMIBackground</name>
+                <width>90</width>
                 <height>430</height>
                 <line_width>0</line_width>
                 <background_color>
@@ -6710,14 +6543,6 @@ if (action_ == 1):
                 <corner_width>5</corner_width>
                 <corner_height>5</corner_height>
               </widget>
-            </widget>
-            <widget type="group" version="2.0.0">
-              <name>IPMI</name>
-              <x>1480</x>
-              <width>90</width>
-              <height>430</height>
-              <style>3</style>
-              <transparent>true</transparent>
               <widget type="label" version="2.0.0">
                 <name>IPMIHeader</name>
                 <text>IPMI Manager</text>
@@ -6789,18 +6614,88 @@ if (action_ == 1):
                 <width>70</width>
                 <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
               </widget>
-              <widget type="rectangle" version="2.0.0">
-                <name>IPMIBackground</name>
-                <width>90</width>
-                <height>430</height>
-                <line_width>0</line_width>
-                <background_color>
-                  <color red="150" green="155" blue="151" alpha="90">
-                  </color>
-                </background_color>
-                <corner_width>5</corner_width>
-                <corner_height>5</corner_height>
-              </widget>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>AMC-110</name>
+              <macros>
+                <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
+                <BPM_TITLE>MBL-050 BPM 1/MBL-060 BPM 1</BPM_TITLE>
+                <CONTROL_GROUP>PBI-BPM05</CONTROL_GROUP>
+                <IOCNAME>PBI-BPM05:SC-IOC-101</IOCNAME>
+                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
+                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
+                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
+                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <R1_BPMMan>BPM01-</R1_BPMMan>
+                <R2_BPMMan>BPM02-</R2_BPMMan>
+                <RFFE_NAME>PBI-BPMFE-110</RFFE_NAME>
+                <RTM_NAME>Ctrl-RTM-110</RTM_NAME>
+                <S1_BPMMan>MBL-</S1_BPMMan>
+                <S2_BPMMan>MBL-</S2_BPMMan>
+                <SYSTEM1>MBL-050:PBI-BPM-001:</SYSTEM1>
+                <SYSTEM2>MBL-060:PBI-BPM-001:</SYSTEM2>
+                <SYSTEM_P>MBL-050</SYSTEM_P>
+              </macros>
+              <file>support/instance.opi</file>
+              <y>70</y>
+              <width>1740</width>
+              <height>80</height>
+              <resize>2</resize>
+              <transparent>true</transparent>
+              <actions>
+              </actions>
+              <border_color>
+                <color red="0" green="128" blue="255">
+                </color>
+              </border_color>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>AMC-120</name>
+              <macros>
+                <AMC_NAME>Ctrl-AMC-120</AMC_NAME>
+                <BPM_TITLE>MBL-070 BPM 1/MBL-080 BPM 1</BPM_TITLE>
+                <CONTROL_GROUP>PBI-BPM05</CONTROL_GROUP>
+                <IOCNAME>PBI-BPM05:SC-IOC-102</IOCNAME>
+                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
+                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
+                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
+                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <R1_BPMMan>BPM01-</R1_BPMMan>
+                <R2_BPMMan>BPM02-</R2_BPMMan>
+                <RFFE_NAME>PBI-BPMFE-120</RFFE_NAME>
+                <RTM_NAME>Ctrl-RTM-120</RTM_NAME>
+                <S1_BPMMan>MBL-</S1_BPMMan>
+                <S2_BPMMan>MBL-</S2_BPMMan>
+                <SYSTEM1>MBL-070:PBI-BPM-001:</SYSTEM1>
+                <SYSTEM2>MBL-080:PBI-BPM-001:</SYSTEM2>
+                <SYSTEM_P>MBL-070</SYSTEM_P>
+              </macros>
+              <file>support/instance.opi</file>
+              <y>160</y>
+              <width>1740</width>
+              <height>80</height>
+              <resize>2</resize>
+              <transparent>true</transparent>
+              <actions>
+              </actions>
+              <border_color>
+                <color red="0" green="128" blue="255">
+                </color>
+              </border_color>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>EVR-101</name>
+              <macros>
+                <EVR>PBI-BPM05:Ctrl-EVR-101</EVR>
+                <EVR_OPI>../../../99-Shared/mrfioc2_new/evr-mtca-300u.bob</EVR_OPI>
+                <P>PBI-BPM05:</P>
+                <R>Ctrl-EVR-101:</R>
+              </macros>
+              <file>support/evr-instance.bob</file>
+              <y>440</y>
+              <width>1010</width>
+              <height>65</height>
+              <resize>2</resize>
             </widget>
             <widget type="group" version="2.0.0">
               <name>Arrays</name>
@@ -7481,88 +7376,6 @@ if (action_ == 1):
             <height>520</height>
             <style>3</style>
             <transparent>true</transparent>
-            <widget type="embedded" version="2.0.0">
-              <name>AMC-110</name>
-              <macros>
-                <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
-                <BPM_TITLE>MBL-090 BPM 1/HBL-010 BPM 1</BPM_TITLE>
-                <CONTROL_GROUP>PBI-BPM06</CONTROL_GROUP>
-                <IOCNAME>PBI-BPM06:SC-IOC-101</IOCNAME>
-                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
-                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
-                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
-                <R1_BPMMan>BPM01-</R1_BPMMan>
-                <R2_BPMMan>BPM02-</R2_BPMMan>
-                <RFFE_NAME>PBI-BPMFE-110</RFFE_NAME>
-                <RTM_NAME>Ctrl-RTM-110</RTM_NAME>
-                <S1_BPMMan>MBL-</S1_BPMMan>
-                <S2_BPMMan>HBL-</S2_BPMMan>
-                <SYSTEM1>MBL-090LWU:PBI-BPM-001:</SYSTEM1>
-                <SYSTEM2>HBL-010LWU:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>MBL-090</SYSTEM_P>
-              </macros>
-              <file>support/instance.opi</file>
-              <y>70</y>
-              <width>1740</width>
-              <height>80</height>
-              <resize>2</resize>
-              <transparent>true</transparent>
-              <actions>
-              </actions>
-              <border_color>
-                <color red="0" green="128" blue="255">
-                </color>
-              </border_color>
-            </widget>
-            <widget type="embedded" version="2.0.0">
-              <name>AMC-120</name>
-              <macros>
-                <AMC_NAME>Ctrl-AMC-120</AMC_NAME>
-                <BPM_TITLE>HBL-020 BPM 1/HBL-030 BPM 1</BPM_TITLE>
-                <CONTROL_GROUP>PBI-BPM06</CONTROL_GROUP>
-                <IOCNAME>PBI-BPM06:SC-IOC-102</IOCNAME>
-                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
-                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
-                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
-                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
-                <R1_BPMMan>BPM01-</R1_BPMMan>
-                <R2_BPMMan>BPM02-</R2_BPMMan>
-                <RFFE_NAME>PBI-BPMFE-120</RFFE_NAME>
-                <RTM_NAME>Ctrl-RTM-120</RTM_NAME>
-                <S1_BPMMan>MBL-</S1_BPMMan>
-                <S2_BPMMan>MBL-</S2_BPMMan>
-                <SYSTEM1>HBL-020LWU:PBI-BPM-001:</SYSTEM1>
-                <SYSTEM2>HBL-030LWU:PBI-BPM-001:</SYSTEM2>
-                <SYSTEM_P>HBL-020</SYSTEM_P>
-              </macros>
-              <file>support/instance.opi</file>
-              <y>160</y>
-              <width>1740</width>
-              <height>80</height>
-              <resize>2</resize>
-              <transparent>true</transparent>
-              <actions>
-              </actions>
-              <border_color>
-                <color red="0" green="128" blue="255">
-                </color>
-              </border_color>
-            </widget>
-            <widget type="embedded" version="2.0.0">
-              <name>EVR-101</name>
-              <macros>
-                <EVR>PBI-BPM06:Ctrl-EVR-101</EVR>
-                <EVR_OPI>../../../99-Shared/mrfioc2_new/evr-mtca-300u.bob</EVR_OPI>
-                <P>PBI-BPM06:</P>
-                <R>Ctrl-EVR-101:</R>
-              </macros>
-              <file>support/evr-instance.bob</file>
-              <y>440</y>
-              <width>1010</width>
-              <height>65</height>
-              <resize>2</resize>
-            </widget>
             <widget type="group" version="2.0.0">
               <name>RFFE</name>
               <x>1610</x>
@@ -7570,6 +7383,18 @@ if (action_ == 1):
               <height>430</height>
               <style>3</style>
               <transparent>true</transparent>
+              <widget type="rectangle" version="2.0.0">
+                <name>RFFEBackground</name>
+                <width>110</width>
+                <height>430</height>
+                <line_width>0</line_width>
+                <background_color>
+                  <color red="150" green="155" blue="151" alpha="90">
+                  </color>
+                </background_color>
+                <corner_width>5</corner_width>
+                <corner_height>5</corner_height>
+              </widget>
               <widget type="label" version="2.0.0">
                 <name>RFFEHeader</name>
                 <text>RFFE</text>
@@ -7583,24 +7408,17 @@ if (action_ == 1):
                 <horizontal_alignment>1</horizontal_alignment>
                 <vertical_alignment>1</vertical_alignment>
               </widget>
-              <widget type="action_button" version="3.0.0">
-                <name>RFFEDetails</name>
-                <actions>
-                  <action type="open_display">
-                    <file>../bpmrffeioc/top.bob</file>
-                    <target>window</target>
-                    <description>Open RFFE Launcher</description>
-                  </action>
-                </actions>
-                <text>Details</text>
-                <x>20</x>
-                <y>30</y>
-                <width>70</width>
-                <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
-              </widget>
+            </widget>
+            <widget type="group" version="2.0.0">
+              <name>IPMI</name>
+              <x>1480</x>
+              <width>90</width>
+              <height>430</height>
+              <style>3</style>
+              <transparent>true</transparent>
               <widget type="rectangle" version="2.0.0">
-                <name>RFFEBackground</name>
-                <width>110</width>
+                <name>IPMIBackground</name>
+                <width>90</width>
                 <height>430</height>
                 <line_width>0</line_width>
                 <background_color>
@@ -7610,14 +7428,6 @@ if (action_ == 1):
                 <corner_width>5</corner_width>
                 <corner_height>5</corner_height>
               </widget>
-            </widget>
-            <widget type="group" version="2.0.0">
-              <name>IPMI</name>
-              <x>1480</x>
-              <width>90</width>
-              <height>430</height>
-              <style>3</style>
-              <transparent>true</transparent>
               <widget type="label" version="2.0.0">
                 <name>IPMIHeader</name>
                 <text>IPMI Manager</text>
@@ -7689,18 +7499,88 @@ if (action_ == 1):
                 <width>70</width>
                 <tooltip>Get to know more about modules in crate and their sensors.</tooltip>
               </widget>
-              <widget type="rectangle" version="2.0.0">
-                <name>IPMIBackground</name>
-                <width>90</width>
-                <height>430</height>
-                <line_width>0</line_width>
-                <background_color>
-                  <color red="150" green="155" blue="151" alpha="90">
-                  </color>
-                </background_color>
-                <corner_width>5</corner_width>
-                <corner_height>5</corner_height>
-              </widget>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>AMC-110</name>
+              <macros>
+                <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
+                <BPM_TITLE>MBL-090 BPM 1/HBL-010 BPM 1</BPM_TITLE>
+                <CONTROL_GROUP>PBI-BPM06</CONTROL_GROUP>
+                <IOCNAME>PBI-BPM06:SC-IOC-101</IOCNAME>
+                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
+                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
+                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
+                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <R1_BPMMan>BPM01-</R1_BPMMan>
+                <R2_BPMMan>BPM02-</R2_BPMMan>
+                <RFFE_NAME>PBI-BPMFE-110</RFFE_NAME>
+                <RTM_NAME>Ctrl-RTM-110</RTM_NAME>
+                <S1_BPMMan>MBL-</S1_BPMMan>
+                <S2_BPMMan>HBL-</S2_BPMMan>
+                <SYSTEM1>MBL-090LWU:PBI-BPM-001:</SYSTEM1>
+                <SYSTEM2>HBL-010LWU:PBI-BPM-001:</SYSTEM2>
+                <SYSTEM_P>MBL-090</SYSTEM_P>
+              </macros>
+              <file>support/instance.opi</file>
+              <y>70</y>
+              <width>1740</width>
+              <height>80</height>
+              <resize>2</resize>
+              <transparent>true</transparent>
+              <actions>
+              </actions>
+              <border_color>
+                <color red="0" green="128" blue="255">
+                </color>
+              </border_color>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>AMC-120</name>
+              <macros>
+                <AMC_NAME>Ctrl-AMC-120</AMC_NAME>
+                <BPM_TITLE>HBL-020 BPM 1/HBL-030 BPM 1</BPM_TITLE>
+                <CONTROL_GROUP>PBI-BPM06</CONTROL_GROUP>
+                <IOCNAME>PBI-BPM06:SC-IOC-102</IOCNAME>
+                <P1_BPMMan>PBI-BPM::</P1_BPMMan>
+                <P2_BPMMan>PBI-BPM::</P2_BPMMan>
+                <PAIR1_BPMMan>BPM01-02</PAIR1_BPMMan>
+                <PAIR2_BPMMan>BPM01-02</PAIR2_BPMMan>
+                <R1_BPMMan>BPM01-</R1_BPMMan>
+                <R2_BPMMan>BPM02-</R2_BPMMan>
+                <RFFE_NAME>PBI-BPMFE-120</RFFE_NAME>
+                <RTM_NAME>Ctrl-RTM-120</RTM_NAME>
+                <S1_BPMMan>MBL-</S1_BPMMan>
+                <S2_BPMMan>MBL-</S2_BPMMan>
+                <SYSTEM1>HBL-020LWU:PBI-BPM-001:</SYSTEM1>
+                <SYSTEM2>HBL-030LWU:PBI-BPM-001:</SYSTEM2>
+                <SYSTEM_P>HBL-020</SYSTEM_P>
+              </macros>
+              <file>support/instance.opi</file>
+              <y>160</y>
+              <width>1740</width>
+              <height>80</height>
+              <resize>2</resize>
+              <transparent>true</transparent>
+              <actions>
+              </actions>
+              <border_color>
+                <color red="0" green="128" blue="255">
+                </color>
+              </border_color>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>EVR-101</name>
+              <macros>
+                <EVR>PBI-BPM06:Ctrl-EVR-101</EVR>
+                <EVR_OPI>../../../99-Shared/mrfioc2_new/evr-mtca-300u.bob</EVR_OPI>
+                <P>PBI-BPM06:</P>
+                <R>Ctrl-EVR-101:</R>
+              </macros>
+              <file>support/evr-instance.bob</file>
+              <y>440</y>
+              <width>1010</width>
+              <height>65</height>
+              <resize>2</resize>
             </widget>
             <widget type="group" version="2.0.0">
               <name>Arrays</name>