diff --git a/10-Top/OSP230.bob b/10-Top/OSP230.bob
index cf0667e28ef872ca5250f53d922d669007d5856d..3391d7c14ebc9595b937ca50df8be23b970d8635 100755
--- a/10-Top/OSP230.bob
+++ b/10-Top/OSP230.bob
@@ -62,7 +62,7 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey01-background</name>
     <x>20</x>
-    <y>170</y>
+    <y>110</y>
     <width>170</width>
     <height>460</height>
     <line_width>2</line_width>
@@ -81,7 +81,7 @@
     <name>F01-M01-K11-RB</name>
     <pv_name>$(P)$(R)F01M01K11-RB</pv_name>
     <x>30</x>
-    <y>310</y>
+    <y>250</y>
     <width>150</width>
     <height>80</height>
     <foreground_color>
@@ -111,7 +111,7 @@
     <name>Label</name>
     <text>Pt1 (NC)</text>
     <x>30</x>
-    <y>340</y>
+    <y>280</y>
     <width>60</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -126,7 +126,7 @@
     <class>CAPTION</class>
     <text>PM01:</text>
     <x>30</x>
-    <y>400</y>
+    <y>340</y>
     <width>60</width>
     <height>30</height>
     <foreground_color use_class="true">
@@ -143,7 +143,7 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey01-background</name>
     <x>20</x>
-    <y>70</y>
+    <y>580</y>
     <width>740</width>
     <height>50</height>
     <line_width>2</line_width>
@@ -162,7 +162,7 @@
     <name>Text Update</name>
     <pv_name>$(P)$(R)Manufactor-RB</pv_name>
     <x>420</x>
-    <y>80</y>
+    <y>590</y>
     <width>330</width>
     <height>30</height>
     <format>6</format>
@@ -182,7 +182,7 @@
     <class>CAPTION</class>
     <text>Preset:</text>
     <x>30</x>
-    <y>80</y>
+    <y>590</y>
     <width>60</width>
     <height>30</height>
     <foreground_color use_class="true">
@@ -204,7 +204,7 @@
     <class>CAPTION</class>
     <text>Status:</text>
     <x>200</x>
-    <y>80</y>
+    <y>590</y>
     <width>60</width>
     <height>30</height>
     <foreground_color use_class="true">
@@ -225,7 +225,7 @@
     </actions>
     <pv_name>$(P)$(R)Reset</pv_name>
     <x>100</x>
-    <y>80</y>
+    <y>590</y>
     <background_color>
       <color name="BLUE-BORDER" red="47" green="135" blue="148">
       </color>
@@ -236,7 +236,7 @@
     <name>Text Entry</name>
     <pv_name>$(P)$(R)Connected-RB</pv_name>
     <x>270</x>
-    <y>80</y>
+    <y>590</y>
     <height>30</height>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
@@ -254,7 +254,7 @@
     <name>LED</name>
     <pv_name>$(P)$(R)Connected-RB</pv_name>
     <x>385</x>
-    <y>85</y>
+    <y>595</y>
     <off_color>
       <color name="ERROR" red="252" green="13" blue="27">
       </color>
@@ -269,7 +269,7 @@
     <class>HEADER2</class>
     <text>K11</text>
     <x>20</x>
-    <y>120</y>
+    <y>60</y>
     <width>170</width>
     <height>50</height>
     <font use_class="true">
@@ -284,7 +284,7 @@
     <class>HEADER2</class>
     <text>K12</text>
     <x>210</x>
-    <y>120</y>
+    <y>60</y>
     <width>170</width>
     <height>50</height>
     <font use_class="true">
@@ -297,7 +297,7 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey01-background</name>
     <x>210</x>
-    <y>170</y>
+    <y>110</y>
     <width>170</width>
     <height>460</height>
     <line_width>2</line_width>
@@ -316,7 +316,7 @@
     <name>F01-M01-K12-RB</name>
     <pv_name>$(P)$(R)F01M01K12-RB</pv_name>
     <x>220</x>
-    <y>310</y>
+    <y>250</y>
     <width>150</width>
     <height>80</height>
     <foreground_color>
@@ -346,7 +346,7 @@
     <name>Label</name>
     <text>Pt2 (NC)</text>
     <x>220</x>
-    <y>340</y>
+    <y>280</y>
     <width>60</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -356,7 +356,7 @@
     <name>Label</name>
     <text>Pt1</text>
     <x>100</x>
-    <y>400</y>
+    <y>340</y>
     <width>80</width>
     <height>30</height>
     <font>
@@ -388,7 +388,7 @@
     <class>CAPTION</class>
     <text>PM02:</text>
     <x>220</x>
-    <y>400</y>
+    <y>340</y>
     <width>60</width>
     <height>30</height>
     <foreground_color use_class="true">
@@ -405,7 +405,7 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey01-background</name>
     <x>400</x>
-    <y>170</y>
+    <y>110</y>
     <width>170</width>
     <height>460</height>
     <line_width>2</line_width>
@@ -425,7 +425,7 @@
     <class>HEADER2</class>
     <text>K13</text>
     <x>400</x>
-    <y>120</y>
+    <y>60</y>
     <width>170</width>
     <height>50</height>
     <font use_class="true">
@@ -440,7 +440,7 @@
     <class>CAPTION</class>
     <text>PM03:</text>
     <x>410</x>
-    <y>400</y>
+    <y>340</y>
     <width>60</width>
     <height>30</height>
     <foreground_color use_class="true">
@@ -458,7 +458,7 @@
     <name>F01-M01-K13-RB</name>
     <pv_name>$(P)$(R)F01M01K13-RB</pv_name>
     <x>410</x>
-    <y>310</y>
+    <y>250</y>
     <width>150</width>
     <height>80</height>
     <foreground_color>
@@ -488,7 +488,7 @@
     <name>Label</name>
     <text>Pt3 (NC)</text>
     <x>410</x>
-    <y>340</y>
+    <y>280</y>
     <width>60</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -499,7 +499,7 @@
     <class>HEADER2</class>
     <text>K14</text>
     <x>590</x>
-    <y>120</y>
+    <y>60</y>
     <width>170</width>
     <height>50</height>
     <font use_class="true">
@@ -512,7 +512,7 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey01-background</name>
     <x>590</x>
-    <y>170</y>
+    <y>110</y>
     <width>170</width>
     <height>460</height>
     <line_width>2</line_width>
@@ -532,7 +532,7 @@
     <class>CAPTION</class>
     <text>PM04:</text>
     <x>600</x>
-    <y>400</y>
+    <y>340</y>
     <width>60</width>
     <height>30</height>
     <foreground_color use_class="true">
@@ -550,7 +550,7 @@
     <name>F01-M01-K14-RB</name>
     <pv_name>$(P)$(R)F01M01K14-RB</pv_name>
     <x>600</x>
-    <y>310</y>
+    <y>250</y>
     <width>150</width>
     <height>80</height>
     <foreground_color>
@@ -580,7 +580,7 @@
     <name>Label</name>
     <text>Pt4 (NC)</text>
     <x>600</x>
-    <y>340</y>
+    <y>280</y>
     <width>60</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -590,7 +590,7 @@
     <name>Label</name>
     <text>Pt2</text>
     <x>290</x>
-    <y>400</y>
+    <y>340</y>
     <width>80</width>
     <height>30</height>
     <font>
@@ -621,7 +621,7 @@
     <name>Label</name>
     <text>Pt3</text>
     <x>480</x>
-    <y>400</y>
+    <y>340</y>
     <width>80</width>
     <height>30</height>
     <font>
@@ -652,7 +652,7 @@
     <name>Label</name>
     <text>Pt4</text>
     <x>670</x>
-    <y>400</y>
+    <y>340</y>
     <width>80</width>
     <height>30</height>
     <font>
@@ -682,7 +682,7 @@
   <widget type="group" version="2.0.0">
     <name>F01M02-K11</name>
     <x>30</x>
-    <y>175</y>
+    <y>115</y>
     <width>150</width>
     <height>165</height>
     <style>3</style>
@@ -756,9 +756,9 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Pf4</text>
-      <x>55</x>
-      <width>40</width>
+      <text>Pf4 (NO)</text>
+      <x>45</x>
+      <width>60</width>
       <height>30</height>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
@@ -769,10 +769,10 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>S10</text>
+      <text>S10 (NO)</text>
       <x>80</x>
       <y>135</y>
-      <width>40</width>
+      <width>60</width>
       <height>30</height>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
@@ -797,7 +797,7 @@
   <widget type="group" version="2.0.0">
     <name>F01M02-K12</name>
     <x>220</x>
-    <y>175</y>
+    <y>115</y>
     <width>150</width>
     <height>165</height>
     <style>3</style>
@@ -824,10 +824,10 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>S20</text>
+      <text>S20 (NO)</text>
       <x>80</x>
       <y>135</y>
-      <width>40</width>
+      <width>60</width>
       <height>30</height>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
@@ -889,9 +889,9 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Pr4</text>
-      <x>55</x>
-      <width>40</width>
+      <text>Pr4 (NO)</text>
+      <x>45</x>
+      <width>60</width>
       <height>30</height>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
