diff --git a/xxxApp/op/opi/xxx.opi b/xxxApp/op/opi/xxx.opi
index d1136b2dc619efaa4fcb7a01a625362afc70f354..428ba39c47ff02dee0960f375b5c29e2a3f9decd 100644
--- a/xxxApp/op/opi/xxx.opi
+++ b/xxxApp/op/opi/xxx.opi
@@ -6,8 +6,8 @@
     <PV_PREFIX>xxx:</PV_PREFIX>
     <P>$(PV_PREFIX)</P>
   </macros>
-  <wuid>-7f9f9a2c:1396f15eefb:-8000</wuid>
-  <boy_version>3.1.2.20120828</boy_version>
+  <wuid>-35547c25:13a0384ab1a:-2fd7</wuid>
+  <boy_version>3.1.2.20120830</boy_version>
   <scripts />
   <show_ruler>true</show_ruler>
   <height>160</height>
@@ -15,14 +15,14 @@
   <snap_to_geometry>false</snap_to_geometry>
   <show_grid>false</show_grid>
   <background_color>
-    <color name="MEDM_COLOR_1" red="236" green="236" blue="236" />
+    <color name="Gray_1" red="236" green="236" blue="236" />
   </background_color>
   <foreground_color>
     <color name="MEDM_COLOR_64" red="26" green="115" blue="9" />
   </foreground_color>
   <widget_type>Display</widget_type>
   <show_close_button>true</show_close_button>
-  <width>470</width>
+  <width>440</width>
   <rules />
   <show_edit_range>true</show_edit_range>
   <grid_space>10</grid_space>
@@ -34,11 +34,204 @@
   <actions hook="false" hook_all="false" />
   <y>26</y>
   <x>1134</x>
+  <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0">
+    <macros>
+      <include_parent_macros>true</include_parent_macros>
+    </macros>
+    <visible>true</visible>
+    <wuid>-35547c25:13a0384ab1a:-2fbf</wuid>
+    <scripts />
+    <height>27</height>
+    <name>Grouping Container</name>
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <transparent>true</transparent>
+    <show_scrollbar>false</show_scrollbar>
+    <background_color>
+      <color red="236" green="236" blue="236" />
+    </background_color>
+    <foreground_color>
+      <color red="26" green="115" blue="9" />
+    </foreground_color>
+    <widget_type>Grouping Container</widget_type>
+    <enabled>true</enabled>
+    <font>
+      <opifont.name fontName="Sans" height="10" style="0">Default</opifont.name>
+    </font>
+    <width>82</width>
+    <border_style>0</border_style>
+    <rules />
+    <lock_children>false</lock_children>
+    <border_width>1</border_width>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <actions hook="false" hook_all="false" />
+    <y>78</y>
+    <tooltip></tooltip>
+    <x>350</x>
+    <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0">
+      <visible>true</visible>
+      <vertical_alignment>1</vertical_alignment>
+      <wuid>-35547c25:13a0384ab1a:-2fbe</wuid>
+      <auto_size>false</auto_size>
+      <scripts />
+      <height>25</height>
+      <name>Label</name>
+      <scale_options>
+        <width_scalable>true</width_scalable>
+        <height_scalable>true</height_scalable>
+        <keep_wh_ratio>false</keep_wh_ratio>
+      </scale_options>
+      <transparent>true</transparent>
+      <show_scrollbar>false</show_scrollbar>
+      <background_color>
+        <color red="255" green="255" blue="255" />
+      </background_color>
+      <foreground_color>
+        <color name="ioc_read_fg" red="10" green="0" blue="184" />
+      </foreground_color>
+      <widget_type>Label</widget_type>
+      <enabled>true</enabled>
+      <text>Moving</text>
+      <font>
+        <fontdata fontName="Sans" height="15" style="0" />
+      </font>
+      <width>80</width>
+      <border_style>0</border_style>
+      <rules>
+        <rule name="Visibility" prop_id="visible" out_exp="false">
+          <exp bool_exp="pv0==0">
+            <value>true</value>
+          </exp>
+          <exp bool_exp="!(pv0==0)">
+            <value>false</value>
+          </exp>
+          <pv trig="true">xxx:alldone.VAL</pv>
+        </rule>
+      </rules>
+      <border_width>1</border_width>
+      <border_color>
+        <color red="0" green="128" blue="255" />
+      </border_color>
+      <horizontal_alignment>0</horizontal_alignment>
+      <actions hook="false" hook_all="false" />
+      <y>1</y>
+      <wrap_words>true</wrap_words>
+      <tooltip></tooltip>
+      <x>1</x>
+    </widget>
+    <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0">
+      <visible>true</visible>
+      <vertical_alignment>1</vertical_alignment>
+      <wuid>-35547c25:13a0384ab1a:-2fbd</wuid>
+      <auto_size>false</auto_size>
+      <scripts />
+      <height>25</height>
+      <name>Label</name>
+      <scale_options>
+        <width_scalable>true</width_scalable>
+        <height_scalable>true</height_scalable>
+        <keep_wh_ratio>false</keep_wh_ratio>
+      </scale_options>
+      <transparent>true</transparent>
+      <show_scrollbar>false</show_scrollbar>
+      <background_color>
+        <color red="255" green="255" blue="255" />
+      </background_color>
+      <foreground_color>
+        <color name="ioc_read_fg" red="10" green="0" blue="184" />
+      </foreground_color>
+      <widget_type>Label</widget_type>
+      <enabled>true</enabled>
+      <text>Moving</text>
+      <font>
+        <fontdata fontName="Sans" height="15" style="0" />
+      </font>
+      <width>80</width>
+      <border_style>0</border_style>
+      <rules>
+        <rule name="Visibility" prop_id="visible" out_exp="false">
+          <exp bool_exp="pv0!=0">
+            <value>true</value>
+          </exp>
+          <exp bool_exp="!(pv0!=0)">
+            <value>false</value>
+          </exp>
+          <pv trig="true">xxx:alldoneBlink.VAL</pv>
+        </rule>
+      </rules>
+      <border_width>1</border_width>
+      <border_color>
+        <color red="0" green="128" blue="255" />
+      </border_color>
+      <horizontal_alignment>0</horizontal_alignment>
+      <actions hook="false" hook_all="false" />
+      <y>2</y>
+      <wrap_words>true</wrap_words>
+      <tooltip></tooltip>
+      <x>2</x>
+    </widget>
+    <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0">
+      <visible>true</visible>
+      <vertical_alignment>1</vertical_alignment>
+      <wuid>-35547c25:13a0384ab1a:-2fbc</wuid>
+      <auto_size>false</auto_size>
+      <scripts />
+      <height>25</height>
+      <name>Label</name>
+      <scale_options>
+        <width_scalable>true</width_scalable>
+        <height_scalable>true</height_scalable>
+        <keep_wh_ratio>false</keep_wh_ratio>
+      </scale_options>
+      <transparent>true</transparent>
+      <show_scrollbar>false</show_scrollbar>
+      <background_color>
+        <color red="255" green="255" blue="255" />
+      </background_color>
+      <foreground_color>
+        <color name="MEDM_COLOR_50" red="153" green="255" blue="255" />
+      </foreground_color>
+      <widget_type>Label</widget_type>
+      <enabled>true</enabled>
+      <text>Moving</text>
+      <font>
+        <fontdata fontName="Sans" height="15" style="0" />
+      </font>
+      <width>80</width>
+      <border_style>0</border_style>
+      <rules>
+        <rule name="Visibility" prop_id="visible" out_exp="false">
+          <exp bool_exp="pv0==0">
+            <value>true</value>
+          </exp>
+          <exp bool_exp="!(pv0==0)">
+            <value>false</value>
+          </exp>
+          <pv trig="true">xxx:alldone.VAL</pv>
+        </rule>
+      </rules>
+      <border_width>1</border_width>
+      <border_color>
+        <color red="0" green="128" blue="255" />
+      </border_color>
+      <horizontal_alignment>0</horizontal_alignment>
+      <actions hook="false" hook_all="false" />
+      <y>0</y>
+      <wrap_words>true</wrap_words>
+      <tooltip></tooltip>
+      <x>0</x>
+    </widget>
+  </widget>
   <widget typeId="org.csstudio.opibuilder.widgets.MenuButton" version="1.0">
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fff</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fd6</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -54,7 +247,7 @@
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -73,42 +266,45 @@
     </border_color>
     <y>20</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>table.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>Table1</Q>
           <T>table1</T>
