diff --git a/99-Shared/CryomoduleReady.bob b/99-Shared/CryomoduleReady.bob
index 7335ae11a642a1b7bee0b562cde029379bc94207..b54e6e7582886bff98860f739e051abfe2830694 100755
--- a/99-Shared/CryomoduleReady.bob
+++ b/99-Shared/CryomoduleReady.bob
@@ -68,195 +68,7 @@
             <x>8</x>
             <y>67</y>
             <width>1051</width>
-            <height>126</height>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_44</name>
-              <text>TS2-010CRM:WtrC-FT-527:MeasValue</text>
-              <x>320</x>
-              <y>5</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_41</name>
-              <pv_name>TS2-010CRM:WtrC-FT-527:MeasValue</pv_name>
-              <x>580</x>
-              <y>5</y>
-              <width>64</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_42</name>
-              <pv_name>TS2-010CRM:WtrC-FT-537:MeasValue</pv_name>
-              <x>580</x>
-              <y>25</y>
-              <width>64</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_45</name>
-              <text>TS2-010CRM:WtrC-FT-537:MeasValue</text>
-              <x>320</x>
-              <y>25</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_43</name>
-              <pv_name>TS2-010CRM:WtrC-FT-547:MeasValue</pv_name>
-              <x>580</x>
-              <y>45</y>
-              <width>64</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_46</name>
-              <text>TS2-010CRM:WtrC-FT-547:MeasValue</text>
-              <x>320</x>
-              <y>45</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_44</name>
-              <pv_name>TS2-010CRM:WtrC-FT-557:MeasValue</pv_name>
-              <x>580</x>
-              <y>65</y>
-              <width>64</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_47</name>
-              <text>TS2-010CRM:WtrC-FT-557:MeasValue</text>
-              <x>320</x>
-              <y>65</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_48</name>
-              <text>TS2-010CRM:WtrC-TE-525:MeasValue</text>
-              <x>690</x>
-              <y>5</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_45</name>
-              <pv_name>TS2-010CRM:WtrC-TE-525:MeasValue</pv_name>
-              <x>950</x>
-              <y>5</y>
-              <width>40</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_46</name>
-              <pv_name>TS2-010CRM:WtrC-TE-535:MeasValue</pv_name>
-              <x>950</x>
-              <y>25</y>
-              <width>40</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_49</name>
-              <text>TS2-010CRM:WtrC-TE-535:MeasValue</text>
-              <x>690</x>
-              <y>25</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_47</name>
-              <pv_name>TS2-010CRM:WtrC-TE-545:MeasValue</pv_name>
-              <x>950</x>
-              <y>45</y>
-              <width>40</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_50</name>
-              <text>TS2-010CRM:WtrC-TE-545:MeasValue</text>
-              <x>690</x>
-              <y>45</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_48</name>
-              <pv_name>TS2-010CRM:WtrC-TE-555:MeasValue</pv_name>
-              <x>950</x>
-              <y>65</y>
-              <width>40</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_51</name>
-              <text>TS2-010CRM:WtrC-TE-555:MeasValue</text>
-              <x>690</x>
-              <y>65</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>Label_41</name>
-              <text>C</text>
-              <x>992</x>
-              <y>5</y>
-              <width>10</width>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>Label_42</name>
-              <text>C</text>
-              <x>992</x>
-              <y>25</y>
-              <width>10</width>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>Label_43</name>
-              <text>C</text>
-              <x>992</x>
-              <y>45</y>
-              <width>10</width>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>Label_44</name>
-              <text>C</text>
-              <x>992</x>
-              <y>65</y>
-              <width>10</width>
-            </widget>
+            <height>177</height>
             <widget type="led" version="2.0.0">
               <name>Water_led1_3</name>
               <pv_name>TS2-010CRM::CondWtrCFlowOK</pv_name>
@@ -334,13 +146,496 @@
                 </color>
               </background_color>
             </widget>
