diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob
index c349744cc8ee20a2f7ffa968dd48f987c02b2ad7..12d4ed58962590733f8cc59886c4851bc4132aaa 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob
@@ -1210,7 +1210,7 @@
               <y>52</y>
               <width>123</width>
               <height>30</height>
-              <precision>2</precision>
+              <precision>5</precision>
               <vertical_alignment>1</vertical_alignment>
               <rules>
                 <rule name="VisibilityRule" prop_id="visible" out_exp="false">
@@ -1419,7 +1419,7 @@
               <y>53</y>
               <width>123</width>
               <height>30</height>
-              <precision>2</precision>
+              <precision>5</precision>
               <vertical_alignment>1</vertical_alignment>
               <rules>
                 <rule name="VisibilityRule" prop_id="visible" out_exp="false">
@@ -1557,7 +1557,7 @@
               <y>54</y>
               <width>123</width>
               <height>30</height>
-              <precision>2</precision>
+              <precision>5</precision>
               <vertical_alignment>1</vertical_alignment>
               <rules>
                 <rule name="VisibilityRule" prop_id="visible" out_exp="false">
@@ -3729,12 +3729,12 @@
           </widget>
           <widget type="embedded" version="2.0.0">
             <name>Embedded Display</name>
+            <file>FacePlate_AutoConf.bob</file>
             <macros>
               <WIDAmConf>Virt-AMCONF</WIDAmConf>
               <WIDDis>Cryo</WIDDis>
               <WIDSecSub>TS2-010</WIDSecSub>
             </macros>
-            <file>FacePlate_AutoConf.bob</file>
             <x>448</x>
             <y>17</y>
             <width>481</width>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/Device_group_settings.bob b/NON-APPROVED/TS2/ts2-cryomodule/Device_group_settings.bob