-          <M0X>m9</M0X>
-          <M0Y>m10</M0Y>
-          <M1Y>m11</M1Y>
-          <M2X>m12</M2X>
-          <M2Y>m13</M2Y>
-          <M2Z>m14</M2Z>
-        </macros>
-        <Position>1</Position>
+          <M0X>m1</M0X>
+          <M0Y>m2</M0Y>
+          <M1Y>m3</M1Y>
+          <M2X>m4</M2X>
+          <M2Y>m5</M2Y>
+          <M2Z>m6</M2Z>
+        </macros>
+        <replace>0</replace>
         <description>Table1 (S)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>table_full.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>Table1</Q>
           <T>table1</T>
-          <M0X>m9</M0X>
-          <M0Y>m10</M0Y>
-          <M1Y>m11</M1Y>
-          <M2X>m12</M2X>
-          <M2Y>m13</M2Y>
-          <M2Z>m14</M2Z>
-        </macros>
-        <Position>1</Position>
+          <M0X>m1</M0X>
+          <M0Y>m2</M0Y>
+          <M1Y>m3</M1Y>
+          <M2X>m4</M2X>
+          <M2Y>m5</M2Y>
+          <M2Z>m6</M2Z>
+        </macros>
+        <replace>0</replace>
         <description>Table1 (L)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>table.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>Table2</Q>
           <T>table2</T>
           <M0X>m1</M0X>
@@ -118,13 +314,14 @@
           <M2Y>m5</M2Y>
           <M2Z>junk</M2Z>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Table2 (S) (no Z)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>table_full.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>Table2</Q>
           <T>table2</T>
           <M0X>m1</M0X>
@@ -134,13 +331,14 @@
           <M2Y>m5</M2Y>
           <M2Z>junk</M2Z>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Table2 (L) (no Z)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>table.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>Table3</Q>
           <T>table3</T>
           <M0X>junk</M0X>
@@ -150,13 +348,14 @@
           <M2Y>m5</M2Y>
           <M2Z>m6</M2Z>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Table3 (S) (no X)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>table_full.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>Table3</Q>
           <T>table3</T>
           <M0X>junk</M0X>
@@ -166,13 +365,14 @@
           <M2Y>m5</M2Y>
           <M2Z>m6</M2Z>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Table3 (L) (no X)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>table.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>Table4</Q>
           <T>table4</T>
           <M0X>junk</M0X>
@@ -182,13 +382,14 @@
           <M2Y>m5</M2Y>
           <M2Z>junk</M2Z>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Table4 (S) (no X or Z)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>table_full.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>Table4</Q>
           <T>table4</T>
           <M0X>junk</M0X>
@@ -198,9 +399,21 @@
           <M2Y>m5</M2Y>
           <M2Z>junk</M2Z>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Table4 (L) (no X or Z)</description>
       </action>
+      <action type="OPEN_DISPLAY">
+        <path>ASRPmirrorTable.opi</path>
+        <macros>
+          <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
+          <TBL>mt1</TBL>
+          <VERT>xxx:m7</VERT>
+          <PITCH>xxx:m8</PITCH>
+        </macros>
+        <replace>0</replace>
+        <description>ASRP mirror table</description>
+      </action>
     </actions>
     <tooltip>$(pv_name)
 $(pv_value)</tooltip>
@@ -210,7 +423,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7ffe</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fd5</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -226,7 +439,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -245,10 +458,11 @@ $(pv_value)</tooltip>
     </border_color>
     <y>0</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>topMotors8.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <M1>m1</M1>
           <M2>m2</M2>
           <M3>m3</M3>
@@ -258,13 +472,14 @@ $(pv_value)</tooltip>
           <M7>m7</M7>
           <M8>m8</M8>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>1-8</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>topMotors8.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <M1>m9</M1>
           <M2>m10</M2>
           <M3>m11</M3>
@@ -274,13 +489,14 @@ $(pv_value)</tooltip>
           <M7>m15</M7>
           <M8>m16</M8>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>9-16</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>topMotors8.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <M1>m17</M1>
           <M2>m18</M2>
           <M3>m19</M3>
@@ -290,13 +506,14 @@ $(pv_value)</tooltip>
           <M7>m23</M7>
           <M8>m24</M8>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>17-24</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>topMotors8.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <M1>m25</M1>
           <M2>m26</M2>
           <M3>m27</M3>
@@ -306,13 +523,14 @@ $(pv_value)</tooltip>
           <M7>m31</M7>
           <M8>m32</M8>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>25-32</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>topMotors8.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <M1>m33</M1>
           <M2>m34</M2>
           <M3>m35</M3>
@@ -322,13 +540,14 @@ $(pv_value)</tooltip>
           <M7>m39</M7>
           <M8>m40</M8>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>33-40</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>topMotors8.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <M1>m41</M1>
           <M2>m42</M2>
           <M3>m43</M3>
@@ -338,13 +557,14 @@ $(pv_value)</tooltip>
           <M7>m47</M7>
           <M8>m48</M8>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>41-48</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>softMotors10.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <SM1>SM1</SM1>
           <SM2>SM2</SM2>
           <SM3>SM3</SM3>
@@ -356,27 +576,29 @@ $(pv_value)</tooltip>
           <SM9>SM9</SM9>
           <SM10>SM10</SM10>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>soft motors 1-10</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>topMotors4.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <M1>pm1</M1>
           <M2>pm2</M2>
           <M3>pm3</M3>
           <M4>pm4</M4>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Pseudo-motors</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>motorStatus16.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>motor status 16</description>
       </action>
     </actions>
@@ -388,7 +610,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7ffd</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fd4</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -404,7 +626,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -423,10 +645,11 @@ $(pv_value)</tooltip>
     </border_color>
     <y>60</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>kohzuGraphic.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <mTH>m9</mTH>
           <mY1>m10</mY1>
           <mZ2>m11</mZ2>
@@ -442,13 +665,14 @@ $(pv_value)</tooltip>
           <QTh>BraggTheta</QTh>
           <PVTh>BraggThetaAO</PVTh>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Kohzu Graphic (GEOM 1)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>kohzu2Graphic.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <mTH>m9</mTH>
           <mY2>m10</mY2>
           <mZ2>m11</mZ2>
