diff --git a/NON-APPROVED/TS2/pss/TS2_PSS_Area.bob b/NON-APPROVED/TS2/pss/TS2_PSS_Area.bob
index 9952d8bfdede29be0b0d1d3f24cdec94f8654fce..bd734d33379fc4448805c20432b8b1b3ca92e07c 100644
--- a/NON-APPROVED/TS2/pss/TS2_PSS_Area.bob
+++ b/NON-APPROVED/TS2/pss/TS2_PSS_Area.bob
@@ -162,10 +162,10 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>O2iM-1</name>
-          <file>embedded_displays/odh.bob</file>
           <macros>
             <IDX>1</IDX>
           </macros>
+          <file>embedded_displays/odh.bob</file>
           <x>86</x>
           <y>11</y>
           <width>50</width>
@@ -174,10 +174,10 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>O2iM-2</name>
-          <file>embedded_displays/odh.bob</file>
           <macros>
             <IDX>2</IDX>
           </macros>
+          <file>embedded_displays/odh.bob</file>
           <x>733</x>
           <y>11</y>
           <width>50</width>
@@ -186,10 +186,11 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>Radiation Monitor</name>
-          <file>embedded_displays/rad.bob</file>
           <macros>
+            <AGM>003</AGM>
             <R_IDX>1</R_IDX>
           </macros>
+          <file>embedded_displays/rad.bob</file>
           <x>34</x>
           <y>63</y>
           <width>50</width>
@@ -198,10 +199,11 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>Radiation Monitor</name>
-          <file>embedded_displays/rad.bob</file>
           <macros>
+            <AGM>002</AGM>
             <R_IDX>2</R_IDX>
           </macros>
+          <file>embedded_displays/rad.bob</file>
           <x>56</x>
           <y>276</y>
           <width>50</width>
@@ -238,10 +240,10 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>PAD</name>
-          <file>embedded_displays/door.bob</file>
           <macros>
             <DOOR_STAT>$(P):PADStat</DOOR_STAT>
           </macros>
+          <file>embedded_displays/door.bob</file>
           <x>47</x>
           <y>467</y>
           <width>80</width>
@@ -285,10 +287,10 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>ESOS$(ESOS_IDX)</name>
-          <file>embedded_displays/esos.bob</file>
           <macros>
             <ESOS_IDX>1</ESOS_IDX>
           </macros>
+          <file>embedded_displays/esos.bob</file>
           <x>783</x>
           <y>255</y>
           <width>50</width>
@@ -298,10 +300,10 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>SEARCH$(SEARCH_IDX)</name>
-          <file>embedded_displays/search.bob</file>
           <macros>
             <SEARCH_IDX>1</SEARCH_IDX>
           </macros>
+          <file>embedded_displays/search.bob</file>
           <x>733</x>
           <y>255</y>
           <width>50</width>
@@ -311,10 +313,10 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>ESOS$(ESOS_IDX)</name>
-          <file>embedded_displays/esos.bob</file>
           <macros>
             <ESOS_IDX>2</ESOS_IDX>
           </macros>
+          <file>embedded_displays/esos.bob</file>
           <x>521</x>
           <y>477</y>
           <width>50</width>
@@ -324,10 +326,10 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>SEARCH$(SEARCH_IDX)</name>
-          <file>embedded_displays/search.bob</file>
           <macros>
             <SEARCH_IDX>2</SEARCH_IDX>
           </macros>
+          <file>embedded_displays/search.bob</file>
           <x>471</x>
           <y>477</y>
           <width>50</width>
@@ -337,10 +339,10 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>ESOS$(ESOS_IDX)</name>
-          <file>embedded_displays/esos.bob</file>
           <macros>
             <ESOS_IDX>3</ESOS_IDX>
           </macros>
+          <file>embedded_displays/esos.bob</file>
           <x>348</x>
           <y>255</y>
           <width>50</width>
@@ -350,10 +352,10 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>SEARCH$(SEARCH_IDX)</name>
-          <file>embedded_displays/search.bob</file>
           <macros>
             <SEARCH_IDX>3</SEARCH_IDX>
           </macros>