+            <widget type="tabs" version="2.0.0">
+              <name>Tabs_3</name>
+              <tabs>
+                <tab>
+                  <name>Water Skid</name>
+                  <children>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_44</name>
+                      <text>TS2-010CRM:WtrC-FT-527:MeasValue</text>
+                      <x>8</x>
+                      <y>10</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_41</name>
+                      <pv_name>TS2-010CRM:WtrC-FT-527:MeasValue</pv_name>
+                      <x>268</x>
+                      <y>10</y>
+                      <width>64</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_42</name>
+                      <pv_name>TS2-010CRM:WtrC-FT-537:MeasValue</pv_name>
+                      <x>268</x>
+                      <y>30</y>
+                      <width>64</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_45</name>
+                      <text>TS2-010CRM:WtrC-FT-537:MeasValue</text>
+                      <x>8</x>
+                      <y>30</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_43</name>
+                      <pv_name>TS2-010CRM:WtrC-FT-547:MeasValue</pv_name>
+                      <x>268</x>
+                      <y>50</y>
+                      <width>64</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_46</name>
+                      <text>TS2-010CRM:WtrC-FT-547:MeasValue</text>
+                      <x>8</x>
+                      <y>50</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_44</name>
+                      <pv_name>TS2-010CRM:WtrC-FT-557:MeasValue</pv_name>
+                      <x>268</x>
+                      <y>70</y>
+                      <width>64</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_47</name>
+                      <text>TS2-010CRM:WtrC-FT-557:MeasValue</text>
+                      <x>8</x>
+                      <y>70</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_48</name>
+                      <text>TS2-010CRM:WtrC-TE-525:MeasValue</text>
+                      <x>378</x>
+                      <y>10</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_45</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-525:MeasValue</pv_name>
+                      <x>638</x>
+                      <y>10</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_46</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-535:MeasValue</pv_name>
+                      <x>638</x>
+                      <y>30</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_49</name>
+                      <text>TS2-010CRM:WtrC-TE-535:MeasValue</text>
+                      <x>378</x>
+                      <y>30</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_47</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-545:MeasValue</pv_name>
+                      <x>638</x>
+                      <y>50</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_50</name>
+                      <text>TS2-010CRM:WtrC-TE-545:MeasValue</text>
+                      <x>378</x>
+                      <y>50</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_48</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-555:MeasValue</pv_name>
+                      <x>638</x>
+                      <y>70</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_51</name>
+                      <text>TS2-010CRM:WtrC-TE-555:MeasValue</text>
+                      <x>378</x>
+                      <y>70</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_41</name>
+                      <text>C</text>
+                      <x>680</x>
+                      <y>10</y>
+                      <width>10</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_42</name>
+                      <text>C</text>
+                      <x>680</x>
+                      <y>30</y>
+                      <width>10</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_43</name>
+                      <text>C</text>
+                      <x>680</x>
+                      <y>50</y>
+                      <width>10</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_44</name>
+                      <text>C</text>
+                      <x>680</x>
+                      <y>70</y>
+                      <width>10</width>
+                    </widget>
+                  </children>
+                </tab>
+                <tab>
+                  <name>Water Flush</name>
+                  <children>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_72</name>
+                      <text>TS2-010CRM:WtrC-FIS-101:OK</text>
+                      <x>12</x>
+                      <y>19</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_5</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-101:FlowTooLow</pv_name>
+                      <x>234</x>
+                      <y>21</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_6</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-102:FlowTooLow</pv_name>
+                      <x>234</x>
+                      <y>43</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_7</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-103:FlowTooLow</pv_name>
+                      <x>234</x>
+                      <y>65</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_8</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-104:FlowTooLow</pv_name>
+                      <x>234</x>
+                      <y>87</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_73</name>
+                      <text>TS2-010CRM:WtrC-FIS-102:OK</text>
+                      <x>12</x>
+                      <y>41</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_74</name>
+                      <text>TS2-010CRM:WtrC-FIS-103:OK</text>
+                      <x>12</x>
+                      <y>63</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_75</name>
+                      <text>TS2-010CRM:WtrC-FIS-104:OK</text>
+                      <x>12</x>
+                      <y>84</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_76</name>
+                      <text>TS2-010CRM:WtrC-TE-101:MeasValue</text>
+                      <x>334</x>
+                      <y>19</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_77</name>
+                      <text>TS2-010CRM:WtrC-TE-102:MeasValue</text>
+                      <x>334</x>
+                      <y>41</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_78</name>
+                      <text>TS2-010CRM:WtrC-TE-103:MeasValue</text>
+                      <x>334</x>
+                      <y>63</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_79</name>
+                      <text>TS2-010CRM:WtrC-TE-104:MeasValue</text>
+                      <x>334</x>
+                      <y>84</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_69</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-101:MeasValue</pv_name>
+                      <x>618</x>
+                      <y>19</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_70</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-102:MeasValue</pv_name>
+                      <x>618</x>
+                      <y>40</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_71</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-103:MeasValue</pv_name>
+                      <x>618</x>
+                      <y>61</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_72</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-104:MeasValue</pv_name>
+                      <x>618</x>
+                      <y>84</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_45</name>
+                      <text>C</text>
+                      <x>658</x>
+                      <y>19</y>
+                      <width>10</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_62</name>
+                      <text>C</text>
+                      <x>658</x>
+                      <y>40</y>
+                      <width>10</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_63</name>
+                      <text>C</text>
+                      <x>658</x>
+                      <y>61</y>
+                      <width>10</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_64</name>
+                      <text>C</text>
+                      <x>658</x>
+                      <y>84</y>
+                      <width>10</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_65</name>
+                      <text>Low</text>
+                      <x>225</x>
+                      <width>40</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_67</name>
+                      <text>High</text>
+                      <x>269</x>
+                      <width>40</width>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_9</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-101:FlowTooHigh</pv_name>
+                      <x>265</x>
+                      <y>21</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_10</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-101:FlowTooHigh</pv_name>
+                      <x>265</x>
+                      <y>43</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_11</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-101:FlowTooHigh</pv_name>
+                      <x>265</x>
+                      <y>65</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_12</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-101:FlowTooHigh</pv_name>
+                      <x>265</x>
+                      <y>87</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                  </children>
+                </tab>
+              </tabs>
+              <x>310</x>
+              <width>700</width>
+              <height>138</height>
+              <active_tab>1</active_tab>
+            </widget>
           </widget>
           <widget type="group" version="2.0.0">
             <name>Cryo</name>