@@ -464,61 +688,67 @@ $(pv_value)</tooltip>
           <QTh>BraggTheta</QTh>
           <PVTh>BraggThetaAO</PVTh>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Kohzu Graphic (GEOM 2)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>kohzuSeqCtl_tiny.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>KohzuSeq (tiny)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>kohzuSeqCtl.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>KohzuSeq</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>kohzuSeqCtl_All.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>KohzuSeq (All)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scanParms.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>BraggE</Q>
           <PV>BraggEAO</PV>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Energy-scan parameters</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scanParms.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>BraggTheta</Q>
           <PV>BraggThetaAO</PV>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Theta-scan parameters</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scanParms.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>BraggLambda</Q>
           <PV>BraggLambdaAO</PV>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Wavelength-scan parameters</description>
       </action>
     </actions>
@@ -530,7 +760,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7ffc</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fd3</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -546,7 +776,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -565,83 +795,91 @@ $(pv_value)</tooltip>
     </border_color>
     <y>0</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scan.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>1</N>
           <S>scan1</S>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Scan1 (for all scans)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scan.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>2</N>
           <S>scan2</S>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Scan2 (for 2D &amp; higher scans)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scan.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>3</N>
           <S>scan3</S>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Scan3 (for 3D &amp; higher scans)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scan.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>4</N>
           <S>scan4</S>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Scan4 (for 4D scans)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scan.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>H</N>
           <S>scanH</S>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>ScanH (for Hardware-assisted scans)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scanParms2Pos.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>m7_8</Q>
-          <SCAN>$(PV_PREFIX)scan1</SCAN>
-          <PV1>$(PV_PREFIX)m7</PV1>
-          <PV2>$(PV_PREFIX)m8</PV2>
+          <SCAN>xxx:scan1</SCAN>
+          <PV1>xxx:m7</PV1>
+          <PV2>xxx:m8</PV2>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>test scanParms2Pos</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scan_saveData.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>saveData controls</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scanAux.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <S>scantest</S>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>aux scan</description>
       </action>
     </actions>
@@ -653,7 +891,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7ffb</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fd2</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -669,7 +907,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -688,67 +926,74 @@ $(pv_value)</tooltip>
     </border_color>
     <y>100</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scaler16m.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <S>scaler1</S>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Scaler 1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scaler.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <S>scaler2</S>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Scaler 2</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scaler.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <S>scaler3</S>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Scaler 3</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scaler16.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <S>scaler1</S>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Scaler1 (16 ch)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scaler32.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <S>scaler1</S>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Scaler1 (32 ch)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scaler64.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <S>scaler1</S>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Scaler1 (64 ch)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scaler16m.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <S>scaler1</S>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Scaler 1 modCalc</description>
       </action>
     </actions>
@@ -760,7 +1005,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7ffa</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fd1</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -776,7 +1021,7 @@ $(pv_value)</tooltip>
       <color name="callup_bg" red="40" green="147" blue="21" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -795,22 +1040,24 @@ $(pv_value)</tooltip>
     </border_color>
     <y>100</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>Keithley2kDMM_mf.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Dmm>D1</Dmm>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Keithley 2000 DMM #1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>Keithley2kDMM_mf.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Dmm>D2</Dmm>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Keithley 2000 DMM #2</description>
       </action>
     </actions>
@@ -822,7 +1069,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7ff9</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fd0</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -838,7 +1085,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -857,22 +1104,24 @@ $(pv_value)</tooltip>
     </border_color>
     <y>120</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>HPLaserAxis.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>HPLaser1</Q>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>HP Laser Axis 1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>HPLaserAxis.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>HPLaser2</Q>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>HP Laser Axis 2</description>
       </action>
     </actions>
@@ -884,7 +1133,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7ff8</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fcf</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -900,7 +1149,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -919,28 +1168,30 @@ $(pv_value)</tooltip>
     </border_color>
     <y>100</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>SGM_tiny.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>1</N>
           <M_x>m7</M_x>
           <M_rIn>m6</M_rIn>
           <M_rOut>m8</M_rOut>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Spherical Grating Monochromator (tiny)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>SGM.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>1</N>
           <M_x>m7</M_x>
           <M_rIn>m6</M_rIn>
           <M_rOut>m8</M_rOut>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Spherical Grating Monochromator</description>
       </action>
     </actions>
@@ -952,7 +1203,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7ff7</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fce</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -968,7 +1219,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -987,15 +1238,16 @@ $(pv_value)</tooltip>
     </border_color>
     <y>40</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>2postMirror.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>M1</Q>
-          <mDn>m11</mDn>
-          <mUp>m12</mUp>
+          <mDn>m1</mDn>
+          <mUp>m2</mUp>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>2-post Mirror</description>
       </action>
     </actions>
@@ -1007,7 +1259,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7ff6</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fcd</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -1023,7 +1275,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -1042,31 +1294,34 @@ $(pv_value)</tooltip>
     </border_color>
     <y>80</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>hr_nested.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>1</N>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>High resolution monochromator (nested)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>hr_symmetric.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>1</N>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>High resolution monochromator (symmetric)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>hrSeqCtl_All.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>1</N>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>High resolution monochromator control</description>
       </action>
     </actions>
@@ -1078,7 +1333,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7ff5</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fcc</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -1094,7 +1349,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -1113,20 +1368,31 @@ $(pv_value)</tooltip>
     </border_color>
     <y>60</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
-        <path>ioc_stats.opi</path>
+      <action type="OPEN_DISPLAY">
+        <path>ioc_stats_soft.opi</path>
+        <macros>
+          <include_parent_macros>true</include_parent_macros>
+          <ioc>xxx</ioc>
+        </macros>
+        <replace>0</replace>
+        <description>IOC Status soft ioc</description>
+      </action>
+      <action type="OPEN_DISPLAY">
+        <path>ioc_stats_vxworks.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <ioc>xxx</ioc>
         </macros>
-        <Position>1</Position>
-        <description>IOC Status</description>
+        <replace>0</replace>
+        <description>IOC Status vxworks ioc</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>save_restoreStatus.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>save_restore Status</description>
       </action>
     </actions>
@@ -1138,7 +1404,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7ff4</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fcb</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -1154,7 +1420,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -1173,103 +1439,113 @@ $(pv_value)</tooltip>
     </border_color>
     <y>40</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>recVme.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>vme1</Q>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>generic VME</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>CAMAC_IO.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <REC>$(PV_PREFIX)camac1</REC>
+          <REC>xxx:camac1</REC>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>generic CAMAC</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>asynOctet.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <R>gpib1</R>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>asyn GPIB</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>deviceCmdReply.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>1</N>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>deviceCmdReply 1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>deviceCmdReply.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>2</N>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>deviceCmdReply 2</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>deviceCmdReply.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>3</N>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>deviceCmdReply 3</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>deviceCmdReply.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>4</N>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>deviceCmdReply 4</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>deviceCmdReply.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>5</N>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>deviceCmdReply 5</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>deviceCmdReply.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>6</N>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>deviceCmdReply 6</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>deviceCmdReply.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>7</N>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>deviceCmdReply 7</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>deviceCmdReply.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>8</N>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>deviceCmdReply 8</description>
       </action>
     </actions>
@@ -1281,7 +1557,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7ff3</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fca</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -1297,7 +1573,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -1316,74 +1592,76 @@ $(pv_value)</tooltip>
     </border_color>
     <y>20</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>xx_BM_BPM.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <xx>01</xx>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>1 BM BPM info</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>xx_ID_BPM.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <xx>01</xx>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>1 ID BPM info</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>UndulatorCtl.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <xx>01</xx>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>1 ID basic control</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>UndulatorSyncCtl.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <xx>01</xx>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>1 ID sync-scan control</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>xxIDCtrl.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <xx>01</xx>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>new ID control</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>xxIDCtrl.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <xx>01us</xx>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>new ID control (us)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>beamHistory.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>24 hr. Beam History</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>beamHistory_full.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>24 hr. beam history, etc.</description>
       </action>
     </actions>