@@ -900,7 +900,7 @@
   <widget type="group" version="2.0.0">
     <name>F01M02-K13</name>
     <x>410</x>
-    <y>175</y>
+    <y>115</y>
     <width>150</width>
     <height>165</height>
     <style>3</style>
@@ -927,10 +927,10 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>S30</text>
+      <text>S30 (NO)</text>
       <x>80</x>
       <y>135</y>
-      <width>40</width>
+      <width>60</width>
       <height>30</height>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
@@ -992,9 +992,9 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Pf2</text>
-      <x>54</x>
-      <width>40</width>
+      <text>Pf2 (NO)</text>
+      <x>45</x>
+      <width>60</width>
       <height>30</height>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
@@ -1003,7 +1003,7 @@
   <widget type="group" version="2.0.0">
     <name>F01M02-K14</name>
     <x>600</x>
-    <y>175</y>
+    <y>115</y>
     <width>150</width>
     <height>165</height>
     <style>3</style>
@@ -1030,10 +1030,10 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>S40</text>
+      <text>S40 (NO)</text>
       <x>80</x>
       <y>135</y>
-      <width>40</width>
+      <width>60</width>
       <height>30</height>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
@@ -1095,9 +1095,9 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Pr2</text>
-      <x>55</x>
-      <width>40</width>
+      <text>Pr2 (NO)</text>
+      <x>45</x>
+      <width>60</width>
       <height>30</height>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
@@ -1106,7 +1106,7 @@
   <widget type="group" version="2.0.0">
     <name>F01M01</name>
     <x>20</x>
-    <y>450</y>
+    <y>390</y>
     <width>170</width>
     <height>80</height>
     <transparent>true</transparent>
@@ -1126,7 +1126,7 @@
   <widget type="group" version="2.0.0">
     <name>F01M02</name>
     <x>20</x>
-    <y>540</y>
+    <y>480</y>
     <width>170</width>
     <height>80</height>
     <transparent>true</transparent>
@@ -1146,7 +1146,7 @@
   <widget type="group" version="2.0.0">
     <name>F01M01</name>
     <x>210</x>
-    <y>450</y>
+    <y>390</y>
     <width>170</width>
     <height>80</height>
     <transparent>true</transparent>
@@ -1166,7 +1166,7 @@
   <widget type="group" version="2.0.0">
     <name>F01M02</name>
     <x>210</x>
-    <y>540</y>
+    <y>480</y>
     <width>170</width>
     <height>80</height>
     <transparent>true</transparent>
@@ -1186,7 +1186,7 @@
   <widget type="group" version="2.0.0">
     <name>F01M01</name>
     <x>400</x>
-    <y>450</y>
+    <y>390</y>
     <width>170</width>
     <height>80</height>
     <transparent>true</transparent>
@@ -1206,7 +1206,7 @@
   <widget type="group" version="2.0.0">
     <name>F01M02</name>
     <x>400</x>
-    <y>540</y>
+    <y>480</y>
     <width>170</width>
     <height>80</height>
     <transparent>true</transparent>
@@ -1226,7 +1226,7 @@
   <widget type="group" version="2.0.0">
     <name>F01M01</name>
     <x>590</x>
-    <y>450</y>
+    <y>390</y>
     <width>170</width>
     <height>80</height>
     <transparent>true</transparent>
@@ -1246,7 +1246,7 @@
   <widget type="group" version="2.0.0">
     <name>F01M02</name>
     <x>590</x>
-    <y>540</y>
+    <y>480</y>
     <width>170</width>
     <height>80</height>
     <transparent>true</transparent>
diff --git a/99-Shared/embedded/calibration.bob b/99-Shared/embedded/calibration.bob
index 33e2d3f67af2c342df650d8bc3d3907aec391494..6f17844c2e214f6554e887a55072fa0973ec2758 100755
--- a/99-Shared/embedded/calibration.bob
+++ b/99-Shared/embedded/calibration.bob
@@ -1,165 +1,199 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>Calibration</name>
-  <width>1230</width>
-  <height>650</height>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey01-background</name>
-    <x>10</x>
+  <width>1220</width>
+  <height>540</height>
+  <widget type="group" version="2.0.0">
+    <name>cable attenuation</name>
+    <x>700</x>
     <y>10</y>
-    <width>1210</width>
-    <height>630</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_width>10</corner_width>
-    <corner_height>10</corner_height>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey01-background</name>
-    <x>20</x>
-    <y>60</y>
-    <width>650</width>
-    <height>460</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="BACKGROUND" red="220" green="225" blue="221">
-      </color>
-    </background_color>
-    <corner_width>5</corner_width>
-    <corner_height>5</corner_height>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey01-background</name>
-    <x>680</x>
-    <y>370</y>
-    <width>530</width>
-    <height>260</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="BACKGROUND" red="220" green="225" blue="221">
-      </color>
-    </background_color>
-    <corner_width>5</corner_width>
-    <corner_height>5</corner_height>
+    <width>510</width>
+    <height>290</height>
+    <transparent>true</transparent>
+    <widget type="table" version="2.0.0">
+      <name>Table</name>
+      <x>10</x>
+      <y>20</y>
+      <width>450</width>
+      <height>220</height>
+      <columns>
+        <column>
+          <name>Column1</name>
+          <width>120</width>
+          <editable>false</editable>
+        </column>
+      </columns>
+      <scripts>
+        <script file="EmbeddedPy" check_connections="false">
+          <text><![CDATA[# Embedded python script
+import math
+from org.csstudio.display.builder.runtime.script import PVUtil,ScriptUtil
+from org.csstudio.display.builder.model.properties import WidgetColor
+
+# Configure table widget
+# 1.Headers
+# 2.ColumnWidth 
+TableHeader=['Title','Pt','Pfwd','Prefl']
+widget.setHeaders(TableHeader)
+for i in range(0,len(TableHeader)):
+	widget.setColumnWidth(i,100)
+cavname=['Cavity 1','Cavity 2','Cavity 3','Cavity 4']
+
+# get cable mode
+cablemode=PVUtil.getDouble(pvs[0])
+
+if cablemode is not None and not math.isnan(cablemode):
+	warm_cable=PVUtil.getDoubleArray(pvs[1])
+	if warm_cable is not None:
+		data=[]
+	#---------------------All Cavities Pt-----------------------#
+		if cablemode==0:
+			for i in range(0,len(cavname)):
+				dataset=[cavname[i],"{:.3f}".format(warm_cable[i*3]),'X','X']
+				data.append(dataset)
+			for i in range(0,len(cavname)):
+				for j in range(0,len(TableHeader)):
+					widget.setCellColor(i,j,WidgetColor(255,255,255))
+			for i in range(0,len(cavname)):
+				widget.setCellColor(i,1,WidgetColor(0,125,0))
+	#---------------------Single Cavity-----------------------#
+		else:
+			for i in range(0,len(cavname)):
+				dataset=[cavname[i],"{:.3f}".format(warm_cable[i*3]),"{:.3f}".format(warm_cable[i*3+1]),"{:.3f}".format(warm_cable[i*3+2])]
+				data.append(dataset)
+			for i in range(0,len(cavname)):
+				for j in range(0,len(TableHeader)):
+	        			widget.setCellColor(i,j,WidgetColor(255,255,255))
+			for i in range(0,len(TableHeader)):
+				widget.setCellColor(int(cablemode)-1,i,WidgetColor(0,125,0))
+
+		# Write to Table widget
+		widget.setValue(data)]]></text>
+          <pv_name>$(P)$(CAL)CableMode</pv_name>
+          <pv_name trigger="false">$(P)$(CAL)WarmCableAtt</pv_name>
+        </script>
+      </scripts>
+      <editable>false</editable>
+    </widget>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <class>HEADER2</class>
-    <text>Cold Configuration</text>
+  <widget type="group" version="2.0.0">
+    <name>cold calibration</name>
     <x>700</x>
-    <y>370</y>
-    <width>500</width>
-    <height>50</height>
-    <font use_class="true">
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Entry</name>
-    <pv_name>loc://filename("")</pv_name>
-    <x>690</x>
-    <y>420</y>
-    <width>340</width>
-    <height>70</height>
-  </widget>
-  <widget type="fileselector" version="2.0.0">
-    <name>File Selector</name>
-    <pv_name>loc://filename("")</pv_name>
-    <x>1040</x>
-    <y>420</y>
-    <height>30</height>
-  </widget>
-  <widget type="table" version="2.0.0">
-    <name>Table</name>
-    <x>690</x>
-    <y>500</y>
+    <y>310</y>
     <width>510</width>