new file mode 100644
index 0000000000000000000000000000000000000000..f60539da4e2792321447e75bba29429619847b2d
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-cryomodule/Device_group_settings.bob
@@ -0,0 +1,1167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Device Groups</name>
+  <width>1000</width>
+  <height>700</height>
+  <widget type="rectangle" version="2.0.0">
+    <name>title-bar_3</name>
+    <width>1000</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title_4</name>
+    <text>Device Groups</text>
+    <x>20</x>
+    <width>1000</width>
+    <height>50</height>
+    <font>
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>SetPoint CAVITIES HEATERS</name>
+    <y>50</y>
+    <width>333</width>
+    <height>299</height>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rect_Limits_Ttile</name>
+      <x>7</x>
+      <y>15</y>
+      <width>279</width>
+      <height>41</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rect_Limits_Back</name>
+      <x>7</x>
+      <y>46</y>
+      <width>279</width>
+      <height>59</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>EH10_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-EH-010:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>128</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH10 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>EH20_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-EH-020:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>158</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH20 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>EH30_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-EH-030:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>188</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH30 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>EH40_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-EH-040:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>218</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH40 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>EH10</name>
+      <text>EH10_SP:</text>
+      <x>20</x>
+      <y>130</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>EH20</name>
+      <text>EH20_SP:</text>
+      <x>20</x>
+      <y>160</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>EH30</name>
+      <text>EH30_SP:</text>
+      <x>20</x>
+      <y>190</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>EH40</name>
+      <text>EH40_SP:</text>
+      <x>20</x>
+      <y>220</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>CAVEH_Title</name>
+      <class>HEADER2</class>
+      <text>WriteALL Cavities Heaters SP</text>
+      <x>7</x>
+      <y>15</y>
+      <width>279</width>
+      <height>31</height>
+      <font use_class="true">
+        <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>CAVEH_SP_ALL</name>
+      <text>SP:</text>
+      <x>20</x>
+      <y>64</y>
+      <width>50</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="spinner" version="2.0.0">
+      <name>CAVEH_SP_ALL_INP</name>
+      <pv_name>loc://CAVEH_SP_ALL</pv_name>
+      <x>80</x>
+      <y>62</y>
+      <width>90</width>
+      <height>25</height>
+      <format>0</format>
+      <precision>2</precision>
+      <tooltip>ALL SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <increment>0.1</increment>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>CAVEH_Button</name>
+      <actions>
+      </actions>
+      <text>Write</text>
+      <x>184</x>
+      <y>62</y>
+      <width>80</width>
+      <height>25</height>
+      <tooltip>$(actions)</tooltip>
+      <confirm_message></confirm_message>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>SetPoint TEST</name>
+    <y>349</y>
+    <width>333</width>
+    <height>299</height>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rect_Limits_Ttile_1</name>
+      <x>7</x>
+      <y>15</y>
+      <width>279</width>
+      <height>41</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rect_Limits_Back_1</name>
+      <x>7</x>
+      <y>46</y>
+      <width>279</width>
+      <height>59</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>TEST1_SP_FB</name>
+      <pv_name>loc://TEST_1</pv_name>
+      <x>149</x>
+      <y>128</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value TEST1</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>EH20_SP_FB_1</name>
+      <pv_name>loc://TEST_2</pv_name>
+      <x>149</x>
+      <y>158</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value HIGH</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>EH30_SP_FB_1</name>
+      <pv_name>loc://TEST_3</pv_name>
+      <x>149</x>
+      <y>188</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value LOW</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>EH40_SP_FB_1</name>
+      <pv_name>loc://TEST_4</pv_name>
+      <x>149</x>
+      <y>218</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value LOLO</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>TEST_1</name>
+      <text>TEST1_SP:</text>
+      <x>20</x>
+      <y>130</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>TEST_2</name>
+      <text>TEST2_SP:</text>
+      <x>20</x>
+      <y>160</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>TEST_3</name>
+      <text>TEST3_SP:</text>
+      <x>20</x>
+      <y>190</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>TEST_4</name>
+      <text>TEST4_SP:</text>
+      <x>20</x>
+      <y>220</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>TEST_Title_1</name>
+      <class>HEADER2</class>
+      <text>WriteALL TEST SP</text>
+      <x>7</x>
+      <y>15</y>
+      <width>279</width>
+      <height>31</height>
+      <font use_class="true">
+        <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>TEST_SP_ALL_1</name>
+      <text>SP:</text>
+      <x>20</x>
+      <y>64</y>
+      <width>50</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="spinner" version="2.0.0">
+      <name>TEST_SP_ALL_INP_1</name>
+      <pv_name>loc://TEST_SP_ALL</pv_name>
+      <x>80</x>
+      <y>62</y>
+      <width>90</width>
+      <height>25</height>
+      <format>0</format>
+      <precision>2</precision>
+      <tooltip>ALL SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <increment>0.1</increment>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>TEST_Button_1</name>
+      <actions execute_as_one="true">
+        <action type="execute">
+          <script file="EmbeddedPy">
+            <text><![CDATA[/* Embedded javascript */
+PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
+logger = org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger();
+PVFactory = org.csstudio.display.builder.runtime.pv.PVFactory;
+ScriptUtil = org.csstudio.display.builder.runtime.script.ScriptUtil;
+
+
+     logger.info("Started.");
+
+
+
+	PVName = "loc://TEST_SP_ALL";
+	SetValue = -1;
+        patience = 100000000;
+	pv = PVFactory.getPV(PVName);
+	try{
+	    while (pv.read() == null){
+            patience -= 1;
+	           if (patience < 0) {
+	              throw "Timeout connecting to PV";
+	         }
+	    }
+	    SetValue = PVUtil.getDouble(pv);
+	}
+	catch (e) { logger.warning("Can't connect to PV: "+e.toString()); }
+        PVFactory.releasePV(pv);
+      logger.info("Source: "+SetValue.toString());
+
+	PVName = "loc://TEST_2";
+	Value = -1;
+        patience = 100000000;
+	pv = PVFactory.getPV(PVName);
+	try{
+	    while (pv.read() == null){
+            patience -= 1;
+	           if (patience < 0) {
+	              throw "Timeout connecting to PV";
+	         }
+	    }
+	    Value = PVUtil.getDouble(pv);
+	}
+	catch (e) { logger.warning("Can't connect to PV: "+e.toString()); }
+        PVFactory.releasePV(pv);
+      logger.info("Dest: "+Value.toString());
+      }
+
+     logger.info("Done.");
+
+
+
+
+
+
+
+
+]]></text>
+          </script>
+          <description>Execute Script</description>
+        </action>
+      </actions>
+      <text>Write</text>
+      <x>184</x>
+      <y>62</y>
+      <width>80</width>
+      <height>25</height>
+      <tooltip>$(actions)</tooltip>
+      <confirm_message></confirm_message>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>SetPoint FPC HEATERS_1</name>
+    <x>333</x>
+    <y>50</y>
+    <width>333</width>
+    <height>299</height>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rect_Limits_Ttile_2</name>
+      <x>7</x>
+      <y>15</y>
+      <width>279</width>
+      <height>41</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rect_Limits_Back_2</name>
+      <x>7</x>
+      <y>46</y>
+      <width>279</width>
+      <height>59</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>EH11_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-EH-011:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>128</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH11 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>EH21_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-EH-021:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>158</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH21 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>EH31_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-EH-031:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>188</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH31 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>EH41_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-EH-041:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>218</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH41 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>EH11</name>
+      <text>EH11_SP:</text>
+      <x>20</x>
+      <y>130</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>EH21</name>
+      <text>EH21_SP:</text>
+      <x>20</x>
+      <y>160</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>EH31</name>
+      <text>EH31_SP:</text>
+      <x>20</x>
+      <y>190</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>EH41</name>
+      <text>EH41_SP:</text>
+      <x>20</x>
+      <y>220</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>FPCEH_Title_1</name>
+      <class>HEADER2</class>
+      <text>WriteALL FPC 1 Heaters SP</text>
+      <x>7</x>
+      <y>15</y>
+      <width>279</width>
+      <height>31</height>
+      <font use_class="true">
+        <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>FPCEH_SP_ALL_1</name>
+      <text>SP:</text>
+      <x>20</x>
+      <y>64</y>
+      <width>50</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="spinner" version="2.0.0">
+      <name>FPCEH_SP_ALL_INP_1</name>
+      <pv_name>loc://FPC1_SP_ALL</pv_name>
+      <x>80</x>
+      <y>62</y>
+      <width>90</width>
+      <height>25</height>
+      <format>0</format>
+      <precision>2</precision>
+      <tooltip>ALL SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <increment>0.1</increment>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>FPCEH_Button_1</name>
+      <actions>
+      </actions>
+      <text>Write</text>
+      <x>184</x>
+      <y>62</y>
+      <width>80</width>
+      <height>25</height>
+      <tooltip>$(actions)</tooltip>
+      <confirm_message></confirm_message>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>SetPoint FPC HEATERS_2</name>
+    <x>666</x>
+    <y>50</y>
+    <width>333</width>
+    <height>299</height>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rect_Limits_Ttile_3</name>
+      <x>7</x>
+      <y>15</y>
+      <width>279</width>
+      <height>41</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rect_Limits_Back_3</name>
+      <x>7</x>
+      <y>46</y>
+      <width>279</width>
+      <height>59</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>EH12_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-EH-012:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>128</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH12 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>EH22_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-EH-022:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>158</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH22 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>EH32_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-EH-032:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>188</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH32 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>EH42_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-EH-042:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>218</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH42 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>EH12</name>
+      <text>EH12_SP:</text>
+      <x>20</x>
+      <y>130</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>EH22</name>
+      <text>EH22_SP:</text>
+      <x>20</x>
+      <y>160</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>EH32</name>
+      <text>EH32_SP:</text>
+      <x>20</x>
+      <y>190</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>EH42</name>
+      <text>EH42_SP:</text>
+      <x>20</x>
+      <y>220</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>FPCEH_Title_2</name>
+      <class>HEADER2</class>
+      <text>WriteALL FPC 2 Heaters SP</text>
+      <x>7</x>
+      <y>15</y>
+      <width>279</width>
+      <height>31</height>
+      <font use_class="true">
+        <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>FPCEH_SP_ALL_2</name>
+      <text>SP:</text>
+      <x>20</x>
+      <y>64</y>
+      <width>50</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="spinner" version="2.0.0">
+      <name>FPCEH_SP_ALL_INP_2</name>
+      <pv_name>loc://FPC2_SP_ALL</pv_name>
+      <x>80</x>
+      <y>62</y>
+      <width>90</width>
+      <height>25</height>
+      <format>0</format>
+      <precision>2</precision>
+      <tooltip>ALL SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <increment>0.1</increment>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>FPCEH_Button_2</name>
+      <actions>
+      </actions>
+      <text>Write</text>
+      <x>184</x>
+      <y>62</y>
+      <width>80</width>
+      <height>25</height>
+      <tooltip>$(actions)</tooltip>
+      <confirm_message></confirm_message>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>SetPoint FLOW CONTROLLERS</name>
+    <x>333</x>
+    <y>349</y>
+    <width>333</width>
+    <height>299</height>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rect_Limits_Ttile_4</name>
+      <x>7</x>
+      <y>15</y>
+      <width>279</width>
+      <height>41</height>
+      <line_width>0</line_width>
+      <background_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="rectangle" version="2.0.0">
+      <name>Rect_Limits_Back_4</name>
+      <x>7</x>
+      <y>46</y>
+      <width>279</width>
+      <height>59</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>FCV11_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-FCV-011:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>128</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH12 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>FCV21_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-FCV-021:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>158</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH22 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>FCV31_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-FCV-031:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>188</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH32 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>FCV41_SP_FB</name>
+      <pv_name>TS2-010CRM:Cryo-FCV-041:FB_Setpoint</pv_name>
+      <x>149</x>
+      <y>218</y>
+      <width>111</width>
+      <height>25</height>
+      <precision>2</precision>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Feedback value EH42 SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>FCV11</name>
+      <text>FCV11_SP:</text>
+      <x>20</x>
+      <y>130</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>FCV21</name>
+      <text>FCV21_SP:</text>
+      <x>20</x>
+      <y>160</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>FCV31</name>
+      <text>FCV31_SP:</text>
+      <x>20</x>
+      <y>190</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>FCV41</name>
+      <text>FCV41_SP:</text>
+      <x>20</x>
+      <y>220</y>
+      <width>89</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>FLOW_Title</name>
+      <class>HEADER2</class>
+      <text>WriteALL FLOW SP</text>
+      <x>7</x>
+      <y>15</y>
+      <width>279</width>
+      <height>31</height>
+      <font use_class="true">
+        <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>FLOW_SP_ALL</name>
+      <text>SP:</text>
+      <x>20</x>
+      <y>64</y>
+      <width>50</width>
+      <foreground_color>
+        <color name="TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="spinner" version="2.0.0">
+      <name>FLOW_SP_ALL_INP</name>
+      <pv_name>loc://FLOW_SP_ALL</pv_name>
+      <x>80</x>
+      <y>62</y>
+      <width>90</width>
+      <height>25</height>
+      <format>0</format>
+      <precision>2</precision>
+      <tooltip>ALL SP</tooltip>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <increment>0.1</increment>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>FLOW_Button</name>
+      <actions>
+      </actions>
+      <text>Write</text>
+      <x>184</x>
+      <y>62</y>
+      <width>80</width>
+      <height>25</height>
+      <tooltip>$(actions)</tooltip>
+      <confirm_message></confirm_message>
+    </widget>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
index f353fd9cac64e1c3970c3b722d1ae492327123f0..147183fb4f15247a413bbd6041a2519063a152d7 100755
--- a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
@@ -3405,7 +3405,7 @@
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_20</name>
-    <text>version 2020-07-21 17:00</text>
+    <text>version 2020-07-27 09:00</text>
     <x>2287</x>
     <y>1303</y>
     <width>197</width>