@@ -1395,7 +1673,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7ff2</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fc9</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -1411,7 +1689,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -1430,28 +1708,30 @@ $(pv_value)</tooltip>
     </border_color>
     <y>0</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>2filter.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q1>fltr1:</Q1>
           <Q2>fltr2:</Q2>
           <LOCK1>fltr_1_2:</LOCK1>
           <LOCK2>fltr_1_2:</LOCK2>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>User Filter</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>2filter_setup.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q1>fltr1:</Q1>
           <Q2>fltr2:</Q2>
           <LOCK1>fltr_1_2:</LOCK1>
           <LOCK2>fltr_1_2:</LOCK2>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>User Filter Setup</description>
       </action>
     </actions>
@@ -1463,7 +1743,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7ff1</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fc8</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -1479,7 +1759,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -1498,30 +1778,30 @@ $(pv_value)</tooltip>
     </border_color>
     <y>40</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>BunchClkGen.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <UNIT>$(PV_PREFIX)BnchClkGen</UNIT>
+          <UNIT>xxx:BnchClkGen</UNIT>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Bunch Clock Generator</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>BunchClkGenA.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <UNIT>$(PV_PREFIX)BnchClkGen</UNIT>
+          <UNIT>xxx:BnchClkGen</UNIT>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Bunch Clock display A</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>BunchClkGenTop.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Bunch Clock 3id Top screen</description>
       </action>
     </actions>
@@ -1533,7 +1813,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7ff0</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fc7</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -1549,7 +1829,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -1568,53 +1848,58 @@ $(pv_value)</tooltip>
     </border_color>
     <y>40</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>pzt_3id.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Queensgate piezo (3id)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>pzt.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Queensgate piezo (std)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>Nano2k.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <S>nano</S>
           <p>1</p>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Nano2k (ch 1)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>Nano2k.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <S>nano</S>
           <p>2</p>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Nano2k (ch 2)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>HuberDMC4.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>DMC1:</Q>
           <M1>1</M1>
           <M2>2</M2>
           <M3>3</M3>
           <M4>4</M4>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Huber DMC9200 servo controller</description>
       </action>
     </actions>
@@ -1626,7 +1911,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fef</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fc6</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -1642,7 +1927,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -1661,80 +1946,99 @@ $(pv_value)</tooltip>
     </border_color>
     <y>20</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>userCalcs10.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>user calcs 1-10</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>userStringCalcs10.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>user stringCalcs 1-10</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>userTransforms10.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>user transforms 1-10</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>userStringSeqs10.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>user string seqs 1-10</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>userArrayCalcs10.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>user arrayCalcs 1-10</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>userAve10.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>user average 1-10</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>userCalcOuts10.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>user calcOuts</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>timer.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>1</N>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>timer</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>xxBusyRecord.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <R>mybusy</R>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>busyRecord</description>
       </action>
+      <action type="OPEN_DISPLAY">
+        <path>Transforms10.opi</path>
+        <macros>
+          <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
+          <N>1</N>
+        </macros>
+        <replace>0</replace>
+        <description>IDisableTransforms</description>
+      </action>
     </actions>
     <tooltip>$(pv_name)
 $(pv_value)</tooltip>
@@ -1744,7 +2048,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fee</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fc5</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -1760,7 +2064,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -1779,40 +2083,44 @@ $(pv_value)</tooltip>
     </border_color>
     <y>60</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>HeidEncoder.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <A>6</A>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Heidenhain AWE1024</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>HeidEncoder.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <A>7</A>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Heidenhain AWE1024</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>HeidND261.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Heidenhain ND261</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>HeidIK320_group.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <card>card0</card>
           <group>5</group>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Heidenhain IK320</description>
       </action>
     </actions>
@@ -1824,7 +2132,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fed</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fc4</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -1840,7 +2148,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -1859,12 +2167,13 @@ $(pv_value)</tooltip>
     </border_color>
     <y>100</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>Elcomat.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Autocollimator</description>
       </action>
     </actions>
@@ -1876,7 +2185,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fec</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fc3</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -1892,7 +2201,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -1911,31 +2220,33 @@ $(pv_value)</tooltip>
     </border_color>
     <y>0</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>orient.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <O>_0</O>
-          <PM>$(PV_PREFIX)</PM>
+          <PM>xxx:</PM>
           <mTTH>SM1</mTTH>
           <mTH>SM2</mTH>
           <mCHI>SM3</mCHI>
           <mPHI>SM4</mPHI>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>orientation matrix</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>orient9.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <PM>$(PV_PREFIX)</PM>
+          <P>xxx:</P>
+          <PM>xxx:</PM>
           <mTTH>SM1</mTTH>
           <mTH>SM2</mTH>
           <mCHI>SM3</mCHI>
           <mPHI>SM4</mPHI>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>orient9</description>
       </action>
     </actions>
@@ -1947,7 +2258,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7feb</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fc2</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -1963,7 +2274,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -1982,67 +2293,74 @@ $(pv_value)</tooltip>
     </border_color>
     <y>0</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>mca_small.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <M>aim_adc1</M>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Canberra AIM Multichannel Analyzer</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>mca.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <M>aim_adc1</M>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>MCA with ROI's</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>xxIcbAdc.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <ADC>adc1</ADC>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>ADC 1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>xxIcbTCA.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <TCA>tca1</TCA>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>TCA 1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>xxIcbHVPS.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <HVPS>hvps1</HVPS>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>HVPS 1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>xxIcbAmp.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <AMP>amp1</AMP>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>AMP 1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>dsp9660Gain.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <DSP>dsp1</DSP>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>DSP 1</description>
       </action>
     </actions>
@@ -2054,7 +2372,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fea</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fc1</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -2070,7 +2388,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -2089,12 +2407,13 @@ $(pv_value)</tooltip>
     </border_color>
     <y>80</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>4step.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>4-step measurement</description>
       </action>
     </actions>
@@ -2105,7 +2424,7 @@ $(pv_value)</tooltip>
   <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="1.0">
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fe9</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fc0</wuid>
     <scripts />
     <height>29</height>
     <name>Action Button</name>
@@ -2115,7 +2434,7 @@ $(pv_value)</tooltip>
       <height_scalable>true</height_scalable>
       <keep_wh_ratio>false</keep_wh_ratio>
     </scale_options>
-    <pv_name>$(PV_PREFIX)allstop.VAL</pv_name>
+    <pv_name>xxx:allstop.VAL</pv_name>
     <background_color>
       <color name="alarm" red="253" green="0" blue="0" />
     </background_color>
@@ -2143,7 +2462,7 @@ $(pv_value)</tooltip>
     <y>108</y>
     <actions hook="false" hook_all="false">
       <action type="WRITE_PV">
-        <pv_name>$(PV_PREFIX)allstop.VAL</pv_name>
+        <pv_name>xxx:allstop.VAL</pv_name>
         <value>1</value>
         <timeout>10</timeout>
         <description></description>
@@ -2153,195 +2472,11 @@ $(pv_value)</tooltip>
 $(pv_value)</tooltip>
     <x>350</x>
   </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0">