-            <x>9</x>
-            <y>183</y>
+            <x>8</x>
+            <y>241</y>
             <width>1051</width>
-            <height>280</height>
+            <height>263</height>
             <widget type="led" version="2.0.0">
               <name>Cryo_led1_6</name>
               <pv_name>TS2-010CRM::CondFPCTempOK</pv_name>
@@ -678,7 +973,7 @@
             <widget type="label" version="2.0.0">
               <name>Label_85</name>
               <text> FPC cryo temperature: &lt;              K  </text>
-              <y>8</y>
+              <y>21</y>
               <width>251</width>
               <height>27</height>
               <font>
@@ -764,195 +1059,7 @@
             <x>8</x>
             <y>67</y>
             <width>1051</width>
-            <height>126</height>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_24</name>
-              <text>TS2-010CRM:WtrC-FT-527:MeasValue</text>
-              <x>320</x>
-              <y>5</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_21</name>
-              <pv_name>TS2-010CRM:WtrC-FT-527:MeasValue</pv_name>
-              <x>580</x>
-              <y>5</y>
-              <width>64</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_22</name>
-              <pv_name>TS2-010CRM:WtrC-FT-537:MeasValue</pv_name>
-              <x>580</x>
-              <y>25</y>
-              <width>64</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_25</name>
-              <text>TS2-010CRM:WtrC-FT-537:MeasValue</text>
-              <x>320</x>
-              <y>25</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_23</name>
-              <pv_name>TS2-010CRM:WtrC-FT-547:MeasValue</pv_name>
-              <x>580</x>
-              <y>45</y>
-              <width>64</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_26</name>
-              <text>TS2-010CRM:WtrC-FT-547:MeasValue</text>
-              <x>320</x>
-              <y>45</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_24</name>
-              <pv_name>TS2-010CRM:WtrC-FT-557:MeasValue</pv_name>
-              <x>580</x>
-              <y>65</y>
-              <width>64</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_27</name>
-              <text>TS2-010CRM:WtrC-FT-557:MeasValue</text>
-              <x>320</x>
-              <y>65</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_28</name>
-              <text>TS2-010CRM:WtrC-TE-525:MeasValue</text>
-              <x>690</x>
-              <y>5</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_25</name>
-              <pv_name>TS2-010CRM:WtrC-TE-525:MeasValue</pv_name>
-              <x>950</x>
-              <y>5</y>
-              <width>40</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_26</name>
-              <pv_name>TS2-010CRM:WtrC-TE-535:MeasValue</pv_name>
-              <x>950</x>
-              <y>25</y>
-              <width>40</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_29</name>
-              <text>TS2-010CRM:WtrC-TE-535:MeasValue</text>
-              <x>690</x>
-              <y>25</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_27</name>
-              <pv_name>TS2-010CRM:WtrC-TE-545:MeasValue</pv_name>
-              <x>950</x>
-              <y>45</y>
-              <width>40</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_30</name>
-              <text>TS2-010CRM:WtrC-TE-545:MeasValue</text>
-              <x>690</x>
-              <y>45</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="textupdate" version="2.0.0">
-              <name>Text Update_28</name>
-              <pv_name>TS2-010CRM:WtrC-TE-555:MeasValue</pv_name>
-              <x>950</x>
-              <y>65</y>
-              <width>40</width>
-              <precision>2</precision>
-              <horizontal_alignment>2</horizontal_alignment>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>I3_label_text_31</name>
-              <text>TS2-010CRM:WtrC-TE-555:MeasValue</text>
-              <x>690</x>
-              <y>65</y>
-              <width>300</width>
-              <font>
-                <font family="Source Sans Pro" style="ITALIC" size="16.0">
-                </font>
-              </font>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>Label_21</name>
-              <text>C</text>
-              <x>992</x>
-              <y>5</y>
-              <width>10</width>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>Label_22</name>
-              <text>C</text>
-              <x>992</x>
-              <y>25</y>
-              <width>10</width>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>Label_23</name>
-              <text>C</text>
-              <x>992</x>
-              <y>45</y>
-              <width>10</width>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>Label_24</name>
-              <text>C</text>
-              <x>992</x>
-              <y>65</y>
-              <width>10</width>
-            </widget>
+            <height>174</height>
             <widget type="led" version="2.0.0">
               <name>Water_led1</name>
               <pv_name>TS2-010CRM::CondWtrCFlowOK</pv_name>