@@ -3415,40 +3415,17 @@
       </color>
     </foreground_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>PSUScreen_Button_1</name>
-    <actions>
-      <action type="open_display">
-        <file>../ts2-tdk-lambda/ts2-ps.bob</file>
-        <macros>
-          <PLCName>TS2-010CRM:Cryo-PLC-001</PLCName>
-        </macros>
-        <target>standalone</target>
-        <description>Open Display</description>
-      </action>
-    </actions>
-    <text>PSU</text>
-    <x>1273</x>
-    <y>11</y>
-    <width>178</width>
-    <font>
-      <font family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <tooltip></tooltip>
-    <confirm_message></confirm_message>
-  </widget>
   <widget type="action_button" version="3.0.0">
     <name>ParamScreen_Butto</name>
     <actions>
       <action type="open_display">
-        <file>ChangeLimits.bob</file>
-        <target>standalone</target>
+        <file>TS2_menu.bob</file>
+        <target>window</target>
         <description>Open Display</description>
       </action>
     </actions>
-    <text>Limits</text>
-    <x>895</x>
+    <text>DEVICES MENU</text>
+    <x>897</x>
     <y>11</y>
     <width>178</width>
     <font>
@@ -3488,30 +3465,7 @@
       </action>
     </actions>
     <text>MODES</text>