-    <macros>
-      <include_parent_macros>true</include_parent_macros>
-    </macros>
-    <visible>true</visible>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fe8</wuid>
-    <scripts />
-    <height>27</height>
-    <name>Grouping Container</name>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <transparent>false</transparent>
-    <show_scrollbar>false</show_scrollbar>
-    <background_color>
-      <color red="236" green="236" blue="236" />
-    </background_color>
-    <foreground_color>
-      <color red="26" green="115" blue="9" />
-    </foreground_color>
-    <widget_type>Grouping Container</widget_type>
-    <enabled>true</enabled>
-    <font>
-      <opifont.name fontName="Sans" height="10" style="0">Default</opifont.name>
-    </font>
-    <width>82</width>
-    <border_style>0</border_style>
-    <rules />
-    <lock_children>false</lock_children>
-    <border_width>1</border_width>
-    <border_color>
-      <color red="0" green="128" blue="255" />
-    </border_color>
-    <actions hook="false" hook_all="false" />
-    <y>78</y>
-    <tooltip></tooltip>
-    <x>350</x>
-    <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0">
-      <visible>true</visible>
-      <vertical_alignment>1</vertical_alignment>
-      <wuid>-7f9f9a2c:1396f15eefb:-7fe7</wuid>
-      <auto_size>false</auto_size>
-      <scripts />
-      <height>25</height>
-      <name>Label</name>
-      <scale_options>
-        <width_scalable>true</width_scalable>
-        <height_scalable>true</height_scalable>
-        <keep_wh_ratio>false</keep_wh_ratio>
-      </scale_options>
-      <transparent>true</transparent>
-      <show_scrollbar>false</show_scrollbar>
-      <background_color>
-        <color red="255" green="255" blue="255" />
-      </background_color>
-      <foreground_color>
-        <color name="ioc_read_fg" red="10" green="0" blue="184" />
-      </foreground_color>
-      <widget_type>Label</widget_type>
-      <enabled>true</enabled>
-      <text>Moving</text>
-      <font>
-        <fontdata fontName="Sans" height="18" style="0" />
-      </font>
-      <width>80</width>
-      <border_style>0</border_style>
-      <rules>
-        <rule name="Visibility" prop_id="visible" out_exp="false">
-          <exp bool_exp="!(pv0==0)">
-            <value>false</value>
-          </exp>
-          <pv trig="true">$(PV_PREFIX)alldone.VAL</pv>
-        </rule>
-      </rules>
-      <border_width>1</border_width>
-      <border_color>
-        <color red="0" green="128" blue="255" />
-      </border_color>
-      <horizontal_alignment>0</horizontal_alignment>
-      <actions hook="false" hook_all="false" />
-      <y>1</y>
-      <wrap_words>true</wrap_words>
-      <tooltip></tooltip>
-      <x>1</x>
-    </widget>
-    <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0">
-      <visible>true</visible>
-      <vertical_alignment>1</vertical_alignment>
-      <wuid>-7f9f9a2c:1396f15eefb:-7fe6</wuid>
-      <auto_size>false</auto_size>
-      <scripts />
-      <height>25</height>
-      <name>Label</name>
-      <scale_options>
-        <width_scalable>true</width_scalable>
-        <height_scalable>true</height_scalable>
-        <keep_wh_ratio>false</keep_wh_ratio>
-      </scale_options>
-      <transparent>true</transparent>
-      <show_scrollbar>false</show_scrollbar>
-      <background_color>
-        <color red="255" green="255" blue="255" />
-      </background_color>
-      <foreground_color>
-        <color name="ioc_read_fg" red="10" green="0" blue="184" />
-      </foreground_color>
-      <widget_type>Label</widget_type>
-      <enabled>true</enabled>
-      <text>Moving</text>
-      <font>
-        <fontdata fontName="Sans" height="18" style="0" />
-      </font>
-      <width>80</width>
-      <border_style>0</border_style>
-      <rules>
-        <rule name="Visibility" prop_id="visible" out_exp="false">
-          <exp bool_exp="pv0==0">
-            <value>false</value>
-          </exp>
-          <pv trig="true">$(PV_PREFIX)alldoneBlink.VAL</pv>
-        </rule>
-      </rules>
-      <border_width>1</border_width>
-      <border_color>
-        <color red="0" green="128" blue="255" />
-      </border_color>
-      <horizontal_alignment>0</horizontal_alignment>
-      <actions hook="false" hook_all="false" />
-      <y>2</y>
-      <wrap_words>true</wrap_words>
-      <tooltip></tooltip>
-      <x>2</x>
-    </widget>
-    <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0">
-      <visible>true</visible>
-      <vertical_alignment>1</vertical_alignment>
-      <wuid>-7f9f9a2c:1396f15eefb:-7fe5</wuid>
-      <auto_size>false</auto_size>
-      <scripts />
-      <height>25</height>
-      <name>Label</name>
-      <scale_options>
-        <width_scalable>true</width_scalable>
-        <height_scalable>true</height_scalable>
-        <keep_wh_ratio>false</keep_wh_ratio>
-      </scale_options>
-      <transparent>true</transparent>
-      <show_scrollbar>false</show_scrollbar>
-      <background_color>
-        <color red="255" green="255" blue="255" />
-      </background_color>
-      <foreground_color>
-        <color name="MEDM_COLOR_50" red="153" green="255" blue="255" />
-      </foreground_color>
-      <widget_type>Label</widget_type>
-      <enabled>true</enabled>
-      <text>Moving</text>
-      <font>
-        <fontdata fontName="Sans" height="18" style="0" />
-      </font>
-      <width>80</width>
-      <border_style>0</border_style>
-      <rules>
-        <rule name="Visibility" prop_id="visible" out_exp="false">
-          <exp bool_exp="!(pv0==0)">
-            <value>false</value>
-          </exp>
-          <pv trig="true">$(PV_PREFIX)alldone.VAL</pv>
-        </rule>
-      </rules>
-      <border_width>1</border_width>
-      <border_color>
-        <color red="0" green="128" blue="255" />
-      </border_color>
-      <horizontal_alignment>0</horizontal_alignment>
-      <actions hook="false" hook_all="false" />
-      <y>0</y>
-      <wrap_words>true</wrap_words>
-      <tooltip></tooltip>
-      <x>0</x>
-    </widget>
-  </widget>
   <widget typeId="org.csstudio.opibuilder.widgets.MenuButton" version="1.0">
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fe4</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fbb</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -2357,7 +2492,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -2376,39 +2511,43 @@ $(pv_value)</tooltip>
     </border_color>
     <y>60</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
-        <path>interpNew.opi</path>
+      <action type="OPEN_DISPLAY">
+        <path>interp.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <Q>1</Q>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
-        <description>interpNew</description>
+        <replace>0</replace>
+        <description>interp</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>arrayTest.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>arrayTest</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>pvHistory.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <N>1</N>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>pvHistory 1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
-        <path>interp.opi</path>
+      <action type="OPEN_DISPLAY">
+        <path>interpNew.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
+          <Q>1</Q>
         </macros>
-        <Position>1</Position>
-        <description>interp</description>
+        <replace>0</replace>
+        <description>interpNew</description>
       </action>
     </actions>
     <tooltip>$(pv_name)
@@ -2419,7 +2558,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fe3</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fba</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -2435,7 +2574,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -2454,40 +2593,44 @@ $(pv_value)</tooltip>
     </border_color>
     <y>60</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>VME_DAC8.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <D>1</D>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>vme DAC 1 Chans 1-8</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>VME_DAC8.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <D>2</D>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>vme DAC 2 Chans 1-8</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>topDAC8.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <D>3</D>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>dac128V 1 Chans 1-8</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>topDAC8.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <D>1</D>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>vme DAC 1 Chans 1-8</description>
       </action>
     </actions>