-    <height>120</height>
-    <columns>
-      <column>
-        <name>Column1</name>
-        <width>120</width>
-        <editable>false</editable>
-      </column>
-    </columns>
-    <scripts>
-      <script file="EmbeddedPy" check_connections="false">
-        <text><![CDATA[# Embedded python script
+    <height>220</height>
+    <widget type="table" version="2.0.0">
+      <name>Table</name>
+      <x>10</x>
+      <y>20</y>
+      <width>450</width>
+      <height>150</height>
+      <columns>
+        <column>
+          <name>Column1</name>
+          <width>120</width>
+          <editable>false</editable>
+        </column>
+      </columns>
+      <scripts>
+        <script file="EmbeddedPy" check_connections="false">
+          <text><![CDATA[# Embedded python script
 from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
 from org.csstudio.display.builder.model.properties import WidgetColor
 
 # Configure table widget
 # 1.Headers
 # 2.ColumnWidth
-TableHeaders=['','Cavity 1','Cavity 2','Cavity 3','Cavity 4']
+TableHeaders=['Title','Cav1','Cav2','Cav3','Cav4']
 widget.setHeaders(TableHeaders)
 for i in range(0,len(TableHeaders)):
-	if i == 0:
-		widget.setColumnWidth(i,50)
-	else:
+	if i==0:
 		widget.setColumnWidth(i,100)
+	else:
+		widget.setColumnWidth(i,75)
 
-# fetch data
+# get data
 att=PVUtil.getDoubleArray(pvs[0])
 kt=PVUtil.getDoubleArray(pvs[1])
 
-# build list
-value=[['att',"{:.3f}".format(att[0]),"{:.3f}".format(att[1]),"{:.3f}".format(att[2]),"{:.3f}".format(att[3])],
-		['kt',"{:.3f}".format(kt[0]),"{:.3f}".format(kt[1]),"{:.3f}".format(kt[2]),"{:.3f}".format(kt[3])]]
+if att is not None and kt is not None:
+	data=[['Cold Att',"{:.3f}".format(att[0]),"{:.3f}".format(att[1]),"{:.3f}".format(att[2]),"{:.3f}".format(att[3])],
+		['Cavity kt',"{:.3f}".format(kt[0]),"{:.3f}".format(kt[1]),"{:.3f}".format(kt[2]),"{:.3f}".format(kt[3])]]
 
-for i in range(0,1):
-	for j in range(0,len(TableHeaders)):
-		widget.setCellColor(i,j,WidgetColor(255,255,255))
+	for i in range(0,1):
+		for j in range(0,len(TableHeaders)):
+			widget.setCellColor(i,j,WidgetColor(255,255,255))
 
-# Write to Table widget
-widget.setValue(value)]]></text>
-        <pv_name>$(P)$(CAL)ColdCableAtt</pv_name>
-        <pv_name>$(P)$(CAL)CavityKt</pv_name>
-      </script>
-    </scripts>
-    <editable>false</editable>
+	# Write to Table widget
+	widget.setValue(data)]]></text>
+          <pv_name>$(P)$(CAL)ColdCableAtt</pv_name>
+          <pv_name>$(P)$(CAL)CavityKt</pv_name>
+        </script>
+      </scripts>
+      <editable>false</editable>
+    </widget>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button</name>
-    <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
-        <description>Load Data</description>
-      </action>
-    </actions>
-    <pv_name>loc://Load(0)</pv_name>
-    <x>1090</x>
-    <y>420</y>
-    <scripts>
-      <script file="EmbeddedPy" check_connections="false">
-        <text><![CDATA[# Embedded python script
+  <widget type="group" version="2.0.0">
+    <name>configuration settings</name>
+    <x>10</x>
+    <y>10</y>
+    <width>690</width>
+    <transparent>true</transparent>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <class>CAPTION</class>
+      <text>cable mode:</text>
+      <x>20</x>
+      <y>20</y>
+      <height>30</height>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment use_class="true">2</horizontal_alignment>
+      <vertical_alignment use_class="true">1</vertical_alignment>
+    </widget>
+    <widget type="combo" version="2.0.0">
+      <name>Combo Box</name>
+      <pv_name>$(P)$(CAL)CableMode</pv_name>
+      <x>124</x>
+      <y>20</y>
+      <width>130</width>
+    </widget>
+    <widget type="fileselector" version="2.0.0">
+      <name>File Selector</name>
+      <pv_name>$(P)$(CAL)BaseName</pv_name>
+      <component>2</component>
+      <x>70</x>
+      <y>70</y>
+      <height>30</height>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+          <description>Load Data</description>
+        </action>
+      </actions>
+      <pv_name>loc://Load(0)</pv_name>
+      <x>125</x>
+      <y>70</y>
+      <width>130</width>
+      <scripts>
+        <script file="EmbeddedPy" check_connections="false">
+          <text><![CDATA[# Embedded python script
 from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
 from jarray import array
 import csv
+import os
 
 trigger=PVUtil.getLong(pvs[0])
-if trigger == 1:
-	file_name=PVUtil.getString(pvs[1])
-	csvFile=open(file_name,'r')
+if trigger==1:
+	filename=PVUtil.getString(pvs[1])
+	fullname=os.path.join('/nfs/Nextcloud/LCR/muyuan/calibration',filename)
+	csvFile=open(fullname,'r')
 	data1=[]
 	data2=[]
 	for index, row in enumerate(csv.reader(csvFile)):
@@ -171,157 +205,91 @@ if trigger == 1:
 	pvs[2].setValue(array(data1, 'd')) 
 	pvs[3].setValue(array(data2, 'd'))
 
-elif trigger == 0:
+elif trigger==0:
 	pass
 
 # local trigger back to 0
 pvs[0].setValue(0)]]></text>
-        <pv_name>loc://Load(0)</pv_name>
-        <pv_name trigger="false">loc://filename("")</pv_name>
-        <pv_name trigger="false">$(P)$(CAL)ColdCableAtt</pv_name>
-        <pv_name trigger="false">$(P)$(CAL)CavityKt</pv_name>
-      </script>
-    </scripts>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button</name>
-    <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
-        <description>Commit</description>
-      </action>
-    </actions>
-    <pv_name>$(P)$(CAL)ColdCommit</pv_name>
-    <x>1040</x>
-    <y>460</y>
-    <width>120</width>
-    <font>
-      <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
-      </font>
-    </font>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED</name>
-    <pv_name>$(P)$(CAL)ColdState</pv_name>
-    <x>1170</x>
-    <y>465</y>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <class>HEADER2</class>
-    <text>R&amp;S OSP230</text>
-    <x>30</x>
-    <y>60</y>
-    <width>630</width>
-    <height>50</height>
-    <font use_class="true">
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="meter" version="3.0.0">
-    <name>F01-M01-K11-RB</name>
-    <pv_name>$(P)$(R)F01M01K11-RB</pv_name>
-    <x>30</x>
-    <y>245</y>
-    <width>150</width>
-    <height>80</height>
-    <foreground_color>
-      <color name="Background" red="220" green="225" blue="221">
-      </color>
-    </foreground_color>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="20.0">
+          <pv_name>loc://Load(0)</pv_name>
+          <pv_name trigger="false">$(P)$(CAL)BaseName</pv_name>
+          <pv_name trigger="false">$(P)$(CAL)ColdCableAtt</pv_name>
+          <pv_name trigger="false">$(P)$(CAL)CavityKt</pv_name>
+        </script>
+      </scripts>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+          <description>warm commit</description>
+        </action>
+      </actions>
+      <pv_name>$(P)$(CAL)WarmCommit</pv_name>
+      <x>440</x>
+      <y>20</y>
+      <width>150</width>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
+        </font>
       </font>
-    </font>
-    <show_value>false</show_value>
-    <show_units>false</show_units>
-    <show_limits>false</show_limits>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <limits_from_pv>false</limits_from_pv>
-    <maximum>2.0</maximum>
-    <needle_color>
-      <color name="GREEN-BORDER" red="40" green="140" blue="40">
-      </color>
-    </needle_color>
-    <knob_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </knob_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Pt1</text>
-    <x>100</x>
-    <y>350</y>
-    <width>80</width>
-    <height>30</height>
-    <font>
-      <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED</name>
+      <pv_name>$(P)$(CAL)WarmState</pv_name>
+      <x>611</x>
+      <y>25</y>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+          <description>cold commit</description>
+        </action>
+      </actions>
+      <pv_name>$(P)$(CAL)ColdCommit</pv_name>
+      <x>440</x>
+      <y>70</y>
+      <width>150</width>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
+        </font>
       </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <rules>
-      <rule name="Text" prop_id="text" out_exp="false">
-        <exp bool_exp="(pv0 == 1 and pv1 == 0)">
-          <value>Pf3</value>
-        </exp>
-        <exp bool_exp="(pv0 == 1 and pv1 == 1)">
-          <value>Pf4</value>
-        </exp>
-        <pv_name>$(P)$(R)F01M01K11-RB</pv_name>
-        <pv_name>$(P)$(R)F01M02K11-RB</pv_name>
-      </rule>
-    </rules>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="GRAY-BORDER" red="121" green="121" blue="121">
-      </color>
-    </border_color>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED</name>
+      <pv_name>$(P)$(CAL)ColdState</pv_name>
+      <x>611</x>
+      <y>75</y>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Entry</name>
+      <pv_name>$(P)$(CAL)BaseName</pv_name>
+      <x>20</x>
+      <y>120</y>
+      <width>610</width>
+      <height>40</height>
+      <format>6</format>
+    </widget>
   </widget>
   <widget type="group" version="2.0.0">
-    <name>F01M02-K11</name>
-    <x>30</x>
-    <y>110</y>
-    <width>150</width>
-    <height>165</height>
-    <style>3</style>
+    <name>osp230</name>
+    <x>10</x>
+    <y>210</y>
+    <width>690</width>
+    <height>320</height>
     <transparent>true</transparent>
-    <rules>
-      <rule name="Visible" prop_id="visible" out_exp="false">
-        <exp bool_exp="pv0 == 0">
-          <value>false</value>
-        </exp>
-        <pv_name>$(P)$(R)F01M01K11-RB</pv_name>
-      </rule>
-    </rules>
-    <widget type="polyline" version="2.0.0">
-      <name>Polyline</name>
-      <x>75</x>
-      <y>83</y>
-      <width>1</width>
-      <height>70</height>
-      <points>
-        <point x="0.0" y="0.0">
-        </point>
-        <point x="0.0" y="70.0">
-        </point>
-      </points>
-      <line_color>
-        <color name="BLACK" red="0" green="0" blue="0">
-        </color>
-      </line_color>
-    </widget>
     <widget type="meter" version="3.0.0">
-      <name>F01-M02-K11-RB</name>
-      <pv_name>$(P)$(R)F01M02K11-RB</pv_name>
-      <y>10</y>
+      <name>F01-M01-K11-RB</name>
+      <pv_name>$(P)$(R)F01M01K11-RB</pv_name>
+      <x>10</x>
+      <y>150</y>
       <width>150</width>
       <height>80</height>
       <foreground_color>
@@ -349,25 +317,150 @@ pvs[0].setValue(0)]]></text>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Pf3 (NC)</text>
-      <y>40</y>
-      <width>60</width>
+      <text>Pt1</text>
+      <x>90</x>
+      <y>240</y>
+      <width>70</width>
       <height>30</height>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