-    <x>706</x>
-    <y>11</y>
-    <width>178</width>
-    <font>
-      <font family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <tooltip></tooltip>
-    <confirm_message></confirm_message>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>CABTRScreen_Button</name>
-    <actions>
-      <action type="open_display">
-        <file>cabtr/ts2-cabtrs.bob</file>
-        <macros>
-          <PLCName>TS2-010CRM:Cryo-PLC-001</PLCName>
-        </macros>
-        <target>window</target>
-        <description>Open Display</description>
-      </action>
-    </actions>
-    <text>CABTR</text>
-    <x>1084</x>
+    <x>1273</x>
     <y>11</y>
     <width>178</width>
     <font>
@@ -3550,7 +3504,7 @@
       </action>
     </actions>
     <text>CONTROLLERS</text>
-    <x>518</x>
+    <x>1085</x>
     <y>11</y>
     <width>178</width>
     <font>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/TS2_menu.bob b/NON-APPROVED/TS2/ts2-cryomodule/TS2_menu.bob
new file mode 100644
index 0000000000000000000000000000000000000000..c53bdd42251ccdacb1c500ecbe1225ae7d8ea60a
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-cryomodule/TS2_menu.bob
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Menu</name>
+  <width>250</width>
+  <height>300</height>
+  <widget type="rectangle" version="2.0.0">
+    <name>title-bar_3</name>
+    <width>290</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title_4</name>
+    <text>Menu</text>
+    <width>250</width>
+    <height>50</height>
+    <font>
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>CABTRScreen_Button</name>
+    <actions>
+      <action type="open_display">
+        <file>cabtr/ts2-cabtrs.bob</file>
+        <macros>
+          <PLCName>TS2-010CRM:Cryo-PLC-001</PLCName>
+        </macros>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>CABTR</text>
+    <x>30</x>
+    <y>60</y>
+    <width>178</width>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <tooltip></tooltip>
+    <confirm_message></confirm_message>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>PSUScreen_Button_1</name>
+    <actions>
+      <action type="open_display">
+        <file>../ts2-tdk-lambda/ts2-ps.bob</file>
+        <macros>
+          <PLCName>TS2-010CRM:Cryo-PLC-001</PLCName>
+        </macros>
+        <target>standalone</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>PSU</text>
+    <x>30</x>
+    <y>100</y>
+    <width>178</width>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <tooltip></tooltip>
+    <confirm_message></confirm_message>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>ParamScreen_Butto</name>
+    <actions>
+      <action type="open_display">
+        <file>ChangeLimits.bob</file>
+        <target>standalone</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>T Limits</text>
+    <x>30</x>
+    <y>180</y>
+    <width>178</width>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <tooltip></tooltip>
+    <confirm_message></confirm_message>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>ParamScreen_Butto_1</name>
+    <actions>
+      <action type="open_display">
+        <file>Device_group_settings.bob</file>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Device Groups</text>
+    <x>30</x>
+    <y>140</y>
+    <width>178</width>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </font>
+    <tooltip></tooltip>
+    <confirm_message></confirm_message>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/nightbutt.bob b/NON-APPROVED/TS2/ts2-cryomodule/nightbutt.bob
index 04d8eb3e57522481f2567b5e4842a2e96214aec3..f5cbe46d24c5c97d41ed76c88f144fbce55b9c04 100644
--- a/NON-APPROVED/TS2/ts2-cryomodule/nightbutt.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/nightbutt.bob
@@ -79,6 +79,26 @@
         <value>1</value>
         <description>CV 03 Manual</description>
       </action>