@@ -2499,7 +2642,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fe2</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fb9</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -2515,7 +2658,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -2534,42 +2677,42 @@ $(pv_value)</tooltip>
     </border_color>
     <y>20</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>3element.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <P>$(PV_PREFIX)med:</P>
+          <P>xxx:med:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>3 element detector</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>mca_small.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <P>$(PV_PREFIX)med:</P>
+          <P>xxx:med:</P>
           <M>mca0</M>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>summed spectrum (mca0)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>mcaSum3.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <P>$(PV_PREFIX)med:</P>
+          <P>xxx:med:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>sum control</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>xxIcbHVPS.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <P>$(PV_PREFIX)med:</P>
+          <P>xxx:med:</P>
           <HVPS>hvps1</HVPS>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>HV power supply</description>
       </action>
     </actions>
@@ -2581,7 +2724,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fe1</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fb8</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -2597,7 +2740,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -2616,22 +2759,22 @@ $(pv_value)</tooltip>
     </border_color>
     <y>40</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>Struck8.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <P>$(PV_PREFIX)mcs:</P>
+          <P>xxx:mcs:</P>
         </macros>
-        <Position>1</Position>
-        <description>8-Channel MCS Control</description>
+        <replace>0</replace>
+        <description> 8-Channel MCS Control</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>Struck32.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <P>$(PV_PREFIX)mcs:</P>
+          <P>xxx:mcs:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>32-Channel MCS Control</description>
       </action>
     </actions>
@@ -2643,7 +2786,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fe0</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fb7</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -2659,7 +2802,7 @@ $(pv_value)</tooltip>
       <color name="callup_bg" red="40" green="147" blue="21" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -2678,19 +2821,21 @@ $(pv_value)</tooltip>
     </border_color>
     <y>120</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>IpUnidig_top.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <R>Unidig1</R>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>IpUnidig I/O</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>Acromag_8in.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <A>1</A>
           <CH0>0</CH0>
           <CH1>1</CH1>
@@ -2701,13 +2846,14 @@ $(pv_value)</tooltip>
           <CH6>6</CH6>
           <CH7>7</CH7>
         </macros>
-        <Position>1</Position>
-        <description>Acromag 8 in</description>
+        <replace>0</replace>
+        <description> Acromag 8 in</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>Acromag_8out.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <A>1</A>
           <CH0>0</CH0>
           <CH1>1</CH1>
@@ -2718,26 +2864,28 @@ $(pv_value)</tooltip>
           <CH6>6</CH6>
           <CH7>7</CH7>
         </macros>
-        <Position>1</Position>
-        <description>Acromag 8 out</description>
+        <replace>0</replace>
+        <description> Acromag 8 out</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>Acromag_16out.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <A>1</A>
         </macros>
-        <Position>1</Position>
-        <description>Acromag 16 out</description>
+        <replace>0</replace>
+        <description> Acromag 16 out</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>Acromag_16in.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <A>1</A>
         </macros>
-        <Position>1</Position>
-        <description>Acromag 16 in</description>
+        <replace>0</replace>
+        <description> Acromag 16 in</description>
       </action>
     </actions>
     <tooltip>$(pv_name)
@@ -2748,7 +2896,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fdf</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fb6</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -2764,7 +2912,7 @@ $(pv_value)</tooltip>
       <color name="callup_bg" red="40" green="147" blue="21" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -2783,70 +2931,76 @@ $(pv_value)</tooltip>
     </border_color>
     <y>100</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>quadEM.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <EM>EM1</EM>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Quad Electrometer Ch.1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>quadEM.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <EM>EM2</EM>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Quad Electrometer Ch.2</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>quadEM.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <EM>EM3</EM>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Quad Electrometer Ch.3</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>quadEM.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <EM>EM4</EM>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Quad Electrometer Ch.4</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>quadEM_med.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <P>$(PV_PREFIX)quadEM:</P>
-          <P_FFT>$(PV_PREFIX)quadEM_FFT:</P_FFT>
+          <P>xxx:quadEM:</P>
+          <P_FFT>xxx:quadEM_FFT:</P_FFT>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Quad Electrometer MCAs</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>pid_control.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <PID>quadEMVertical</PID>
           <TITLE>Vertical_Feedback</TITLE>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Vertical feedback</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>pid_control.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <PID>quadEMHorizontal</PID>
           <TITLE>Horizontal_Feedback</TITLE>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Horizontal feedback</description>
       </action>
     </actions>
@@ -2858,7 +3012,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fde</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fb5</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -2874,7 +3028,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -2893,76 +3047,84 @@ $(pv_value)</tooltip>
     </border_color>
     <y>120</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>asynOctet.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <R>asyn_1</R>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>asyn record serial1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>asynOctet.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <R>asyn_2</R>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>asyn record serial2</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>asynOctet.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <R>asyn_3</R>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>asyn record serial3</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>asynOctet.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <R>asyn_4</R>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>asyn record serial4</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>asynOctet.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <R>asyn_5</R>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>asyn record serial5</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>asynOctet.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <R>asyn_6</R>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>asyn record serial6</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>asynOctet.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <R>asyn_7</R>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>asyn record serial7</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>asynOctet.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <R>asyn_8</R>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>asyn record serial8</description>
       </action>
     </actions>
@@ -2974,7 +3136,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fdd</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fb4</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -2990,7 +3152,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -3000,7 +3162,7 @@ $(pv_value)</tooltip>
     </font>
     <width>70</width>
     <border_style>6</border_style>
-    <label>beamFind</label>
+    <label>ZTEC</label>
     <rules />
     <pv_value />
     <border_width>1</border_width>
@@ -3009,20 +3171,23 @@ $(pv_value)</tooltip>
     </border_color>
     <y>140</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
-        <path>beamFinder.opi</path>
+      <action type="OPEN_DISPLAY">
+        <path>main2.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <P>$(PV_PREFIX)bf1:</P>
-          <PM>$(PV_PREFIX)</PM>
-          <m_sX>SM1</m_sX>
-          <m_sY>SM2</m_sY>
-          <m_zpX>SM3</m_zpX>
-          <m_zpY>SM4</m_zpY>
-          <m_zpZ>SM5</m_zpZ>
+          <ZT>ztec</ZT>
         </macros>
-        <Position>1</Position>
-        <description>beamFinder</description>
+        <replace>0</replace>
+        <description>ZTEC 2 channel</description>
+      </action>
+      <action type="OPEN_DISPLAY">
+        <path>main4.opi</path>
+        <macros>
+          <include_parent_macros>true</include_parent_macros>
+          <ZT>ztec</ZT>
+        </macros>
+        <replace>0</replace>
+        <description>ZTEC 4 channel</description>
       </action>
     </actions>
     <tooltip>$(pv_name)
@@ -3033,7 +3198,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fdc</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fb3</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -3049,7 +3214,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -3068,17 +3233,17 @@ $(pv_value)</tooltip>
     </border_color>
     <y>120</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>CoarseFineMotor.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <P>$(PV_PREFIX)cf1:</P>
+          <P>xxx:cf1:</P>
           <M>MOT</M>
-          <PM>$(PV_PREFIX)</PM>
+          <PM>xxx:</PM>
           <CM>m7</CM>
           <FM>m8</FM>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>CoarseFine</description>
       </action>
     </actions>