@@ -1030,13 +1137,496 @@
                 </color>
               </background_color>
             </widget>
+            <widget type="tabs" version="2.0.0">
+              <name>Tabs_2</name>
+              <tabs>
+                <tab>
+                  <name>Water Skid</name>
+                  <children>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_44</name>
+                      <text>TS2-010CRM:WtrC-FT-527:MeasValue</text>
+                      <x>8</x>
+                      <y>10</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_41</name>
+                      <pv_name>TS2-010CRM:WtrC-FT-527:MeasValue</pv_name>
+                      <x>268</x>
+                      <y>10</y>
+                      <width>64</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_42</name>
+                      <pv_name>TS2-010CRM:WtrC-FT-537:MeasValue</pv_name>
+                      <x>268</x>
+                      <y>30</y>
+                      <width>64</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_45</name>
+                      <text>TS2-010CRM:WtrC-FT-537:MeasValue</text>
+                      <x>8</x>
+                      <y>30</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_43</name>
+                      <pv_name>TS2-010CRM:WtrC-FT-547:MeasValue</pv_name>
+                      <x>268</x>
+                      <y>50</y>
+                      <width>64</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_46</name>
+                      <text>TS2-010CRM:WtrC-FT-547:MeasValue</text>
+                      <x>8</x>
+                      <y>50</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_44</name>
+                      <pv_name>TS2-010CRM:WtrC-FT-557:MeasValue</pv_name>
+                      <x>268</x>
+                      <y>70</y>
+                      <width>64</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_47</name>
+                      <text>TS2-010CRM:WtrC-FT-557:MeasValue</text>
+                      <x>8</x>
+                      <y>70</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_48</name>
+                      <text>TS2-010CRM:WtrC-TE-525:MeasValue</text>
+                      <x>378</x>
+                      <y>10</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_45</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-525:MeasValue</pv_name>
+                      <x>638</x>
+                      <y>10</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_46</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-535:MeasValue</pv_name>
+                      <x>638</x>
+                      <y>30</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_49</name>
+                      <text>TS2-010CRM:WtrC-TE-535:MeasValue</text>
+                      <x>378</x>
+                      <y>30</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_47</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-545:MeasValue</pv_name>
+                      <x>638</x>
+                      <y>50</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_50</name>
+                      <text>TS2-010CRM:WtrC-TE-545:MeasValue</text>
+                      <x>378</x>
+                      <y>50</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_48</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-555:MeasValue</pv_name>
+                      <x>638</x>
+                      <y>70</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_51</name>
+                      <text>TS2-010CRM:WtrC-TE-555:MeasValue</text>
+                      <x>378</x>
+                      <y>70</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_41</name>
+                      <text>C</text>
+                      <x>680</x>
+                      <y>10</y>
+                      <width>10</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_42</name>
+                      <text>C</text>
+                      <x>680</x>
+                      <y>30</y>
+                      <width>10</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_43</name>
+                      <text>C</text>
+                      <x>680</x>
+                      <y>50</y>
+                      <width>10</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_44</name>
+                      <text>C</text>
+                      <x>680</x>
+                      <y>70</y>
+                      <width>10</width>
+                    </widget>
+                  </children>
+                </tab>
+                <tab>
+                  <name>Water Flush</name>
+                  <children>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_72</name>
+                      <text>TS2-010CRM:WtrC-FIS-101:OK</text>
+                      <x>12</x>
+                      <y>19</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_5</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-101:FlowTooLow</pv_name>
+                      <x>234</x>
+                      <y>21</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_6</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-102:FlowTooLow</pv_name>
+                      <x>234</x>
+                      <y>43</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_7</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-103:FlowTooLow</pv_name>
+                      <x>234</x>
+                      <y>65</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_8</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-104:FlowTooLow</pv_name>
+                      <x>234</x>
+                      <y>87</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_73</name>
+                      <text>TS2-010CRM:WtrC-FIS-102:OK</text>
+                      <x>12</x>
+                      <y>41</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_74</name>
+                      <text>TS2-010CRM:WtrC-FIS-103:OK</text>
+                      <x>12</x>
+                      <y>63</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_75</name>
+                      <text>TS2-010CRM:WtrC-FIS-104:OK</text>
+                      <x>12</x>
+                      <y>84</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_76</name>
+                      <text>TS2-010CRM:WtrC-TE-101:MeasValue</text>
+                      <x>334</x>
+                      <y>19</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_77</name>
+                      <text>TS2-010CRM:WtrC-TE-102:MeasValue</text>
+                      <x>334</x>
+                      <y>41</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_78</name>
+                      <text>TS2-010CRM:WtrC-TE-103:MeasValue</text>
+                      <x>334</x>
+                      <y>63</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>I3_label_text_79</name>
+                      <text>TS2-010CRM:WtrC-TE-104:MeasValue</text>
+                      <x>334</x>
+                      <y>84</y>
+                      <width>300</width>
+                      <font>
+                        <font family="Source Sans Pro" style="ITALIC" size="16.0">
+                        </font>
+                      </font>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_69</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-101:MeasValue</pv_name>
+                      <x>618</x>
+                      <y>19</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_70</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-102:MeasValue</pv_name>
+                      <x>618</x>
+                      <y>40</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_71</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-103:MeasValue</pv_name>
+                      <x>618</x>
+                      <y>61</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="textupdate" version="2.0.0">
+                      <name>Text Update_72</name>
+                      <pv_name>TS2-010CRM:WtrC-TE-104:MeasValue</pv_name>
+                      <x>618</x>
+                      <y>84</y>
+                      <width>40</width>
+                      <precision>2</precision>
+                      <horizontal_alignment>2</horizontal_alignment>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_45</name>
+                      <text>C</text>
+                      <x>658</x>
+                      <y>19</y>
+                      <width>10</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_62</name>
+                      <text>C</text>
+                      <x>658</x>
+                      <y>40</y>
+                      <width>10</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_63</name>
+                      <text>C</text>
+                      <x>658</x>
+                      <y>61</y>
+                      <width>10</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_64</name>
+                      <text>C</text>
+                      <x>658</x>
+                      <y>84</y>
+                      <width>10</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_65</name>
+                      <text>Low</text>
+                      <x>225</x>
+                      <width>40</width>
+                    </widget>
+                    <widget type="label" version="2.0.0">
+                      <name>Label_67</name>
+                      <text>High</text>
+                      <x>269</x>
+                      <width>40</width>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_9</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-101:FlowTooHigh</pv_name>
+                      <x>265</x>
+                      <y>21</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_10</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-101:FlowTooHigh</pv_name>
+                      <x>265</x>
+                      <y>43</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_11</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-101:FlowTooHigh</pv_name>
+                      <x>265</x>
+                      <y>65</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                    <widget type="led" version="2.0.0">
+                      <name>Water_led1_12</name>
+                      <pv_name>TS2-010CRM:WtrC-FIS-101:FlowTooHigh</pv_name>
+                      <x>265</x>
+                      <y>87</y>
+                      <off_color>
+                        <color name="On" red="70" green="255" blue="70">
+                        </color>
+                      </off_color>
+                      <on_color>
+                        <color name="RED" red="252" green="13" blue="27">
+                        </color>
+                      </on_color>
+                    </widget>
+                  </children>
+                </tab>
+              </tabs>
+              <x>310</x>
+              <width>700</width>
+              <height>138</height>
+              <active_tab>1</active_tab>
+            </widget>
           </widget>
           <widget type="group" version="2.0.0">
             <name>Cryo</name>