+      <action type="write_pv">
+        <pv_name>TS2-010CRM:Cryo-EH-010:Cmd_Manual</pv_name>
+        <value>1</value>
+        <description>EH 10 Manual</description>
+      </action>
+      <action type="write_pv">
+        <pv_name>TS2-010CRM:Cryo-EH-020:Cmd_Manual</pv_name>
+        <value>1</value>
+        <description>EH 20 Manual</description>
+      </action>
+      <action type="write_pv">
+        <pv_name>TS2-010CRM:Cryo-EH-030:Cmd_Manual</pv_name>
+        <value>1</value>
+        <description>EH 30 Manual</description>
+      </action>
+      <action type="write_pv">
+        <pv_name>TS2-010CRM:Cryo-EH-040:Cmd_Manual</pv_name>
+        <value>1</value>
+        <description>EH 40 Manual</description>
+      </action>
     </actions>
     <text>Day Mode</text>
     <x>35</x>
@@ -146,6 +166,26 @@
         <value>1</value>
         <description>EH 42 Auto</description>
       </action>
+      <action type="write_pv">
+        <pv_name>TS2-010CRM:Cryo-EH-010:Cmd_Auto</pv_name>
+        <value>1</value>
+        <description>EH 10 Auto</description>
+      </action>
+      <action type="write_pv">
+        <pv_name>TS2-010CRM:Cryo-EH-020:Cmd_Auto</pv_name>
+        <value>1</value>
+        <description>EH 20 Auto</description>
+      </action>
+      <action type="write_pv">
+        <pv_name>TS2-010CRM:Cryo-EH-030:Cmd_Auto</pv_name>
+        <value>1</value>
+        <description>EH 30 Auto</description>
+      </action>
+      <action type="write_pv">
+        <pv_name>TS2-010CRM:Cryo-EH-040:Cmd_Auto</pv_name>
+        <value>1</value>
+        <description>EH 40 Auto</description>
+      </action>
     </actions>
     <text>Night Mode</text>
     <x>35</x>