+        </font>
+      </font>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
+      <rules>
+        <rule name="Text" prop_id="text" out_exp="false">
+          <exp bool_exp="(pv0 == 1 and pv1 == 0)">
+            <value>Pf3</value>
+          </exp>
+          <exp bool_exp="(pv0 == 1 and pv1 == 1)">
+            <value>Pf4</value>
+          </exp>
+          <pv_name>$(P)$(R)F01M01K11-RB</pv_name>
+          <pv_name>$(P)$(R)F01M02K11-RB</pv_name>
+        </rule>
+      </rules>
+      <border_width>2</border_width>
       <border_color>
         <color name="GRAY-BORDER" red="121" green="121" blue="121">
         </color>
       </border_color>
     </widget>
+    <widget type="group" version="2.0.0">
+      <name>F01M02-K11</name>
+      <x>10</x>
+      <y>15</y>
+      <width>150</width>
+      <height>165</height>
+      <style>3</style>
+      <transparent>true</transparent>
+      <rules>
+        <rule name="visible" prop_id="visible" out_exp="false">
+          <exp bool_exp="pv0 == 0">
+            <value>false</value>
+          </exp>
+          <pv_name>$(P)$(R)F01M01K11-RB</pv_name>
+        </rule>
+      </rules>
+      <widget type="polyline" version="2.0.0">
+        <name>Polyline</name>
+        <x>75</x>
+        <y>83</y>
+        <width>1</width>
+        <height>70</height>
+        <points>
+          <point x="0.0" y="0.0">
+          </point>
+          <point x="0.0" y="70.0">
+          </point>
+        </points>
+        <line_color>
+          <color name="BLACK" red="0" green="0" blue="0">
+          </color>
+        </line_color>
+      </widget>
+      <widget type="meter" version="3.0.0">
+        <name>F01-M02-K11-RB</name>
+        <pv_name>$(P)$(R)F01M02K11-RB</pv_name>
+        <y>10</y>
+        <width>150</width>
+        <height>80</height>
+        <foreground_color>
+          <color name="Background" red="220" green="225" blue="221">
+          </color>
+        </foreground_color>
+        <font>
+          <font family="Source Sans Pro" style="REGULAR" size="20.0">
+          </font>
+        </font>
+        <show_value>false</show_value>
+        <show_units>false</show_units>
+        <show_limits>false</show_limits>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <limits_from_pv>false</limits_from_pv>
+        <maximum>2.0</maximum>
+        <needle_color>
+          <color name="GREEN-BORDER" red="40" green="140" blue="40">
+          </color>
+        </needle_color>
+        <knob_color>
+          <color name="BLACK" red="0" green="0" blue="0">
+          </color>
+        </knob_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>Pf3</text>
+        <y>40</y>
+        <width>50</width>
+        <height>30</height>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="GRAY-BORDER" red="121" green="121" blue="121">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>Pf4</text>
+        <x>50</x>
+        <width>50</width>
+        <height>30</height>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="GRAY-BORDER" red="121" green="121" blue="121">
+          </color>
+        </border_color>
+      </widget>
+      <widget type="ellipse" version="2.0.0">
+        <name>Ellipse</name>
+        <x>69</x>
+        <y>145</y>
+        <width>12</width>
+        <height>12</height>
+        <line_width>0</line_width>
+        <background_color>
+          <color name="BLACK" red="0" green="0" blue="0">
+          </color>
+        </background_color>
+      </widget>
+    </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Pf4</text>
-      <x>55</x>
-      <width>40</width>
+      <class>CAPTION</class>
+      <text>PM01:</text>
+      <x>10</x>
+      <y>240</y>
+      <width>70</width>
       <height>30</height>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment use_class="true">2</horizontal_alignment>
+      <vertical_alignment use_class="true">1</vertical_alignment>
       <border_color>
         <color name="GRAY-BORDER" red="121" green="121" blue="121">
         </color>
@@ -375,10 +468,10 @@ pvs[0].setValue(0)]]></text>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>S10</text>
-      <x>80</x>
-      <y>135</y>
-      <width>40</width>
+      <text>Pt1</text>
+      <x>10</x>
+      <y>175</y>
+      <width>50</width>
       <height>30</height>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
@@ -387,201 +480,30 @@ pvs[0].setValue(0)]]></text>
         </color>
       </border_color>
     </widget>
-    <widget type="ellipse" version="2.0.0">
-      <name>Ellipse</name>
-      <x>69</x>
-      <y>145</y>
-      <width>12</width>
-      <height>12</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color name="BLACK" red="0" green="0" blue="0">
-        </color>
-      </background_color>
-    </widget>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <class>CAPTION</class>
-    <text>PM01:</text>
-    <x>30</x>
-    <y>350</y>
-    <width>70</width>
-    <height>30</height>
-    <foreground_color use_class="true">
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </foreground_color>
-    <horizontal_alignment use_class="true">2</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <border_color>
-      <color name="GRAY-BORDER" red="121" green="121" blue="121">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Pt1 (NC)</text>
-    <x>30</x>
-    <y>270</y>
-    <width>60</width>
-    <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <border_color>
-      <color name="GRAY-BORDER" red="121" green="121" blue="121">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <class>CAPTION</class>
-    <text>PM04:</text>
-    <x>510</x>
-    <y>350</y>
-    <width>70</width>
-    <height>30</height>
-    <foreground_color use_class="true">
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </foreground_color>
-    <horizontal_alignment use_class="true">2</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <border_color>
-      <color name="GRAY-BORDER" red="121" green="121" blue="121">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="meter" version="3.0.0">
-    <name>F01-M01-K14-RB</name>
-    <pv_name>$(P)$(R)F01M01K14-RB</pv_name>
-    <x>510</x>
-    <y>240</y>
-    <width>150</width>
-    <height>80</height>
-    <foreground_color>
-      <color name="Background" red="220" green="225" blue="221">
-      </color>
-    </foreground_color>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="20.0">
-      </font>
-    </font>
-    <show_value>false</show_value>
-    <show_units>false</show_units>
-    <show_limits>false</show_limits>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <limits_from_pv>false</limits_from_pv>
-    <maximum>2.0</maximum>
-    <needle_color>
-      <color name="GREEN-BORDER" red="40" green="140" blue="40">
-      </color>
-    </needle_color>
-    <knob_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </knob_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Pt4 (NC)</text>
-    <x>510</x>
-    <y>270</y>
-    <width>60</width>
-    <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Pt4</text>
-    <x>580</x>
-    <y>350</y>
-    <width>80</width>
-    <height>30</height>
-    <font>
-      <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <rules>
-      <rule name="Text" prop_id="text" out_exp="false">
-        <exp bool_exp="(pv0 == 1 and pv1 == 0)">
-          <value>Pr1</value>
-        </exp>
-        <exp bool_exp="(pv0 == 1 and pv1 == 1)">
-          <value>Pr2</value>
-        </exp>
-        <pv_name>$(P)$(R)F01M01K14-RB</pv_name>
-        <pv_name>$(P)$(R)F01M02K14-RB</pv_name>
-      </rule>
-    </rules>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="GRAY-BORDER" red="121" green="121" blue="121">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>F01M02-K14</name>
-    <x>510</x>
-    <y>110</y>
-    <width>150</width>
-    <height>165</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <rules>
-      <rule name="Visible" prop_id="visible" out_exp="false">
-        <exp bool_exp="pv0 == 0">
-          <value>false</value>
-        </exp>
-        <pv_name>$(P)$(R)F01M01K14-RB</pv_name>
-      </rule>
-    </rules>
-    <widget type="ellipse" version="2.0.0">
-      <name>Ellipse</name>
-      <x>69</x>
-      <y>145</y>
-      <width>12</width>
-      <height>12</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color name="BLACK" red="0" green="0" blue="0">
-        </color>
-      </background_color>
-    </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>S40</text>
-      <x>80</x>
-      <y>135</y>
-      <width>40</width>
+      <class>CAPTION</class>
+      <text>PM04:</text>
+      <x>489</x>
+      <y>240</y>
+      <width>70</width>
       <height>30</height>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="polyline" version="2.0.0">