@@ -3090,7 +3255,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fdb</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fb2</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -3106,7 +3271,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -3125,22 +3290,24 @@ $(pv_value)</tooltip>
     </border_color>
     <y>140</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>XIA_shutter.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <S>shutter1</S>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>XIA shutter 1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>XIA_shutterTry.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <S>shutter2</S>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>XIA shutter 2</description>
       </action>
     </actions>
@@ -3152,7 +3319,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fda</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fb1</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -3168,7 +3335,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -3187,15 +3354,15 @@ $(pv_value)</tooltip>
     </border_color>
     <y>140</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>Io.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <P>$(PV_PREFIX)Io:</P>
-          <S>$(PV_PREFIX)scaler1</S>
-          <MONO>$(PV_PREFIX)BraggEAO</MONO>
+          <P>xxx:Io:</P>
+          <S>xxx:scaler1</S>
+          <MONO>xxx:BraggEAO</MONO>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Io</description>
       </action>
     </actions>
@@ -3207,7 +3374,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fd9</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fb0</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -3223,7 +3390,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -3242,32 +3409,35 @@ $(pv_value)</tooltip>
     </border_color>
     <y>20</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>2slit.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <SLIT>Slit1H</SLIT>
           <mXp>m5</mXp>
           <mXn>m6</mXn>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Slit 1 (H)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>2slit.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <SLIT>Slit1V</SLIT>
           <mXp>m3</mXp>
           <mXn>m4</mXn>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Slit 1 (V)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>4slitGraphic.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <SLIT>Slit_1</SLIT>
           <H>Slit1H</H>
           <mXp>m3</mXp>
@@ -3276,47 +3446,51 @@ $(pv_value)</tooltip>
           <mYp>m5</mYp>
           <mYn>m6</mYn>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Slit 1 Graphic</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>motor4x.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <M1>m3</M1>
           <M2>m4</M2>
           <M3>m5</M3>
           <M4>m6</M4>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Slit Motors</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>2slit_soft.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <SLIT>Slit2H</SLIT>
           <mXp>m15</mXp>
           <mXn>m16</mXn>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Slit 2 (H) (soft)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>2slit_soft.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <SLIT>Slit2V</SLIT>
           <mXp>m13</mXp>
           <mXn>m14</mXn>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Slit 2 (V) (soft)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>4slitGraphic_soft.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <SLIT>Slit_2</SLIT>
           <H>Slit2H</H>
           <mXp>m15</mXp>
@@ -3325,25 +3499,27 @@ $(pv_value)</tooltip>
           <mYp>m13</mYp>
           <mYn>m14</mYn>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Slit 2 Graphic (soft)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>xia_slit.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <HSC>hsc1:</HSC>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>XIA slit 1 (H)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>xia_slit.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <HSC>hsc2:</HSC>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>XIA slit 1 (V)</description>
       </action>
     </actions>
@@ -3355,7 +3531,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fd8</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2faf</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -3371,7 +3547,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -3390,16 +3566,17 @@ $(pv_value)</tooltip>
     </border_color>
     <y>80</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>LoveList4.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q1>Love1</Q1>
           <Q2>Love2</Q2>
           <Q3>Love3</Q3>
           <Q4>Love4</Q4>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Love controllers</description>
       </action>
     </actions>
@@ -3411,7 +3588,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fd7</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fae</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -3427,62 +3604,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
-    </foreground_color>
-    <widget_type>Menu Button</widget_type>
-    <enabled>true</enabled>
-    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-    <font>
-      <opifont.name fontName="Sans" height="10" style="0">Default</opifont.name>
-    </font>
-    <width>70</width>
-    <border_style>6</border_style>
-    <label>ASRPmt</label>
-    <rules />
-    <pv_value />
-    <border_width>1</border_width>
-    <border_color>
-      <color red="0" green="128" blue="255" />
-    </border_color>
-    <y>140</y>
-    <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
-        <path>ASRPmirrorTable.opi</path>
-        <macros>
-          <include_parent_macros>true</include_parent_macros>
-          <TBL>mt1</TBL>
-          <VERT>$(PV_PREFIX)m7</VERT>
-          <PITCH>$(PV_PREFIX)m8</PITCH>
-        </macros>
-        <Position>1</Position>
-        <description>ASRP mirror table</description>
-      </action>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-    <x>280</x>
-  </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.MenuButton" version="1.0">
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <visible>true</visible>
-    <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fd6</wuid>
-    <scripts />
-    <height>20</height>
-    <name>Menu Button</name>
-    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <transparent>false</transparent>
-    <pv_name></pv_name>
-    <background_color>
-      <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
-    </background_color>
-    <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -3501,23 +3623,25 @@ $(pv_value)</tooltip>
     </border_color>
     <y>140</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>ramp_tweak.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <Q>LaserDelay</Q>
+          <P>xxx:</P>
+          <Q>rt1</Q>
         </macros>
-        <Position>1</Position>
-        <description>ramp/tweak LaserDelay</description>
+        <replace>0</replace>
+        <description>ramp/tweak rt1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>ramp_tweak.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <Q>rt1</Q>
+          <P>xxx:</P>
+          <Q>rt2</Q>
         </macros>
-        <Position>1</Position>
-        <description>ramp/tweak rt1</description>
+        <replace>0</replace>
+        <description>ramp/tweak rt2</description>
       </action>
     </actions>
     <tooltip>$(pv_name)
@@ -3528,7 +3652,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fd5</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fad</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -3544,7 +3668,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -3563,60 +3687,66 @@ $(pv_value)</tooltip>
     </border_color>
     <y>120</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>SR570_tiny.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <A>A1</A>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>SRS 570 Current Preamplifier #A1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>SR570_tiny.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <A>A2</A>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>SRS 570 Current Preamplifier #A2</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>SR570_tiny.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <A>A3</A>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>SRS 570 Current Preamplifier #A3</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>SR570_tiny.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <A>A4</A>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>SRS 570 Current Preamplifier #A4</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>SR570_tiny.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <A>A5</A>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>SRS 570 Current Preamplifier #A5</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>femto.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <H>fem01:</H>
           <F>seq01:</F>
-          <AC>$(PV_PREFIX)Unidig1Bo9</AC>
+          <AC>xxx:Unidig1Bo9</AC>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Femto Current Preamplifier</description>
       </action>
     </actions>
@@ -3628,7 +3758,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fd4</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fac</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -3644,7 +3774,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -3663,38 +3793,42 @@ $(pv_value)</tooltip>
     </border_color>
     <y>80</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>LakeShore.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>TC1</Q>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>LakeShore Temp. Controller</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>KeithleyDMM.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Keithley DMM (thermistors)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>Eurotherm.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Eurotherm</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>Eurotherm2k.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <TC>1</TC>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Eurotherm 2k</description>
       </action>
     </actions>
@@ -3706,7 +3840,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fd3</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fab</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -3722,7 +3856,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -3741,10 +3875,11 @@ $(pv_value)</tooltip>
     </border_color>
     <y>20</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>ml_monoGraphic.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <mY1>m1</mY1>
           <mZ1>m2</mZ1>
           <mY2>m9</mY2>
@@ -3753,61 +3888,67 @@ $(pv_value)</tooltip>
           <mT2>m10</mT2>
           <mB>m11</mB>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>ml_monoGraphic</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>ml_monoSeqCtl_tiny.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>ml_monoSeq (tiny)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>ml_monoSeqCtl.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>ml_monoSeq</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>ml_monoSeqCtl_All.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>ml_monoSeq (All)</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scanParms.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>ml_monoE</Q>
           <PV>ml_monoE</PV>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Energy-scan parameters</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scanParms.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>ml_monoTheta</Q>
           <PV>ml_monoTheta</PV>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Theta-scan parameters</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>scanParms.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>ml_monoLambda</Q>
           <PV>ml_monoLambda</PV>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Wavelength-scan parameters</description>
       </action>
     </actions>