-            <x>9</x>
-            <y>183</y>
+            <x>8</x>
+            <y>231</y>
             <width>1051</width>
-            <height>280</height>
+            <height>273</height>
             <widget type="led" version="2.0.0">
               <name>Cryo_led1_2</name>
               <pv_name>TS2-010CRM::CondFPCTempOK</pv_name>
@@ -2058,7 +2648,7 @@ AND Level &gt; 84%</text>
     <x>10</x>
     <y>60</y>
     <width>1070</width>
-    <height>510</height>
+    <height>540</height>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>ColdCond</name>
@@ -2173,4 +2763,28 @@ AND Level &gt; 84%</text>
     <tooltip></tooltip>
     <confirm_message></confirm_message>
   </widget>
+  <widget type="choice" version="2.0.0">
+    <name>Choice Button</name>
+    <pv_name>TS2-010CRM::writeDI_Others_005</pv_name>
+    <x>680</x>
+    <y>54</y>
+    <width>230</width>
+    <height>30</height>
+    <items>
+      <item>Water Skid</item>
+      <item>Water Flush</item>
+    </items>
+    <items_from_pv>false</items_from_pv>
+  </widget>
+  <widget type="choice" version="2.0.0">
+    <name>Choice Button_1</name>
+    <x>360</x>
+    <y>610</y>
+    <width>0</width>
+    <height>0</height>
+    <items>
+      <item>Item 1</item>
+      <item>Item 2</item>
+    </items>
+  </widget>
 </display>