-      <name>Polyline</name>
-      <x>75</x>
-      <y>83</y>
-      <width>1</width>
-      <height>70</height>
-      <points>
-        <point x="0.0" y="0.0">
-        </point>
-        <point x="0.0" y="70.0">
-        </point>
-      </points>
-      <line_color>
-        <color name="BLACK" red="0" green="0" blue="0">
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
         </color>
-      </line_color>
+      </foreground_color>
+      <horizontal_alignment use_class="true">2</horizontal_alignment>
+      <vertical_alignment use_class="true">1</vertical_alignment>
+      <border_color>
+        <color name="GRAY-BORDER" red="121" green="121" blue="121">
+        </color>
+      </border_color>
     </widget>
     <widget type="meter" version="3.0.0">
-      <name>F01-M02-K14-RB</name>
-      <pv_name>$(P)$(R)F01M02K14-RB</pv_name>
-      <y>10</y>
+      <name>F01-M01-K14-RB</name>
+      <pv_name>$(P)$(R)F01M01K14-RB</pv_name>
+      <x>489</x>
+      <y>145</y>
       <width>150</width>
       <height>80</height>
       <foreground_color>
@@ -609,153 +531,143 @@ pvs[0].setValue(0)]]></text>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Pr1 (NC)</text>
-      <y>40</y>
-      <width>60</width>
+      <text>Pt4</text>
+      <x>489</x>
+      <y>175</y>
+      <width>50</width>
       <height>30</height>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Pr2</text>
-      <x>55</x>
-      <width>40</width>
+      <text>Pt4</text>
+      <x>569</x>
+      <y>240</y>
+      <width>70</width>
       <height>30</height>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-  </widget>
-  <widget type="meter" version="3.0.0">
-    <name>F01-M01-K13-RB</name>
-    <pv_name>$(P)$(R)F01M01K13-RB</pv_name>
-    <x>350</x>
-    <y>240</y>
-    <width>150</width>
-    <height>80</height>
-    <foreground_color>
-      <color name="Background" red="220" green="225" blue="221">
-      </color>
-    </foreground_color>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="20.0">
-      </font>
-    </font>
-    <show_value>false</show_value>
-    <show_units>false</show_units>
-    <show_limits>false</show_limits>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <limits_from_pv>false</limits_from_pv>
-    <maximum>2.0</maximum>
-    <needle_color>
-      <color name="GREEN-BORDER" red="40" green="140" blue="40">
-      </color>
-    </needle_color>
-    <knob_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </knob_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Pt3 (NC)</text>
-    <x>350</x>
-    <y>270</y>
-    <width>60</width>
-    <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Pt3</text>
-    <x>420</x>
-    <y>350</y>
-    <width>80</width>
-    <height>30</height>
-    <font>
-      <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
+        </font>
       </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <rules>
-      <rule name="Text" prop_id="text" out_exp="false">
-        <exp bool_exp="(pv0 == 1 and pv1 == 0)">
-          <value>Pf1</value>
-        </exp>
-        <exp bool_exp="(pv0 == 1 and pv1 == 1)">
-          <value>Pf2</value>
-        </exp>
-        <pv_name>$(P)$(R)F01M01K13-RB</pv_name>
-        <pv_name>$(P)$(R)F01M02K13-RB</pv_name>
-      </rule>
-    </rules>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="GRAY-BORDER" red="121" green="121" blue="121">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>F01M02-K13</name>
-    <x>350</x>
-    <y>110</y>
-    <width>150</width>
-    <height>165</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <rules>
-      <rule name="Visible" prop_id="visible" out_exp="false">
-        <exp bool_exp="pv0 == 0">
-          <value>false</value>
-        </exp>
-        <pv_name>$(P)$(R)F01M01K13-RB</pv_name>
-      </rule>
-    </rules>
-    <widget type="ellipse" version="2.0.0">
-      <name>Ellipse</name>
-      <x>69</x>
-      <y>145</y>
-      <width>12</width>
-      <height>12</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color name="BLACK" red="0" green="0" blue="0">
-        </color>
-      </background_color>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label</name>
-      <text>S30</text>
-      <x>80</x>
-      <y>135</y>
-      <width>40</width>
-      <height>30</height>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="polyline" version="2.0.0">
-      <name>Polyline</name>
-      <x>75</x>
-      <y>83</y>
-      <width>1</width>
-      <height>70</height>
-      <points>
-        <point x="0.0" y="0.0">
-        </point>
-        <point x="0.0" y="70.0">
-        </point>
-      </points>
-      <line_color>
-        <color name="BLACK" red="0" green="0" blue="0">
+      <rules>
+        <rule name="Text" prop_id="text" out_exp="false">
+          <exp bool_exp="(pv0 == 1 and pv1 == 0)">
+            <value>Pr1</value>
+          </exp>
+          <exp bool_exp="(pv0 == 1 and pv1 == 1)">
+            <value>Pr2</value>
+          </exp>
+          <pv_name>$(P)$(R)F01M01K14-RB</pv_name>
+          <pv_name>$(P)$(R)F01M02K14-RB</pv_name>
+        </rule>
+      </rules>
+      <border_width>2</border_width>
+      <border_color>
+        <color name="GRAY-BORDER" red="121" green="121" blue="121">
         </color>
-      </line_color>
+      </border_color>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>F01M02-K14</name>
+      <x>489</x>
+      <y>15</y>
+      <width>150</width>
+      <height>165</height>
+      <style>3</style>
+      <transparent>true</transparent>
+      <rules>
+        <rule name="Visible" prop_id="visible" out_exp="false">
+          <exp bool_exp="pv0 == 0">
+            <value>false</value>
+          </exp>
+          <pv_name>$(P)$(R)F01M01K14-RB</pv_name>
+        </rule>
+      </rules>
+      <widget type="ellipse" version="2.0.0">
+        <name>Ellipse</name>
+        <x>69</x>
+        <y>145</y>
+        <width>12</width>
+        <height>12</height>
+        <line_width>0</line_width>
+        <background_color>
+          <color name="BLACK" red="0" green="0" blue="0">
+          </color>
+        </background_color>
+      </widget>
+      <widget type="polyline" version="2.0.0">
+        <name>Polyline</name>
+        <x>75</x>
+        <y>83</y>
+        <width>1</width>
+        <height>70</height>
+        <points>
+          <point x="0.0" y="0.0">
+          </point>
+          <point x="0.0" y="70.0">
+          </point>
+        </points>
+        <line_color>
+          <color name="BLACK" red="0" green="0" blue="0">
+          </color>
+        </line_color>
+      </widget>
+      <widget type="meter" version="3.0.0">
+        <name>F01-M02-K14-RB</name>
+        <pv_name>$(P)$(R)F01M02K14-RB</pv_name>
+        <y>10</y>
+        <width>150</width>
+        <height>80</height>
+        <foreground_color>
+          <color name="Background" red="220" green="225" blue="221">
+          </color>
+        </foreground_color>
+        <font>
+          <font family="Source Sans Pro" style="REGULAR" size="20.0">
+          </font>
+        </font>
+        <show_value>false</show_value>
+        <show_units>false</show_units>
+        <show_limits>false</show_limits>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <limits_from_pv>false</limits_from_pv>
+        <maximum>2.0</maximum>
+        <needle_color>
+          <color name="GREEN-BORDER" red="40" green="140" blue="40">
+          </color>
+        </needle_color>
+        <knob_color>
+          <color name="BLACK" red="0" green="0" blue="0">
+          </color>
+        </knob_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>Pr1</text>
+        <y>40</y>
+        <width>50</width>
+        <height>30</height>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>Pr2</text>
+        <x>50</x>
+        <width>50</width>
+        <height>30</height>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
     </widget>
     <widget type="meter" version="3.0.0">
-      <name>F01-M02-K13-RB</name>
-      <pv_name>$(P)$(R)F01M02K13-RB</pv_name>
-      <y>10</y>
+      <name>F01-M01-K13-RB</name>
+      <pv_name>$(P)$(R)F01M01K13-RB</pv_name>
+      <x>329</x>
+      <y>145</y>
       <width>150</width>
       <height>80</height>
       <foreground_color>
@@ -783,162 +695,162 @@ pvs[0].setValue(0)]]></text>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Pf1 (NC)</text>
-      <y>40</y>
-      <width>60</width>
+      <text>Pt3</text>
+      <x>329</x>
+      <y>175</y>
+      <width>50</width>
       <height>30</height>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Pf2</text>
-      <x>54</x>
-      <width>40</width>
+      <text>Pt3</text>
+      <x>409</x>
+      <y>240</y>
+      <width>70</width>
       <height>30</height>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