+          <file>embedded_displays/search.bob</file>
           <x>298</x>
           <y>255</y>
           <width>50</width>
@@ -363,10 +365,10 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>ESOS$(ESOS_IDX)</name>
-          <file>embedded_displays/esos.bob</file>
           <macros>
             <ESOS_IDX>4</ESOS_IDX>
           </macros>
+          <file>embedded_displays/esos.bob</file>
           <x>186</x>
           <y>275</y>
           <width>50</width>
@@ -376,10 +378,10 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>SEARCH$(SEARCH_IDX)</name>
-          <file>embedded_displays/search.bob</file>
           <macros>
             <SEARCH_IDX>4</SEARCH_IDX>
           </macros>
+          <file>embedded_displays/search.bob</file>
           <x>136</x>
           <y>275</y>
           <width>50</width>
@@ -472,22 +474,22 @@
         <transparent>true</transparent>
         <widget type="embedded" version="2.0.0">
           <name>AccessMode</name>
-          <file>embedded_displays/mode.bob</file>
           <macros>
             <MODE>Access Mode</MODE>
             <MODE_PV>AccessMode</MODE_PV>
           </macros>
+          <file>embedded_displays/mode.bob</file>
           <width>160</width>
           <height>31</height>
           <transparent>true</transparent>
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>SearchMode</name>
-          <file>embedded_displays/mode.bob</file>
           <macros>
             <MODE>Search Mode</MODE>
             <MODE_PV>SearchMode</MODE_PV>
           </macros>
+          <file>embedded_displays/mode.bob</file>
           <x>162</x>
           <width>160</width>
           <height>31</height>
@@ -495,11 +497,11 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>TransitionMode</name>
-          <file>embedded_displays/mode.bob</file>
           <macros>
             <MODE>Transition Mode</MODE>
             <MODE_PV>TransitionMode</MODE_PV>
           </macros>
+          <file>embedded_displays/mode.bob</file>
           <x>324</x>
           <width>160</width>
           <height>31</height>
@@ -507,11 +509,11 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>RFOnMode</name>
-          <file>embedded_displays/mode.bob</file>
           <macros>
             <MODE>RF On Mode</MODE>
             <MODE_PV>RFOnMode</MODE_PV>
           </macros>
+          <file>embedded_displays/mode.bob</file>
           <x>486</x>
           <width>160</width>
           <height>31</height>
@@ -519,11 +521,11 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>RMITLckMode</name>
-          <file>embedded_displays/alarm_mode.bob</file>
           <macros>
             <MODE>RM Interlock Mode</MODE>
             <MODE_PV>RMITLckMode</MODE_PV>
           </macros>
+          <file>embedded_displays/alarm_mode.bob</file>
           <x>648</x>
           <width>160</width>
           <height>31</height>
@@ -531,11 +533,11 @@
         </widget>
         <widget type="embedded" version="2.0.0">
           <name>Alarm Mode</name>
-          <file>embedded_displays/alarm_mode.bob</file>
           <macros>
             <MODE>Alarm Mode</MODE>
             <MODE_PV>AlarmMode</MODE_PV>
           </macros>
+          <file>embedded_displays/alarm_mode.bob</file>
           <x>810</x>
           <width>160</width>
           <height>31</height>
diff --git a/NON-APPROVED/TS2/pss/embedded_displays/rad.bob b/NON-APPROVED/TS2/pss/embedded_displays/rad.bob
index 9ec0f6ed755443f9da2ffa89d1a4fd1a890e93ae..1a8ffb527d33601769fa6c039f413e8297171d9d 100644
--- a/NON-APPROVED/TS2/pss/embedded_displays/rad.bob
+++ b/NON-APPROVED/TS2/pss/embedded_displays/rad.bob
@@ -33,7 +33,8 @@
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>RM$(R_IDX)</text>
+    <text>AGM-
+$(AGM)</text>
     <width>50</width>
     <height>50</height>
     <font>