@@ -3819,7 +3960,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fd2</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2faa</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -3835,7 +3976,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -3854,42 +3995,46 @@ $(pv_value)</tooltip>
     </border_color>
     <y>0</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>softGlueMenu.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <H>softGlue:</H>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>softGlueMenu</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>softGlueMenu.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <H>softGlue2:</H>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>softGlue2 Menu</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
-        <path>softGlue_Shift32.opi</path>
+      <action type="OPEN_DISPLAY">
+        <path>softGlue_Shift32_bare.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <H>softGlue:</H>
           <N>1</N>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>shift 1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
-        <path>softGlue_Shift32.opi</path>
+      <action type="OPEN_DISPLAY">
+        <path>softGlue_Shift32_bare.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <H>softGlue:</H>
           <N>2</N>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>shift 2</description>
       </action>
     </actions>
@@ -3901,7 +4046,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fd1</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fa9</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -3917,7 +4062,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -3936,13 +4081,14 @@ $(pv_value)</tooltip>
     </border_color>
     <y>40</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>FuncGen.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>fgen</Q>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>funcGen</description>
       </action>
     </actions>
@@ -3954,7 +4100,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fd0</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fa8</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -3970,7 +4116,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -3989,79 +4135,87 @@ $(pv_value)</tooltip>
     </border_color>
     <y>80</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>Ip330Scan.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <R>IP330_</R>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>ADC 1</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>mca_small.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <M>mip330_1</M>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>ADC 1 sweep</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>mca_small.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <M>mip330_2</M>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>ADC 2 sweep</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>mca_small.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <M>mip330_3</M>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>ADC 3 sweep</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>mca_small.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <M>mip330_4</M>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>ADC 4 sweep</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>pid_control.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <PID>pid_slow</PID>
           <TITLE>Slow_Feedback</TITLE>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Slow feedback</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>pid_control.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <PID>ip330PIDFast</PID>
           <TITLE>Fast_Feedback</TITLE>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Fast feedback</description>
       </action>
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>async_pid_control.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <PID>async_pid_slow</PID>
           <TITLE>Slow_Feedback</TITLE>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>Async Slow feedback</description>
       </action>
     </actions>
@@ -4073,7 +4227,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fcf</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fa7</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -4089,7 +4243,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -4108,13 +4262,14 @@ $(pv_value)</tooltip>
     </border_color>
     <y>60</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>OctupoleRamp.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <Q>octupole:</Q>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>OctupoleRamp</description>
       </action>
     </actions>
@@ -4126,7 +4281,7 @@ $(pv_value)</tooltip>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fce</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fa6</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -4142,7 +4297,7 @@ $(pv_value)</tooltip>
       <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -4161,10 +4316,11 @@ $(pv_value)</tooltip>
     </border_color>
     <y>140</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
+      <action type="OPEN_DISPLAY">
         <path>MAX_trajectoryScan.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
           <R>traj1:</R>
           <TITLE>title</TITLE>
           <M1>m1</M1>
@@ -4176,19 +4332,19 @@ $(pv_value)</tooltip>
           <M7>m7</M7>
           <M8>m8</M8>
         </macros>
-        <Position>1</Position>
+        <replace>0</replace>
         <description>trajectoryScan</description>
       </action>
     </actions>
     <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-    <x>350</x>
+    <x>280</x>
   </widget>
   <widget typeId="org.csstudio.opibuilder.widgets.MenuButton" version="1.0">
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <visible>true</visible>
     <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fcd</wuid>
+    <wuid>-35547c25:13a0384ab1a:-2fa5</wuid>
     <scripts />
     <height>20</height>
     <name>Menu Button</name>
@@ -4201,10 +4357,10 @@ $(pv_value)</tooltip>
     <transparent>false</transparent>
     <pv_name></pv_name>
     <background_color>
-      <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
+      <color name="callup_bg" red="40" green="147" blue="21" />
     </background_color>
     <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
+      <color name="Gray_0" red="255" green="255" blue="255" />
     </foreground_color>
     <widget_type>Menu Button</widget_type>
     <enabled>true</enabled>
@@ -4212,9 +4368,9 @@ $(pv_value)</tooltip>
     <font>
       <opifont.name fontName="Sans" height="10" style="0">Default</opifont.name>
     </font>
-    <width>35</width>
+    <width>70</width>
     <border_style>6</border_style>
-    <label>wf</label>
+    <label>AD simDet</label>
     <rules />
     <pv_value />
     <border_width>1</border_width>
@@ -4223,70 +4379,49 @@ $(pv_value)</tooltip>
     </border_color>
     <y>140</y>
     <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
-        <path>testCharWF.opi</path>
+      <action type="OPEN_DISPLAY">
+        <path>ADBase.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
+          <R>SIM1:cam1:</R>
         </macros>
-        <Position>1</Position>
-        <description>testCharWF</description>
+        <replace>0</replace>
+        <description>Simulator #1 General</description>
       </action>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-    <x>430</x>
-  </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.MenuButton" version="1.0">
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <visible>true</visible>
-    <actions_from_pv>false</actions_from_pv>
-    <wuid>-7f9f9a2c:1396f15eefb:-7fcc</wuid>
-    <scripts />
-    <height>20</height>
-    <name>Menu Button</name>
-    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <transparent>false</transparent>
-    <pv_name></pv_name>
-    <background_color>
-      <color name="MEDM_COLOR_17" red="51" green="153" blue="0" />
-    </background_color>
-    <foreground_color>
-      <color name="callup_fg" red="255" green="255" blue="255" />
-    </foreground_color>
-    <widget_type>Menu Button</widget_type>
-    <enabled>true</enabled>
-    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-    <font>
-      <opifont.name fontName="Sans" height="10" style="0">Default</opifont.name>
-    </font>
-    <width>35</width>
-    <border_style>6</border_style>
-    <label>ztec</label>
-    <rules />
-    <pv_value />
-    <border_width>1</border_width>
-    <border_color>
-      <color red="0" green="128" blue="255" />
-    </border_color>
-    <y>80</y>
-    <actions hook="false" hook_all="false">
-      <action type="OPEN_OPI_IN_VIEW">
-        <path>ztec_admin.opi</path>
+      <action type="OPEN_DISPLAY">
+        <path>simDetector.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
-          <Z>ztec:</Z>
+          <P>xxx:</P>
+          <R>SIM1:cam1:</R>
         </macros>
-        <Position>1</Position>
-        <description>ztec_admin</description>
+        <replace>0</replace>
+        <description>Simulator #1 Specific</description>
+      </action>
+      <action type="OPEN_DISPLAY">
+        <path>ADBase.opi</path>
+        <macros>
+          <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
+          <R>SIM1:cam2:</R>
+        </macros>
+        <replace>0</replace>
+        <description>Simulator #2 General</description>
+      </action>
+      <action type="OPEN_DISPLAY">
+        <path>simDetector.opi</path>
+        <macros>
+          <include_parent_macros>true</include_parent_macros>
+          <P>xxx:</P>
+          <R>SIM1:cam2:</R>
+        </macros>
+        <replace>0</replace>
+        <description>Simulator #2 Specific</description>
       </action>
     </actions>
     <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-    <x>430</x>
+    <x>350</x>
   </widget>
 </display>
\ No newline at end of file