+        </font>
+      </font>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
-    </widget>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <class>CAPTION</class>
-    <text>PM03:</text>
-    <x>350</x>
-    <y>350</y>
-    <width>70</width>
-    <height>30</height>
-    <foreground_color use_class="true">
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </foreground_color>
-    <horizontal_alignment use_class="true">2</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <border_color>
-      <color name="GRAY-BORDER" red="121" green="121" blue="121">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="meter" version="3.0.0">
-    <name>F01-M01-K12-RB</name>
-    <pv_name>$(P)$(R)F01M01K12-RB</pv_name>
-    <x>190</x>
-    <y>245</y>
-    <width>150</width>
-    <height>80</height>
-    <foreground_color>
-      <color name="Background" red="220" green="225" blue="221">
-      </color>
-    </foreground_color>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="20.0">
-      </font>
-    </font>
-    <show_value>false</show_value>
-    <show_units>false</show_units>
-    <show_limits>false</show_limits>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <limits_from_pv>false</limits_from_pv>
-    <maximum>2.0</maximum>
-    <needle_color>
-      <color name="GREEN-BORDER" red="40" green="140" blue="40">
-      </color>
-    </needle_color>
-    <knob_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </knob_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Pt2</text>
-    <x>260</x>
-    <y>350</y>
-    <width>80</width>
-    <height>30</height>
-    <font>
-      <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <rules>
-      <rule name="Text" prop_id="text" out_exp="false">
-        <exp bool_exp="(pv0 == 1 and pv1 == 0)">
-          <value>Pr3</value>
-        </exp>
-        <exp bool_exp="(pv0 == 1 and pv1 == 1)">
-          <value>Pr4</value>
-        </exp>
-        <pv_name>$(P)$(R)F01M01K12-RB</pv_name>
-        <pv_name>$(P)$(R)F01M02K12-RB</pv_name>
-      </rule>
-    </rules>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="GRAY-BORDER" red="121" green="121" blue="121">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>F01M02-K12</name>
-    <x>190</x>
-    <y>110</y>
-    <width>150</width>
-    <height>165</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <rules>
-      <rule name="Visible" prop_id="visible" out_exp="false">
-        <exp bool_exp="pv0 == 0">
-          <value>false</value>
-        </exp>
-        <pv_name>$(P)$(R)F01M01K12-RB</pv_name>
-      </rule>
-    </rules>
-    <widget type="ellipse" version="2.0.0">
-      <name>Ellipse</name>
-      <x>69</x>
-      <y>145</y>
-      <width>12</width>
-      <height>12</height>
-      <line_width>0</line_width>
-      <background_color>
-        <color name="BLACK" red="0" green="0" blue="0">
+      <rules>
+        <rule name="Text" prop_id="text" out_exp="false">
+          <exp bool_exp="(pv0 == 1 and pv1 == 0)">
+            <value>Pf1</value>
+          </exp>
+          <exp bool_exp="(pv0 == 1 and pv1 == 1)">
+            <value>Pf2</value>
+          </exp>
+          <pv_name>$(P)$(R)F01M01K13-RB</pv_name>
+          <pv_name>$(P)$(R)F01M02K13-RB</pv_name>
+        </rule>
+      </rules>
+      <border_width>2</border_width>
+      <border_color>
+        <color name="GRAY-BORDER" red="121" green="121" blue="121">
         </color>
-      </background_color>
+      </border_color>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>F01M02-K13</name>
+      <x>329</x>
+      <y>15</y>
+      <width>150</width>
+      <height>165</height>
+      <style>3</style>
+      <transparent>true</transparent>
+      <rules>
+        <rule name="Visible" prop_id="visible" out_exp="false">
+          <exp bool_exp="pv0 == 0">
+            <value>false</value>
+          </exp>
+          <pv_name>$(P)$(R)F01M01K13-RB</pv_name>
+        </rule>
+      </rules>
+      <widget type="ellipse" version="2.0.0">
+        <name>Ellipse</name>
+        <x>69</x>
+        <y>145</y>
+        <width>12</width>
+        <height>12</height>
+        <line_width>0</line_width>
+        <background_color>
+          <color name="BLACK" red="0" green="0" blue="0">
+          </color>
+        </background_color>
+      </widget>
+      <widget type="polyline" version="2.0.0">
+        <name>Polyline</name>
+        <x>75</x>
+        <y>83</y>
+        <width>1</width>
+        <height>70</height>
+        <points>
+          <point x="0.0" y="0.0">
+          </point>
+          <point x="0.0" y="70.0">
+          </point>
+        </points>
+        <line_color>
+          <color name="BLACK" red="0" green="0" blue="0">
+          </color>
+        </line_color>
+      </widget>
+      <widget type="meter" version="3.0.0">
+        <name>F01-M02-K13-RB</name>
+        <pv_name>$(P)$(R)F01M02K13-RB</pv_name>
+        <y>10</y>
+        <width>150</width>
+        <height>80</height>
+        <foreground_color>
+          <color name="Background" red="220" green="225" blue="221">
+          </color>
+        </foreground_color>
+        <font>
+          <font family="Source Sans Pro" style="REGULAR" size="20.0">
+          </font>
+        </font>
+        <show_value>false</show_value>
+        <show_units>false</show_units>
+        <show_limits>false</show_limits>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <limits_from_pv>false</limits_from_pv>
+        <maximum>2.0</maximum>
+        <needle_color>
+          <color name="GREEN-BORDER" red="40" green="140" blue="40">
+          </color>
+        </needle_color>
+        <knob_color>
+          <color name="BLACK" red="0" green="0" blue="0">
+          </color>
+        </knob_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>Pf1</text>
+        <y>40</y>
+        <width>50</width>
+        <height>30</height>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>Pf2</text>
+        <x>50</x>
+        <width>50</width>
+        <height>30</height>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>S20</text>
-      <x>80</x>
-      <y>135</y>
-      <width>40</width>
+      <class>CAPTION</class>
+      <text>PM03:</text>
+      <x>329</x>
+      <y>240</y>
+      <width>70</width>
       <height>30</height>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="polyline" version="2.0.0">
-      <name>Polyline</name>
-      <x>75</x>
-      <y>83</y>
-      <width>1</width>
-      <height>70</height>
-      <points>
-        <point x="0.0" y="0.0">
-        </point>
-        <point x="0.0" y="70.0">
-        </point>
-      </points>
-      <line_color>
-        <color name="BLACK" red="0" green="0" blue="0">
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment use_class="true">2</horizontal_alignment>
+      <vertical_alignment use_class="true">1</vertical_alignment>
+      <border_color>
+        <color name="GRAY-BORDER" red="121" green="121" blue="121">
         </color>
-      </line_color>
+      </border_color>
     </widget>
     <widget type="meter" version="3.0.0">
-      <name>F01-M02-K12-RB</name>
-      <pv_name>$(P)$(R)F01M02K12-RB</pv_name>
-      <y>10</y>
+      <name>F01-M01-K12-RB</name>
+      <pv_name>$(P)$(R)F01M01K12-RB</pv_name>
+      <x>170</x>
+      <y>150</y>
       <width>150</width>
       <height>80</height>
       <foreground_color>
@@ -966,315 +878,156 @@ pvs[0].setValue(0)]]></text>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Pr3 (NC)</text>
-      <y>40</y>
-      <width>60</width>
+      <text>Pt2</text>
+      <x>250</x>
+      <y>240</y>
+      <width>70</width>
       <height>30</height>
+      <font>
+        <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
+        </font>
+      </font>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
+      <rules>
+        <rule name="Text" prop_id="text" out_exp="false">
+          <exp bool_exp="(pv0 == 1 and pv1 == 0)">
+            <value>Pr3</value>
+          </exp>
+          <exp bool_exp="(pv0 == 1 and pv1 == 1)">
+            <value>Pr4</value>
+          </exp>
+          <pv_name>$(P)$(R)F01M01K12-RB</pv_name>
+          <pv_name>$(P)$(R)F01M02K12-RB</pv_name>
+        </rule>
+      </rules>
+      <border_width>2</border_width>
+      <border_color>
+        <color name="GRAY-BORDER" red="121" green="121" blue="121">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>F01M02-K12</name>
+      <x>170</x>
+      <y>15</y>
+      <width>150</width>
+      <height>165</height>
+      <style>3</style>
+      <transparent>true</transparent>
+      <rules>
+        <rule name="Visible" prop_id="visible" out_exp="false">
+          <exp bool_exp="pv0 == 0">
+            <value>false</value>
+          </exp>
+          <pv_name>$(P)$(R)F01M01K12-RB</pv_name>
+        </rule>
+      </rules>
+      <widget type="ellipse" version="2.0.0">
+        <name>Ellipse</name>
+        <x>69</x>
+        <y>145</y>
+        <width>12</width>
+        <height>12</height>
+        <line_width>0</line_width>
+        <background_color>
+          <color name="BLACK" red="0" green="0" blue="0">
+          </color>
+        </background_color>
+      </widget>
+      <widget type="polyline" version="2.0.0">
+        <name>Polyline</name>
+        <x>75</x>
+        <y>83</y>
+        <width>1</width>
+        <height>70</height>
+        <points>
+          <point x="0.0" y="0.0">
+          </point>
+          <point x="0.0" y="70.0">
+          </point>
+        </points>
+        <line_color>
+          <color name="BLACK" red="0" green="0" blue="0">
+          </color>
+        </line_color>
+      </widget>
+      <widget type="meter" version="3.0.0">
+        <name>F01-M02-K12-RB</name>
+        <pv_name>$(P)$(R)F01M02K12-RB</pv_name>
+        <y>10</y>
+        <width>150</width>
+        <height>80</height>
+        <foreground_color>
+          <color name="Background" red="220" green="225" blue="221">
+          </color>
+        </foreground_color>
+        <font>
+          <font family="Source Sans Pro" style="REGULAR" size="20.0">
+          </font>
+        </font>
+        <show_value>false</show_value>
+        <show_units>false</show_units>
+        <show_limits>false</show_limits>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <limits_from_pv>false</limits_from_pv>
+        <maximum>2.0</maximum>
+        <needle_color>
+          <color name="GREEN-BORDER" red="40" green="140" blue="40">
+          </color>
+        </needle_color>
+        <knob_color>
+          <color name="BLACK" red="0" green="0" blue="0">
+          </color>
+        </knob_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>Pr3</text>
+        <y>40</y>
+        <width>50</width>
+        <height>30</height>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label</name>
+        <text>Pr4</text>
+        <x>50</x>
+        <width>60</width>
+        <height>30</height>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Pr4</text>
-      <x>55</x>
-      <width>40</width>
+      <text>Pt2</text>
+      <x>170</x>
+      <y>175</y>
+      <width>50</width>
       <height>30</height>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Pt2 (NC)</text>
-    <x>190</x>
-    <y>270</y>
-    <width>60</width>
-    <height>30</height>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <class>CAPTION</class>
-    <text>PM02:</text>
-    <x>190</x>
-    <y>350</y>
-    <width>70</width>
-    <height>30</height>
-    <foreground_color use_class="true">
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </foreground_color>
-    <horizontal_alignment use_class="true">2</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <border_color>
-      <color name="GRAY-BORDER" red="121" green="121" blue="121">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_1</name>
-    <class>HEADER2</class>
-    <text>Power Sensor Configuration</text>
-    <x>20</x>
-    <y>10</y>
-    <width>1180</width>
-    <height>50</height>
-    <font use_class="true">
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>BGGrey01-background_1</name>
-    <x>680</x>
-    <y>60</y>
-    <width>530</width>
-    <height>300</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="BACKGROUND" red="220" green="225" blue="221">
-      </color>
-    </background_color>
-    <corner_width>5</corner_width>
-    <corner_height>5</corner_height>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <class>HEADER2</class>
-    <text>Warm Configuration</text>
-    <x>690</x>
-    <y>60</y>
-    <width>510</width>
-    <height>50</height>
-    <font use_class="true">
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <class>CAPTION</class>
-    <text>Mode:</text>
-    <x>690</x>
-    <y>110</y>
-    <height>30</height>
-    <foreground_color use_class="true">
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </foreground_color>
-    <horizontal_alignment use_class="true">2</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-  </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Combo Box</name>
-    <pv_name>$(P)$(CAL)CableMode</pv_name>
-    <x>800</x>
-    <y>110</y>
-    <width>130</width>
-  </widget>
-  <widget type="table" version="2.0.0">
-    <name>Warm Table</name>
-    <x>690</x>
-    <y>150</y>
-    <width>510</width>
-    <height>200</height>
-    <columns>
-      <column>
-        <name>Column1</name>
-        <width>120</width>
-        <editable>false</editable>
-      </column>
-    </columns>
-    <scripts>
-      <script file="EmbeddedPy" check_connections="false">
-        <text><![CDATA[# Embedded python script
-from org.csstudio.display.builder.runtime.script import PVUtil,ScriptUtil
-from org.csstudio.display.builder.model.properties import WidgetColor
-
-# Configure table widget
-# 1.Headers
-# 2.ColumnWidth 
-TableHeader=['Title','Pt','Pfwd (CAV DC)','Prefl (CAV DC)']
-widget.setHeaders(TableHeader)
-for i in range(0,len(TableHeader)):
-	widget.setColumnWidth(i,120)
-cavname=['Cavity 1','Cavity 2','Cavity 3','Cavity 4']
-
-# fetch data
-cablemode=PVUtil.getLong(pvs[0])
-warm_cable=PVUtil.getDoubleArray(pvs[1])
-
-#---------------------All Cavities Pt-----------------------#
-if cablemode == 0:
-	data=[]
-	for i in range(0,len(cavname)):
-		dataset=[cavname[i],"{:.3f}".format(warm_cable[i*3]),'X','X']
-		data.append(dataset)
-	for i in range(0,len(cavname)):
-		for j in range(0,len(TableHeader)):
-			widget.setCellColor(i,j,WidgetColor(255,255,255))
-	for i in range(0,len(cavname)):
-		widget.setCellColor(i,1,WidgetColor(0,125,0))
-
-	# Write to Table widget
-	widget.setValue(data)
-
-#---------------------Single Cavity-----------------------#
-else:
-	data=[]
-	for i in range(0,len(cavname)):
-		dataset=[cavname[i],"{:.3f}".format(warm_cable[i*3]),"{:.3f}".format(warm_cable[i*3+1]),"{:.3f}".format(warm_cable[i*3+2])]
-		data.append(dataset)
-	for i in range(0,len(cavname)):
-		for j in range(0,len(TableHeader)):
-	        	widget.setCellColor(i,j,WidgetColor(255,255,255))
-	for i in range(0,len(TableHeader)):
-		widget.setCellColor(cablemode-1,i,WidgetColor(0,125,0))
-
-	# Write to Table widget
-	widget.setValue(data)]]></text>
-        <pv_name>$(P)$(CAL)CableMode</pv_name>
-        <pv_name trigger="false">$(P)$(CAL)WarmCableAtt</pv_name>
-      </script>
-    </scripts>
-    <editable>false</editable>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update</name>
-    <pv_name>$(P)$(R)Manufactor-RB</pv_name>
-    <x>90</x>
-    <y>470</y>
-    <width>526</width>
-    <height>30</height>
-    <format>6</format>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_2</name>
-    <class>CAPTION</class>
-    <text>Preset:</text>
-    <x>90</x>
-    <y>420</y>
-    <height>30</height>
-    <foreground_color use_class="true">
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </foreground_color>
-    <horizontal_alignment use_class="true">2</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_3</name>
-    <class>CAPTION</class>
-    <text>Status:</text>
-    <x>365</x>
-    <y>420</y>
-    <height>30</height>
-    <foreground_color use_class="true">
-      <color name="Text" red="25" green="25" blue="25">
-      </color>
-    </foreground_color>
-    <horizontal_alignment use_class="true">2</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_1</name>
-    <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
-        <description>Preset</description>
-      </action>
-    </actions>
-    <pv_name>$(P)$(R)Reset</pv_name>
-    <x>200</x>
-    <y>420</y>
-    <background_color>
-      <color name="BLUE-BORDER" red="47" green="135" blue="148">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Entry_1</name>
-    <pv_name>$(P)$(R)Connected-RB</pv_name>
-    <x>475</x>
-    <y>420</y>
-    <height>30</height>
-    <show_units>false</show_units>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="GRAY-BORDER" red="121" green="121" blue="121">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_1</name>
-    <pv_name>$(P)$(R)Connected-RB</pv_name>
-    <x>596</x>
-    <y>425</y>
-    <off_color>
-      <color name="ERROR" red="252" green="13" blue="27">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="ON" red="70" green="255" blue="70">
-      </color>
-    </on_color>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button</name>
-    <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
-        <description>Commit</description>
-      </action>
-    </actions>
-    <pv_name>$(P)$(CAL)WarmCommit</pv_name>
-    <x>1040</x>
-    <y>110</y>
-    <width>120</width>
-    <font>
-      <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
-      </font>
-    </font>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED</name>
-    <pv_name>$(P)$(CAL)WarmState</pv_name>
-    <x>1170</x>
-    <y>115</y>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <class>CAPTION</class>
+      <text>PM02:</text>
+      <x>170</x>
+      <y>240</y>
+      <width>70</width>
+      <height>30</height>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment use_class="true">2</horizontal_alignment>
+      <vertical_alignment use_class="true">1</vertical_alignment>
+      <border_color>
+        <color name="GRAY-BORDER" red="121" green="121" blue="121">
+        </color>
+      </border_color>
+    </widget>
   </widget>
 </display>
diff --git a/99-Shared/embedded/overviewpm.bob b/99-Shared/embedded/overviewpm.bob
index ac9c1b30a6e2554f6ac6706d094ce885a4991ed0..e1d728083b43034814936eed5eb3257b69cb51d7 100755
--- a/99-Shared/embedded/overviewpm.bob
+++ b/99-Shared/embedded/overviewpm.bob
@@ -549,6 +549,7 @@
     <x>210</x>
     <y>750</y>
     <height>30</height>
+    <format>6</format>
     <show_units>false</show_units>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
diff --git a/99-Shared/fft/roi.bob b/99-Shared/fft/roi.bob
index 4eadf5b248eb0edab67f9b1f659f265aeaf02aa6..a007655542a3e4503e644885c64ec5213523f5a2 100755
--- a/99-Shared/fft/roi.bob
+++ b/99-Shared/fft/roi.bob
@@ -2,11 +2,11 @@
 <display version="2.0.0">
   <name>Roi</name>
   <width>1230</width>
-  <height>740</height>
+  <height>710</height>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey01-background</name>
     <width>1230</width>
-    <height>740</height>
+    <height>710</height>
     <line_width>2</line_width>
     <line_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -40,9 +40,9 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey01-background</name>
     <x>10</x>
-    <y>640</y>
+    <y>600</y>
     <width>660</width>
-    <height>90</height>
+    <height>100</height>
     <line_width>2</line_width>
     <line_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -60,7 +60,7 @@
     <x>680</x>
     <y>50</y>
     <width>540</width>
-    <height>440</height>
+    <height>520</height>
     <line_width>2</line_width>
     <line_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -76,9 +76,9 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey01-background</name>
     <x>680</x>
-    <y>500</y>
+    <y>580</y>
     <width>540</width>
-    <height>190</height>
+    <height>120</height>
     <line_width>2</line_width>
     <line_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -94,7 +94,7 @@
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <class>HEADER2</class>
-    <text>ROI</text>
+    <text>ROI - Stats</text>
     <x>10</x>
     <width>660</width>
     <height>50</height>
@@ -108,7 +108,7 @@
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <class>CAPTION</class>
-    <text>Enable:</text>
+    <text>ROI Enable:</text>
     <x>30</x>
     <y>70</y>
     <height>30</height>
@@ -215,9 +215,9 @@
   </widget>
   <widget type="xyplot" version="2.0.0">
     <name>X/Y Plot</name>
-    <x>30</x>
+    <x>20</x>
     <y>150</y>
-    <width>620</width>
+    <width>640</width>
     <height>380</height>
     <title_font>
       <font family="Source Sans Pro" style="BOLD" size="21.0">
@@ -314,7 +314,7 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
     <name>Text Entry</name>
     <pv_name>$(P)$(R)FFTRoiYmin</pv_name>
     <x>110</x>
-    <y>540</y>
+    <y>545</y>
     <height>30</height>
     <format>2</format>
     <horizontal_alignment>1</horizontal_alignment>
@@ -323,7 +323,7 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
     <name>Text Entry</name>
     <pv_name>$(P)$(R)FFTRoiYmax</pv_name>
     <x>290</x>
-    <y>540</y>
+    <y>545</y>
     <height>30</height>
     <format>2</format>
     <horizontal_alignment>1</horizontal_alignment>
@@ -333,7 +333,7 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
     <class>CAPTION</class>
     <text>ymin:</text>
     <x>30</x>
-    <y>540</y>
+    <y>545</y>
     <width>80</width>
     <height>30</height>
     <foreground_color use_class="true">
@@ -348,7 +348,7 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
     <class>CAPTION</class>
     <text>ymax:</text>
     <x>210</x>
-    <y>540</y>
+    <y>545</y>
     <width>80</width>
     <height>30</height>
     <foreground_color use_class="true">
@@ -363,7 +363,7 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
     <pv_name>$(P)$(R)FFTRoiLogView</pv_name>
     <label>Logarithmic</label>
     <x>530</x>
-    <y>540</y>
+    <y>545</y>
     <width>120</width>
     <height>30</height>
   </widget>
@@ -372,31 +372,16 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
     <pv_name>$(P)$(R)FFTRoiAutoView</pv_name>
     <label>Autoscale</label>
     <x>410</x>
-    <y>540</y>
+    <y>545</y>
     <width>120</width>
     <height>30</height>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <class>HEADER2</class>
-    <text>Stats</text>
-    <x>10</x>
-    <y>590</y>
-    <width>660</width>
-    <height>50</height>
-    <font use_class="true">
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <class>CAPTION</class>
     <text>Peak magnitude:</text>
-    <x>340</x>
-    <y>650</y>
+    <x>350</x>
+    <y>615</y>
     <width>120</width>
     <height>30</height>
     <foreground_color use_class="true">
@@ -410,8 +395,8 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
     <name>Label</name>
     <class>CAPTION</class>
     <text>Frequency:</text>
-    <x>340</x>
-    <y>690</y>
+    <x>350</x>
+    <y>655</y>
     <width>120</width>
     <height>30</height>
     <foreground_color use_class="true">
@@ -424,8 +409,8 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(STATS)MaxValue_RBV</pv_name>
-    <x>470</x>
-    <y>650</y>
+    <x>480</x>
+    <y>615</y>
     <height>30</height>
     <format>2</format>
     <precision>2</precision>
@@ -441,13 +426,13 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
     <name>Combo Box</name>
     <pv_name>$(P)$(STATS)EnableCallbacks</pv_name>
     <x>139</x>
-    <y>650</y>
+    <y>615</y>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>text update</name>
     <pv_name>$(P)$(STATS)EnableCallbacks_RBV</pv_name>
     <x>140</x>
-    <y>690</y>
+    <y>655</y>
     <height>30</height>
     <format>6</format>
     <show_units>false</show_units>
@@ -462,8 +447,8 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <text>a.u</text>
-    <x>580</x>
-    <y>650</y>
+    <x>590</x>
+    <y>615</y>
     <width>30</width>
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
@@ -471,9 +456,9 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <class>CAPTION</class>
-    <text>Enable:</text>
+    <text>Stats Enable:</text>
     <x>30</x>
-    <y>650</y>
+    <y>615</y>
     <height>30</height>
     <foreground_color use_class="true">
       <color name="Text" red="25" green="25" blue="25">
@@ -485,8 +470,8 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)FFTPeakFrequency</pv_name>
-    <x>470</x>
-    <y>690</y>
+    <x>480</x>
+    <y>655</y>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -515,7 +500,7 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
     <x>690</x>
     <y>60</y>
     <width>520</width>
-    <height>420</height>
+    <height>500</height>
     <show_toolbar>true</show_toolbar>
     <show_legend>false</show_legend>
     <x_axis>
@@ -580,12 +565,17 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
       <action type="write_pv">
         <pv_name>$(pv_name)</pv_name>
         <value>1</value>
-        <description>Add Dot</description>
+        <description>+</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)Add</pv_name>
-    <x>720</x>
-    <y>520</y>
+    <x>710</x>
+    <y>600</y>
+    <width>40</width>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
+      </font>
+    </font>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -598,12 +588,12 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
       </action>
     </actions>
     <pv_name>$(P)$(R)Clear</pv_name>
-    <x>1050</x>
-    <y>520</y>
-    <width>120</width>
+    <x>820</x>
+    <y>600</y>
+    <width>80</width>
     <tooltip>$(actions)</tooltip>
     <show_confirm_dialog>true</show_confirm_dialog>
-    <confirm_message>Are you sure you want to clear the array?</confirm_message>
+    <confirm_message>Are you sure you want to clear the data?</confirm_message>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button</name>
@@ -615,18 +605,18 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
       </action>
     </actions>
     <pv_name>$(P)$(R)DfDN</pv_name>
-    <x>720</x>
-    <y>560</y>
-    <width>120</width>
+    <x>710</x>
+    <y>650</y>
+    <width>140</width>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <class>CAPTION</class>
-    <text>Cavity tuning sensitivity (/screw turn):</text>
-    <x>720</x>
+    <text>Cavity tuning sensitivity:</text>
+    <x>910</x>
     <y>600</y>
-    <width>320</width>
+    <width>180</width>
     <height>30</height>
     <foreground_color use_class="true">
       <color name="Text" red="25" green="25" blue="25">
@@ -638,9 +628,8 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)CavSensitivity</pv_name>
-    <x>1050</x>
+    <x>1100</x>
     <y>600</y>
-    <width>120</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -654,9 +643,9 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
     <name>Label</name>
     <class>CAPTION</class>
     <text>Total N of full steps to resonance:</text>
-    <x>720</x>
-    <y>640</y>
-    <width>320</width>
+    <x>860</x>
+    <y>650</y>
+    <width>230</width>
     <height>30</height>
     <foreground_color use_class="true">
       <color name="Text" red="25" green="25" blue="25">
@@ -668,9 +657,8 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(MOTOR)Motor-PosAct</pv_name>
-    <x>1050</x>
-    <y>640</y>
-    <width>120</width>
+    <x>1100</x>
+    <y>650</y>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
@@ -680,27 +668,23 @@ widget.setPropertyValue('y_axes[0].maximum', Ymax)]]></text>
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>(1 screw turn=20000 full steps)</text>
-    <x>840</x>
-    <y>560</y>
-    <width>210</width>
-    <height>30</height>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(pv_name)</pv_name>
         <value>1</value>
-        <description>Remove Dot</description>
+        <description>-</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)Remove</pv_name>
-    <x>830</x>
-    <y>520</y>
+    <x>760</x>
+    <y>600</y>
+    <width>40</width>
+    <font>
+      <font family="Source Sans Pro Semibold" style="REGULAR" size="20.0">
+      </font>
+    </font>
     <tooltip>$(actions)</tooltip>
   </widget>
 </display>