diff --git a/10-Top/top-ess-labs.bob b/10-Top/top-ess-labs.bob
index 7929df18fc1590adb7d71b79024afe4c3fc284b2..6a5f2b33ce373f9f2dc1beabb290b5ec6bd534ea 100644
--- a/10-Top/top-ess-labs.bob
+++ b/10-Top/top-ess-labs.bob
@@ -50,6 +50,7 @@
         <file>../99-Shared/llrf/overview.bob</file>
         <macros>
           <CAVFLDDIG>$(PD)$(RD1)</CAVFLDDIG>
+          <FFCOMP>true</FFCOMP>
           <HAS2>true</HAS2>
           <HAS3>true</HAS3>
           <HAS4>true</HAS4>
@@ -57,6 +58,7 @@
           <P>OCTOPUS-010:RFS-LLRF-101:</P>
           <PC>$(PD)</PC>
           <PD>OCTOPUS-010:</PD>
+          <PEVR>OCTOPUS-010:Ctrl-EVR-101:</PEVR>
           <PR>OCTOPUS-010:</PR>
           <PWRAMPDIG>$(PD)$(RD1)</PWRAMPDIG>
           <RC>$(RD1)</RC>
@@ -71,6 +73,7 @@
           <RR3>RFS-RFM-103:</RR3>
           <RR4>RFS-RFM-104:</RR4>
           <SELMAIN>true</SELMAIN>
+          <SPRAMP>true</SPRAMP>
           <SYSDESC>Overview</SYSDESC>
           <SYSNAME>OCTOPUS LLRF</SYSNAME>
           <VMDIG>$(PD)$(RD1)</VMDIG>
@@ -80,7 +83,7 @@
       </action>
     </actions>
     <text>LLRF</text>
-    <x>10</x>
+    <x>20</x>
     <y>110</y>
     <width>120</width>
     <height>40</height>
@@ -237,6 +240,7 @@
         <file>../99-Shared/timing/evr_simple.bob</file>
         <macros>
           <EVRPREFIX>OCTOPUS-010:Ctrl-EVR-101:</EVRPREFIX>
+          <MAIN>true</MAIN>
           <PREFIX>OCTOPUS-010:Ctrl-EVR-101:</PREFIX>
         </macros>
         <target>tab</target>
@@ -250,4 +254,47 @@
     <height>40</height>
     <tooltip>$(actions)</tooltip>
   </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_6</name>
+    <actions>
+      <action type="open_display">
+        <file>../99-Shared/llrf/overview.bob</file>
+        <macros>
+          <CAVFLDDIG>$(PD)$(RD1)</CAVFLDDIG>
+          <HAS2>true</HAS2>
+          <HAS3>true</HAS3>
+          <HAS4>true</HAS4>
+          <LSTPREF>$(PD)$(RD1) $(PD)$(RD2)</LSTPREF>
+          <P>LAB-010RFC:RFS-LLRF-101:</P>
+          <PC>$(PD)</PC>
+          <PD>LAB-010RFC:</PD>
+          <PR>LAB-010RFC:</PR>
+          <PWRAMPDIG>$(PD)$(RD1)</PWRAMPDIG>
+          <RC>$(RD1)</RC>
+          <RD>RFS-DIG-101:</RD>
+          <RD1>RFS-DIG-101:</RD1>
+          <RD2>RFS-DIG-102:</RD2>
+          <RD3>RFS-DIG-103:</RD3>
+          <RD4>RFS-DIG-104:</RD4>
+          <RR>RFS-RFM-101:</RR>
+          <RR1>RFS-RFM-101:</RR1>
+          <RR2>RFS-RFM-102:</RR2>
+          <RR3>RFS-RFM-103:</RR3>
+          <RR4>RFS-RFM-104:</RR4>
+          <SELMAIN>true</SELMAIN>
+          <SYSDESC>Overview</SYSDESC>
+          <SYSNAME>OCTOPUS LLRF</SYSNAME>
+          <VMDIG>$(PD)$(RD1)</VMDIG>
+        </macros>
+        <target>replace</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>LLRF 2</text>
+    <x>30</x>
+    <y>250</y>
+    <width>120</width>
+    <height>40</height>
+    <tooltip>$(actions)</tooltip>
+  </widget>
 </display>
diff --git a/10-Top/top-rfq.bob b/10-Top/top-rfq.bob
index 6e49b50c942ff0270f70ad98e7e5f813b0c54e1b..4cf1ed9e0732b41776581f601e36091778553085 100644
--- a/10-Top/top-rfq.bob
+++ b/10-Top/top-rfq.bob
@@ -78,10 +78,10 @@
     <name>Action Button_7</name>
     <actions>
       <action type="open_display">
-        <file>../99-Shared/timing/timing-local.bob</file>
+        <file>../99-Shared/timing/evr_simple.bob</file>
         <macros>
-          <P>RFQ-LLRF1</P>
-          <SYSNAME>RFQ</SYSNAME>
+          <EVRPREFIX>RFQ-010:RFS-EVR-101:</EVRPREFIX>
+          <PREFIX>RFQ-010:RFS-EVR-101:</PREFIX>
         </macros>
         <target>window</target>
         <description>Open Display</description>
@@ -112,5 +112,6 @@
     <y>130</y>
     <width>110</width>
     <height>40</height>
+    <tooltip>$(actions)</tooltip>
   </widget>
 </display>
diff --git a/99-Shared/llrf/calib-setup.bob b/99-Shared/llrf/calib-setup.bob
index d453c894f3741b6302acb3c75d472dae4648a6f5..ea9db5b75c6b168ab68250ece5ada0ca358e07ed 100644
--- a/99-Shared/llrf/calib-setup.bob
+++ b/99-Shared/llrf/calib-setup.bob
@@ -1,48 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>Calibration setup</name>
-  <width>720</width>
+  <width>410</width>
   <height>30</height>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Entry_159</name>
-    <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-LinCvF</pv_name>
-    <x>190</x>
-    <y>1</y>
-    <width>75</width>
-    <precision>2</precision>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_215</name>
-    <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-LinCvF-RB</pv_name>
-    <x>275</x>
-    <y>1</y>
-    <width>50</width>
-    <precision>2</precision>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Entry_160</name>
-    <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-LinCvO</pv_name>
-    <x>345</x>
-    <y>1</y>
-    <width>50</width>
-    <precision>2</precision>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_223</name>
-    <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-LinCvO-RB</pv_name>
-    <x>405</x>
-    <y>1</y>
-    <width>50</width>
-    <format>1</format>
-    <precision>2</precision>
-  </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Combo Box_23</name>
-    <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalLin</pv_name>
-    <x>465</x>
-    <width>150</width>
-    <height>20</height>
-  </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button</name>
     <actions>
@@ -56,7 +16,7 @@
       </action>
     </actions>
     <text>...</text>
-    <x>650</x>
+    <x>350</x>
     <width>50</width>
     <height>20</height>
     <tooltip>$(actions)</tooltip>
@@ -67,4 +27,16 @@
     <width>160</width>
     <precision>2</precision>
   </widget>
+  <widget type="slide_button" version="2.0.0">
+    <name>Slide Button_1</name>
+    <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalEn</pv_name>
+    <label></label>
+    <x>200</x>
+    <width>80</width>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED</name>
+    <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalEn-RB</pv_name>
+    <x>270</x>
+  </widget>
 </display>
diff --git a/99-Shared/llrf/ctrl-table-magang.bob b/99-Shared/llrf/ctrl-table-magang.bob
index a9c481d48e111568bbb1b1223747051da66be588..b5bc1e4854d36e080a8f498ac36f34c0936b9775 100644
--- a/99-Shared/llrf/ctrl-table-magang.bob
+++ b/99-Shared/llrf/ctrl-table-magang.bob
@@ -144,4 +144,30 @@ if run == 1:
     </scripts>
     <tooltip>$(actions)</tooltip>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_4</name>
+    <text>Polynomial calibration</text>
+    <x>20</x>
+    <y>680</y>
+    <width>170</width>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED</name>
+    <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(CTRLTYPE=FF)-CalEn-RB</pv_name>
+    <x>213</x>
+    <y>683</y>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_5</name>
+    <text>Gradient calibration</text>
+    <x>20</x>
+    <y>703</y>
+    <width>170</width>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_1</name>
+    <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CAVCH=0)-CalGradEn</pv_name>
+    <x>213</x>
+    <y>711</y>
+  </widget>
 </display>
diff --git a/99-Shared/llrf/expert.bob b/99-Shared/llrf/expert.bob
index 65ef55f20b65626bb04395b76c68ebddf03fe3dc..7973666854af6e690c4f3a0e76b709c8929d4353 100644
--- a/99-Shared/llrf/expert.bob
+++ b/99-Shared/llrf/expert.bob
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>Expert Screen</name>
+  <name>$(SYSNAME=LLRF) - Digitiser $(DIGN=1) - Expert Screen</name>
   <width>1630</width>
   <height>810</height>
   <widget type="tabs" version="2.0.0">
@@ -1687,14 +1687,14 @@ else:
             <name>Dynamics Group_2</name>
             <x>8</x>
             <y>17</y>
-            <width>740</width>
-            <height>450</height>
+            <width>640</width>
+            <height>502</height>
             <style>3</style>
             <widget type="rectangle" version="2.0.0">
               <name>Rectangle_207</name>
               <y>30</y>
-              <width>740</width>
-              <height>420</height>
+              <width>640</width>
+              <height>452</height>
               <line_color>
                 <color name="GROUP-BORDER" red="150" green="155" blue="151">
                 </color>
@@ -1706,7 +1706,7 @@ else:
             </widget>
             <widget type="rectangle" version="2.0.0">
               <name>Rectangle_208</name>
-              <width>740</width>
+              <width>640</width>
               <height>30</height>
               <line_width>0</line_width>
               <background_color>
@@ -1719,7 +1719,7 @@ else:
             <widget type="rectangle" version="2.0.0">
               <name>Rectangle_209</name>
               <y>10</y>
-              <width>740</width>
+              <width>640</width>
               <line_width>0</line_width>
               <background_color>
                 <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -1729,7 +1729,7 @@ else:
             <widget type="label" version="2.0.0">
               <name>Group Title_66</name>
               <text>Calibration</text>
-              <width>740</width>
+              <width>480</width>
               <height>30</height>
               <font>
                 <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
@@ -1738,97 +1738,12 @@ else:
               <horizontal_alignment>1</horizontal_alignment>
               <vertical_alignment>1</vertical_alignment>
             </widget>
-            <widget type="label" version="2.0.0">
-              <name>Label_399</name>
-              <class>HEADER3</class>
-              <text>Slope</text>
-              <x>166</x>
-              <y>40</y>
-              <width>140</width>
-              <height>30</height>
-              <font use_class="true">
-                <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-                </font>
-              </font>
-              <foreground_color use_class="true">
-                <color name="Text" red="25" green="25" blue="25">
-                </color>
-              </foreground_color>
-              <horizontal_alignment>1</horizontal_alignment>
-              <vertical_alignment>1</vertical_alignment>
-              <wrap_words>false</wrap_words>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>Label_400</name>
-              <class>HEADER3</class>
-              <text>Offset</text>
-              <x>325</x>
-              <y>40</y>
-              <width>110</width>
-              <height>30</height>
-              <font use_class="true">
-                <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-                </font>
-              </font>
-              <foreground_color use_class="true">
-                <color name="Text" red="25" green="25" blue="25">
-                </color>
-              </foreground_color>
-              <horizontal_alignment>1</horizontal_alignment>
-              <vertical_alignment>1</vertical_alignment>
-              <wrap_words>false</wrap_words>
-            </widget>
-            <widget type="textentry" version="3.0.0">
-              <name>Text Entry_160</name>
-              <pv_name>$(PD=LLRF:)$(RD=DIG01:)ChGrpAI-LinCvF</pv_name>
-              <x>200</x>
-              <y>77</y>
-              <width>75</width>
-              <precision>2</precision>
-            </widget>
-            <widget type="textentry" version="3.0.0">
-              <name>Text Entry_161</name>
-              <pv_name>$(PD=LLRF:)$(RD=DIG01:)ChGrpAI-LinCvO</pv_name>
-              <x>355</x>
-              <y>78</y>
-              <width>50</width>
-              <precision>2</precision>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>Label_401</name>
-              <text>Set on All</text>
-              <x>90</x>
-              <y>70</y>
-              <width>70</width>
-              <horizontal_alignment>2</horizontal_alignment>
-              <vertical_alignment>1</vertical_alignment>
-            </widget>
-            <widget type="label" version="2.0.0">
-              <name>Label_402</name>
-              <class>HEADER3</class>
-              <text>Linear / Non-Linear</text>
-              <x>470</x>
-              <y>40</y>
-              <width>160</width>
-              <height>30</height>
-              <font use_class="true">
-                <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
-                </font>
-              </font>
-              <foreground_color use_class="true">
-                <color name="Text" red="25" green="25" blue="25">
-                </color>
-              </foreground_color>
-              <horizontal_alignment>1</horizontal_alignment>
-              <vertical_alignment>1</vertical_alignment>
-              <wrap_words>false</wrap_words>
-            </widget>
             <widget type="label" version="2.0.0">
               <name>Label_425</name>
               <class>HEADER3</class>
               <text>Configure</text>
-              <x>620</x>
-              <y>40</y>
+              <x>330</x>
+              <y>72</y>
               <width>130</width>
               <height>30</height>
               <font use_class="true">
@@ -1851,7 +1766,7 @@ else:
               <file>calib-setup.bob</file>
               <x>10</x>
               <y>140</y>
-              <width>710</width>
+              <width>450</width>
               <height>30</height>
             </widget>
             <widget type="embedded" version="2.0.0">
@@ -1862,18 +1777,7 @@ else:
               <file>calib-setup.bob</file>
               <x>10</x>
               <y>110</y>
-              <width>710</width>
-              <height>30</height>
-            </widget>
-            <widget type="embedded" version="2.0.0">
-              <name>Embedded Display_11</name>
-              <macros>
-                <CH>2</CH>
-              </macros>
-              <file>calib-setup.bob</file>
-              <x>10</x>
-              <y>170</y>
-              <width>710</width>
+              <width>450</width>
               <height>30</height>
             </widget>
             <widget type="embedded" version="2.0.0">
@@ -1883,8 +1787,8 @@ else:
               </macros>
               <file>calib-setup.bob</file>
               <x>10</x>
-              <y>200</y>
-              <width>710</width>
+              <y>170</y>
+              <width>450</width>
               <height>30</height>
             </widget>
             <widget type="embedded" version="2.0.0">
@@ -1894,8 +1798,8 @@ else:
               </macros>
               <file>calib-setup.bob</file>
               <x>10</x>
-              <y>230</y>
-              <width>710</width>
+              <y>200</y>
+              <width>450</width>
               <height>30</height>
             </widget>
             <widget type="embedded" version="2.0.0">
@@ -1905,8 +1809,8 @@ else:
               </macros>
               <file>calib-setup.bob</file>
               <x>10</x>
-              <y>260</y>
-              <width>710</width>
+              <y>230</y>
+              <width>450</width>
               <height>30</height>
             </widget>
             <widget type="embedded" version="2.0.0">
@@ -1916,8 +1820,8 @@ else:
               </macros>
               <file>calib-setup.bob</file>
               <x>10</x>
-              <y>290</y>
-              <width>710</width>
+              <y>260</y>
+              <width>450</width>
               <height>30</height>
             </widget>
             <widget type="embedded" version="2.0.0">
@@ -1927,8 +1831,8 @@ else:
               </macros>
               <file>calib-setup.bob</file>
               <x>10</x>
-              <y>320</y>
-              <width>710</width>
+              <y>290</y>
+              <width>450</width>
               <height>30</height>
             </widget>
             <widget type="embedded" version="2.0.0">
@@ -1938,9 +1842,109 @@ else:
               </macros>
               <file>calib-setup.bob</file>
               <x>10</x>
-              <y>350</y>
-              <width>710</width>
+              <y>320</y>
+              <width>450</width>
+              <height>30</height>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_427</name>
+              <class>HEADER3</class>
+              <text>Enable</text>
+              <x>210</x>
+              <y>72</y>
+              <width>130</width>
               <height>30</height>
+              <font use_class="true">
+                <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+                </font>
+              </font>
+              <foreground_color use_class="true">
+                <color name="Text" red="25" green="25" blue="25">
+                </color>
+              </foreground_color>
+              <horizontal_alignment>1</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+              <wrap_words>false</wrap_words>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_1</name>
+              <text>Feed Forward</text>
+              <x>10</x>
+              <y>416</y>
+              <width>220</width>
+            </widget>
+            <widget type="action_button" version="3.0.0">
+              <name>Action Button</name>
+              <actions>
+                <action type="open_display">
+                  <file>scaling_output.bob</file>
+                  <macros>
+                    <PI_TYPE>FF</PI_TYPE>
+                  </macros>
+                  <target>window</target>
+                  <description>Open Display</description>
+                </action>
+              </actions>
+              <text>...</text>
+              <x>360</x>
+              <y>416</y>
+              <width>50</width>
+              <height>20</height>
+              <tooltip>$(actions)</tooltip>
+            </widget>
+            <widget type="slide_button" version="2.0.0">
+              <name>Slide Button_1</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrlFF-CalEn</pv_name>
+              <label></label>
+              <x>210</x>
+              <y>412</y>
+              <width>80</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_3</name>
+              <text>Set Point</text>
+              <x>10</x>
+              <y>446</y>
+              <width>220</width>
+            </widget>
+            <widget type="action_button" version="3.0.0">
+              <name>Action Button_2</name>
+              <actions>
+                <action type="open_display">
+                  <file>scaling_sp.bob</file>
+                  <macros>
+                    <PI_TYPE>SP</PI_TYPE>
+                  </macros>
+                  <target>window</target>
+                  <description>Open Display</description>
+                </action>
+              </actions>
+              <text>...</text>
+              <x>360</x>
+              <y>446</y>
+              <width>50</width>
+              <height>20</height>
+              <tooltip>$(actions)</tooltip>
+            </widget>
+            <widget type="slide_button" version="2.0.0">
+              <name>Slide Button_2</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrlSP-CalEn</pv_name>
+              <label></label>
+              <x>210</x>
+              <y>442</y>
+              <width>80</width>
+            </widget>
+            <widget type="led" version="2.0.0">
+              <name>LED</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrlFF-CalEn-RB</pv_name>
+              <x>280</x>
+              <y>418</y>
+            </widget>
+            <widget type="led" version="2.0.0">
+              <name>LED_1</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrlSP-CalEn-RB</pv_name>
+              <x>280</x>
+              <y>448</y>
             </widget>
             <widget type="embedded" version="2.0.0">
               <name>Embedded Display_18</name>
@@ -1949,8 +1953,8 @@ else:
               </macros>
               <file>calib-setup.bob</file>
               <x>10</x>
-              <y>380</y>
-              <width>710</width>
+              <y>350</y>
+              <width>450</width>
               <height>30</height>
             </widget>
             <widget type="embedded" version="2.0.0">
@@ -1960,10 +1964,49 @@ else:
               </macros>
               <file>calib-setup.bob</file>
               <x>10</x>
-              <y>410</y>
-              <width>710</width>
+              <y>380</y>
+              <width>450</width>
               <height>30</height>
             </widget>
+            <widget type="action_button" version="3.0.0">
+              <name>Action Button_1</name>
+              <actions>
+                <action type="open_display">
+                  <file>scaling_grad.bob</file>
+                  <macros>
+                    <CHANNEL>AI$(CH=0)</CHANNEL>
+                  </macros>
+                  <target>window</target>
+                  <description>Open Display</description>
+                </action>
+              </actions>
+              <text>...</text>
+              <x>520</x>
+              <y>112</y>
+              <width>50</width>
+              <height>20</height>
+              <tooltip>$(actions)</tooltip>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_426</name>
+              <class>HEADER3</class>
+              <text>Gradient Calibration</text>
+              <x>460</x>
+              <y>72</y>
+              <width>180</width>
+              <height>30</height>
+              <font use_class="true">
+                <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+                </font>
+              </font>
+              <foreground_color use_class="true">
+                <color name="Text" red="25" green="25" blue="25">
+                </color>
+              </foreground_color>
+              <horizontal_alignment>1</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+              <wrap_words>false</wrap_words>
+            </widget>
           </widget>
         </children>
       </tab>
@@ -2892,6 +2935,8 @@ else:
               <y>66</y>
               <width>50</width>
               <height>24</height>
+              <show_confirm_dialog>3</show_confirm_dialog>
+              <confirm_message>Is the Set Point defined ?</confirm_message>
             </widget>
             <widget type="label" version="2.0.0">
               <name>Label_RefMag_9</name>
@@ -2913,6 +2958,28 @@ else:
               <x>450</x>
               <y>70</y>
             </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_RefMag_10</name>
+              <class>CAPTION</class>
+              <text>Close loop on</text>
+              <x>898</x>
+              <y>42</y>
+              <width>121</width>
+              <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_20</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)CloseLoopCav</pv_name>
+              <x>928</x>
+              <y>72</y>
+              <width>140</width>
+              <height>20</height>
+            </widget>
           </widget>
           <widget type="tabs" version="2.0.0">
             <name>PI_Tabs_Calib</name>
@@ -2954,6 +3021,7 @@ else:
                     <macros>
                       <CT>SP</CT>
                       <LABEL>Set-Point</LABEL>
+                      <calib_bob>scaling_sp.bob</calib_bob>
                     </macros>
                     <file>magangtable.bob</file>
                     <x>5</x>
@@ -2980,7 +3048,6 @@ else:
             <y>295</y>
             <width>900</width>
             <height>360</height>
-            <active_tab>-1</active_tab>
             <direction>1</direction>
           </widget>
           <widget type="group" version="2.0.0">
@@ -3281,6 +3348,22 @@ else:
             <width>420</width>
             <height>160</height>
           </widget>
+          <widget type="action_button" version="3.0.0">
+            <name>Action Button_26</name>
+            <actions execute_as_one="true">
+              <action type="open_display">
+                <file>trends.bob</file>
+                <target>window</target>
+                <description>Open Display</description>
+              </action>
+            </actions>
+            <text>Controller Analysis OPI</text>
+            <x>998</x>
+            <y>379</y>
+            <width>110</width>
+            <height>50</height>
+            <tooltip>$(actions)</tooltip>
+          </widget>
         </children>
       </tab>
       <tab>
@@ -4175,6 +4258,128 @@ else:
               </on_color>
             </widget>
           </widget>
+          <widget type="group" version="2.0.0">
+            <name>SIS8300_Group_1</name>
+            <x>718</x>
+            <y>369</y>
+            <width>440</width>
+            <height>230</height>
+            <style>3</style>
+            <widget type="rectangle" version="2.0.0">
+              <name>Rectangle_264</name>
+              <y>30</y>
+              <width>440</width>
+              <height>200</height>
+              <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>
+            </widget>
+            <widget type="rectangle" version="2.0.0">
+              <name>Rectangle_265</name>
+              <width>440</width>
+              <height>30</height>
+              <line_width>0</line_width>
+              <background_color>
+                <color name="GROUP-BORDER" red="150" green="155" blue="151">
+                </color>
+              </background_color>
+              <corner_width>10</corner_width>
+              <corner_height>10</corner_height>
+            </widget>
+            <widget type="rectangle" version="2.0.0">
+              <name>Rectangle_266</name>
+              <y>10</y>
+              <width>440</width>
+              <line_width>0</line_width>
+              <background_color>
+                <color name="GROUP-BORDER" red="150" green="155" blue="151">
+                </color>
+              </background_color>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Group Title_83</name>
+              <text>Version Information</text>
+              <width>440</width>
+              <height>30</height>
+              <font>
+                <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_503</name>
+              <class>CAPTION</class>
+              <text>Firmware version</text>
+              <x>20</x>
+              <y>40</y>
+              <width>210</width>
+              <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="textupdate" version="2.0.0">
+              <name>Text Update_269</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)iFW</pv_name>
+              <x>250</x>
+              <y>40</y>
+              <width>110</width>
+              <precision>5</precision>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_504</name>
+              <class>CAPTION</class>
+              <text>sis8300llrf module version</text>
+              <x>10</x>
+              <y>70</y>
+              <width>220</width>
+              <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="label" version="2.0.0">
+              <name>Label_505</name>
+              <class>CAPTION</class>
+              <text>llrfsystem module version</text>
+              <x>10</x>
+              <y>100</y>
+              <width>220</width>
+              <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="textupdate" version="2.0.0">
+              <name>Text Update_270</name>
+              <pv_name>$(IOCNAME)sis8300llrf_VER</pv_name>
+              <x>250</x>
+              <y>70</y>
+              <width>110</width>
+              <precision>5</precision>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_271</name>
+              <pv_name>$(IOCNAME)llrfsystem_VER</pv_name>
+              <x>250</x>
+              <y>100</y>
+              <width>110</width>
+              <precision>5</precision>
+            </widget>
+          </widget>
         </children>
       </tab>
       <tab>
diff --git a/99-Shared/llrf/full-scaling.bob b/99-Shared/llrf/full-scaling.bob
new file mode 100644
index 0000000000000000000000000000000000000000..cee9e6cb32f2c3adae41d98d72d347fd53ce3ebc
--- /dev/null
+++ b/99-Shared/llrf/full-scaling.bob
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Full Scalling</name>
+  <width>1080</width>
+  <height>900</height>
+  <widget type="rectangle" version="2.0.0">
+    <name>Titlebar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1080</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Title</name>
+    <class>TITLE</class>
+    <text>Calibration Table - $(SYSNAME) - Channel $(CH=0)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1060</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="xyplot" version="2.0.0">
+    <name>X/Y Plot</name>
+    <y>50</y>
+    <width>1080</width>
+    <height>840</height>
+    <title>Calibration Values</title>
+    <show_legend>false</show_legend>
+    <tooltip></tooltip>
+    <x_axis>
+      <title>Raw Values</title>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+      <minimum>0.0</minimum>
+      <maximum>100.0</maximum>
+      <show_grid>false</show_grid>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+        </font>
+      </scale_font>
+      <visible>true</visible>
+    </x_axis>
+    <y_axes>
+      <y_axis>
+        <title>EGU Values</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>-10.0</minimum>
+        <maximum>10.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </y_axis>
+    </y_axes>
+    <traces>
+      <trace>
+        <name>Calibration Values</name>
+        <x_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalRaw</x_pv>
+        <y_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalEGU</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="0" green="0" blue="255">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>10</point_size>
+        <visible>true</visible>
+      </trace>
+      <trace>
+        <name>Fitted curve</name>
+        <x_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalRaw</x_pv>
+        <y_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalFitLin</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="255" green="0" blue="0">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>10</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
+  </widget>
+</display>
diff --git a/99-Shared/llrf/full-scaling_pi.bob b/99-Shared/llrf/full-scaling_pi.bob
new file mode 100644
index 0000000000000000000000000000000000000000..7a2bd0758f20485ae7769cd5ae49918407ddba6e
--- /dev/null
+++ b/99-Shared/llrf/full-scaling_pi.bob
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Full Scalling PI</name>
+  <width>1080</width>
+  <height>900</height>
+  <widget type="rectangle" version="2.0.0">
+    <name>Titlebar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1080</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Title</name>
+    <class>TITLE</class>
+    <text>Calibration Table - $(SYSNAME) - Channel $(CH=0)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1060</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="xyplot" version="2.0.0">
+    <name>X/Y Plot</name>
+    <y>50</y>
+    <width>1080</width>
+    <height>840</height>
+    <title>Calibration Values</title>
+    <show_legend>false</show_legend>
+    <tooltip></tooltip>
+    <x_axis>
+      <title>Raw Values</title>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+      <minimum>0.0</minimum>
+      <maximum>100.0</maximum>
+      <show_grid>false</show_grid>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+        </font>
+      </scale_font>
+      <visible>true</visible>
+    </x_axis>
+    <y_axes>
+      <y_axis>
+        <title>EGU Values</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>-10.0</minimum>
+        <maximum>10.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </y_axis>
+    </y_axes>
+    <traces>
+      <trace>
+        <name>Calibration Values</name>
+        <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-Cal$(XAX=Raw)</x_pv>
+        <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-Cal$(YAX=EGU)</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="0" green="0" blue="255">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>10</point_size>
+        <visible>true</visible>
+      </trace>
+      <trace>
+        <name>Fitted curve</name>
+        <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-Cal$(XAX=Raw)</x_pv>
+        <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalFitLin$(FIT=R2E)</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="255" green="0" blue="0">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>10</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
+  </widget>
+</display>
diff --git a/99-Shared/llrf/magangtable.bob b/99-Shared/llrf/magangtable.bob
index 2a8b73821bc7b704d567ec114a25107098c32ecb..d870a6a753211aaa78e5a7e54497bba731a66676 100644
--- a/99-Shared/llrf/magangtable.bob
+++ b/99-Shared/llrf/magangtable.bob
@@ -160,7 +160,7 @@
     <name>Action Button_28</name>
     <actions>
       <action type="open_display">
-        <file>pi-calibration.bob</file>
+        <file>$(calib_bob=scaling_output.bob)</file>
         <macros>
           <PI_TYPE>$(CT)</PI_TYPE>
         </macros>
diff --git a/99-Shared/llrf/overview.bob b/99-Shared/llrf/overview.bob
index 773ffcf6ed3c0cf6622e10a948b56550d6bd7929..d64b133df1c43f61119b727aac4206d5a98f9f15 100644
--- a/99-Shared/llrf/overview.bob
+++ b/99-Shared/llrf/overview.bob
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>LLRF Overview</name>
+  <name>$(SYSNAME=LLRF) - $(SYSDE=LLRF System)</name>
   <width>1800</width>
   <height>1050</height>
   <grid_visible>false</grid_visible>
@@ -464,13 +464,12 @@
   </widget>
   <widget type="slide_button" version="2.0.0">
     <name>Slide Button</name>
-    <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
-    <label>with Cavity</label>
+    <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
+    <label>show Cavity</label>
     <x>50</x>
     <y>811</y>
     <width>140</width>
     <height>40</height>
-    <show_confirm_dialog>1</show_confirm_dialog>
     <confirm_message>When you change this button the output calibration table will be changed. Are you sure you want to do this?</confirm_message>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -496,8 +495,9 @@
     <name>Action Button_18</name>
     <actions>
       <action type="open_display">
-        <file>freq-tracking.bob</file>
+        <file>pulse-gen.bob</file>
         <macros>
+          <PEVR>$(PEVR=RFQ-010:RFS-EVR-101:)</PEVR>
           <PI_TYPE>FF</PI_TYPE>
         </macros>
         <target>window</target>
@@ -511,4 +511,21 @@
     <height>60</height>
     <tooltip>$(actions)</tooltip>
   </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_19</name>
+    <actions>
+      <action type="open_display">
+        <file>sp-ramping.bob</file>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>SP Ramping</text>
+    <x>1630</x>
+    <y>330</y>
+    <width>130</width>
+    <height>60</height>
+    <tooltip>$(actions)</tooltip>
+    <enabled>$(SPRAMP=false)</enabled>
+  </widget>
 </display>
diff --git a/99-Shared/llrf/pi-autocalibration.bob b/99-Shared/llrf/pi-autocalibration.bob
index 91c34858c7b2684fcf00a2a4af7391aa1c3bcc0f..89d4589c8219db826b8e367fec3354a5ebfad5c7 100644
--- a/99-Shared/llrf/pi-autocalibration.bob
+++ b/99-Shared/llrf/pi-autocalibration.bob
@@ -312,7 +312,7 @@
       </x_axis>
       <y_axes>
         <y_axis>
-          <title></title>
+          <title>EGU values</title>
           <autoscale>true</autoscale>
           <log_scale>false</log_scale>
           <minimum>-10.0</minimum>
@@ -328,29 +328,12 @@
           </scale_font>
           <visible>true</visible>
         </y_axis>
-        <y_axis>
-          <title></title>
-          <autoscale>true</autoscale>
-          <log_scale>false</log_scale>
-          <minimum>0.0</minimum>
-          <maximum>100.0</maximum>
-          <show_grid>false</show_grid>
-          <title_font>
-            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-            </font>
-          </title_font>
-          <scale_font>
-            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
-            </font>
-          </scale_font>
-          <visible>true</visible>
-        </y_axis>
       </y_axes>
       <traces>
         <trace>
-          <name>EGU values - With Cavity</name>
-          <x_pv>$(P=LLRF1::)$(R=)$(PI_TYPE=SP)CalResRawCav</x_pv>
-          <y_pv>$(P=LLRF1::)$(R=)$(PI_TYPE=SP)CalResEGUCav</y_pv>
+          <name></name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrlFF-CalRaw</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrlFF-CalEGU</y_pv>
           <err_pv></err_pv>
           <axis>0</axis>
           <trace_type>1</trace_type>
@@ -364,23 +347,6 @@
           <point_size>10</point_size>
           <visible>true</visible>
         </trace>
-        <trace>
-          <name>EGU values - Without Cavity</name>
-          <x_pv>$(P=LLRF1::)$(R=)$(PI_TYPE=SP)CalResRawNoCav</x_pv>
-          <y_pv>$(P=LLRF1::)$(R=)$(PI_TYPE=SP)CalResEGUNoCav</y_pv>
-          <err_pv></err_pv>
-          <axis>1</axis>
-          <trace_type>1</trace_type>
-          <color>
-            <color red="255" green="0" blue="0">
-            </color>
-          </color>
-          <line_width>1</line_width>
-          <line_style>0</line_style>
-          <point_type>0</point_type>
-          <point_size>10</point_size>
-          <visible>true</visible>
-        </trace>
       </traces>
     </widget>
     <widget type="led" version="2.0.0">
@@ -462,7 +428,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_81</name>
       <class>CAPTION</class>
-      <text>Size of Calibration Table - With Cavity</text>
+      <text>Size of Calibration Table</text>
       <x>11</x>
       <y>590</y>
       <width>287</width>
@@ -476,33 +442,11 @@
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update_14</name>
-      <pv_name>$(P=LLRF1::)$(R=)$(PI_TYPE=SP)CalResEGUCav.NORD</pv_name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrlFF-CalRaw.NORD</pv_name>
       <x>310</x>
       <y>590</y>
       <height>30</height>
     </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_82</name>
-      <class>CAPTION</class>
-      <text>Size of Calibration Table - Without Cavity</text>
-      <x>11</x>
-      <y>630</y>
-      <width>287</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>
-    </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>Text Update_15</name>
-      <pv_name>$(P=LLRF1::)$(R=)$(PI_TYPE=SP)CalResEGUNoCav.NORD</pv_name>
-      <x>310</x>
-      <y>630</y>
-      <height>30</height>
-    </widget>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_4</name>
@@ -547,7 +491,7 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>MGGrey03-title_3</name>
-      <text>Step 3 - Apply calibration</text>
+      <text>Step 3 - Configure calibration</text>
       <width>370</width>
       <height>30</height>
       <font>
@@ -561,70 +505,33 @@
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_66</name>
-      <text>Status from calibration table</text>
-      <x>40</x>
-      <y>150</y>
-      <width>240</width>
-      <height>30</height>
-    </widget>
-    <widget type="led" version="2.0.0">
-      <name>LED_2</name>
-      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=SP)CalStat</pv_name>
-      <x>270</x>
-      <y>150</y>
-      <width>30</width>
-      <height>30</height>
-      <off_color>
-        <color name="OK" red="61" green="216" blue="61">
-        </color>
-      </off_color>
-      <on_color>
-        <color name="MAJOR" red="252" green="13" blue="27">
-        </color>
-      </on_color>
-    </widget>
-    <widget type="slide_button" version="2.0.0">
-      <name>Slide Button_2</name>
-      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=SP)CalEn</pv_name>
-      <label></label>
-      <x>270</x>
-      <y>205</y>
-      <width>50</width>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_77</name>
-      <text>Calibration Enable</text>
-      <x>40</x>
-      <y>205</y>
-      <width>179</width>
-      <height>30</height>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_79</name>
-      <text>Linear Calibration</text>
-      <x>40</x>
-      <y>245</y>
-      <width>150</width>
-      <height>30</height>
-    </widget>
-    <widget type="slide_button" version="2.0.0">
-      <name>Slide Button_3</name>
-      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=SP)CalLin</pv_name>
-      <label></label>
-      <x>270</x>
-      <y>245</y>
-      <width>50</width>
-    </widget>
     <widget type="label" version="2.0.0">
       <name>Label_64</name>
-      <text>When the automatic insertion is finished you can enable calibration and choose between Linear / Non-Linear calibration</text>
+      <text>When the automatic insertion is finished you should configure calibration</text>
       <x>20</x>
       <y>40</y>
       <width>330</width>
       <height>86</height>
     </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_28</name>
+      <actions>
+        <action type="open_display">
+          <file>scaling_output.bob</file>
+          <macros>
+            <PI_TYPE>FF</PI_TYPE>
+          </macros>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text>Configure FF Calibration</text>
+      <x>120</x>
+      <y>275</y>
+      <width>160</width>
+      <height>50</height>
+      <tooltip>$(actions)</tooltip>
+    </widget>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_5</name>
diff --git a/99-Shared/llrf/pi-calibration.bob b/99-Shared/llrf/pi-calibration.bob
deleted file mode 100644
index 0482982eeb6bf465e61dc0bc1af1956ed415b5bb..0000000000000000000000000000000000000000
--- a/99-Shared/llrf/pi-calibration.bob
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
-  <name>PI Calibration</name>
-  <width>530</width>
-  <height>560</height>
-  <widget type="rectangle" version="2.0.0">
-    <name>Titlebar</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
-    <width>530</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Title</name>
-    <class>TITLE</class>
-    <text>$(PI_TYPE) Calibration</text>
-    <x use_class="true">20</x>
-    <y use_class="true">0</y>
-    <width>470</width>
-    <height use_class="true">50</height>
-    <font use_class="true">
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
-      </font>
-    </font>
-    <foreground_color use_class="true">
-      <color name="HEADER-TEXT" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <transparent use_class="true">true</transparent>
-    <horizontal_alignment use_class="true">0</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <wrap_words use_class="true">false</wrap_words>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>MGGrey03</name>
-    <y>50</y>
-    <width>530</width>
-    <height>510</height>
-    <style>3</style>
-    <background_color>
-      <color name="BACKGROUND" red="220" green="225" blue="221">
-      </color>
-    </background_color>
-    <widget type="rectangle" version="2.0.0">
-      <name>MGGrey03-background_1</name>
-      <width>530</width>
-      <height>510</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="xyplot" version="2.0.0">
-      <name>X/Y Plot</name>
-      <x>40</x>
-      <y>40</y>
-      <width>470</width>
-      <height>340</height>
-      <title>Calibration Values</title>
-      <show_legend>false</show_legend>
-      <tooltip></tooltip>
-      <x_axis>
-        <title>Raw Values</title>
-        <autoscale>true</autoscale>
-        <log_scale>false</log_scale>
-        <minimum>0.0</minimum>
-        <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
-        <title_font>
-          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-          </font>
-        </title_font>
-        <scale_font>
-          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
-          </font>
-        </scale_font>
-        <visible>true</visible>
-      </x_axis>
-      <y_axes>
-        <y_axis>
-          <title>EGU Values</title>
-          <autoscale>true</autoscale>
-          <log_scale>false</log_scale>
-          <minimum>-10.0</minimum>
-          <maximum>10.0</maximum>
-          <show_grid>false</show_grid>
-          <title_font>
-            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-            </font>
-          </title_font>
-          <scale_font>
-            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
-            </font>
-          </scale_font>
-          <visible>true</visible>
-        </y_axis>
-      </y_axes>
-      <traces>
-        <trace>
-          <name>Calibration Values</name>
-          <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE)CalRaw</x_pv>
-          <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE)CalEGU</y_pv>
-          <err_pv></err_pv>
-          <axis>0</axis>
-          <trace_type>1</trace_type>
-          <color>
-            <color red="0" green="0" blue="255">
-            </color>
-          </color>
-          <line_width>1</line_width>
-          <line_style>0</line_style>
-          <point_type>0</point_type>
-          <point_size>10</point_size>
-          <visible>true</visible>
-        </trace>
-      </traces>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_3</name>
-      <text>Linear</text>
-      <x>40</x>
-      <y>390</y>
-      <width>160</width>
-    </widget>
-    <widget type="slide_button" version="2.0.0">
-      <name>Slide Button</name>
-      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE)CalLin</pv_name>
-      <label></label>
-      <x>110</x>
-      <y>390</y>
-      <width>80</width>
-    </widget>
-    <widget type="slide_button" version="2.0.0">
-      <name>Slide Button_1</name>
-      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE)CalEn</pv_name>
-      <label></label>
-      <x>110</x>
-      <y>420</y>
-      <width>80</width>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_4</name>
-      <text>Enable</text>
-      <x>40</x>
-      <y>420</y>
-      <width>60</width>
-    </widget>
-    <widget type="led" version="2.0.0">
-      <name>LED_2</name>
-      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=SP)CalStat</pv_name>
-      <x>120</x>
-      <y>460</y>
-      <off_color>
-        <color name="OK" red="61" green="216" blue="61">
-        </color>
-      </off_color>
-      <on_color>
-        <color name="MAJOR" red="252" green="13" blue="27">
-        </color>
-      </on_color>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_66</name>
-      <text>Status</text>
-      <x>40</x>
-      <y>460</y>
-      <width>60</width>
-      <height>30</height>
-    </widget>
-    <widget type="fileselector" version="2.0.0">
-      <name>File Selector</name>
-      <pv_name>loc://$(PD=LLRF:)$(RD=DIG01:)$(PI_TYPE)_filename("")</pv_name>
-      <x>470</x>
-      <y>400</y>
-      <height>40</height>
-    </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>Text Entry</name>
-      <pv_name>loc://$(PD=LLRF:)$(RD=DIG01:)$(PI_TYPE)_filename("")</pv_name>
-      <x>300</x>
-      <y>400</y>
-      <width>170</width>
-      <height>40</height>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_67</name>
-      <text>FIle name:</text>
-      <x>220</x>
-      <y>410</y>
-      <height>30</height>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Action Button_2</name>
-      <actions>
-        <action type="write_pv">
-          <pv_name>loc://$(PD=LLRF:)$(RD=DIG01:)$(PI_TYPE)_save_calib(0)</pv_name>
-          <value>1</value>
-          <description>Write PV</description>
-        </action>
-      </actions>
-      <text>Save calibration tables</text>
-      <x>220</x>
-      <y>450</y>
-      <width>110</width>
-      <height>50</height>
-      <scripts>
-        <script file="scripts/saveCSVPICalib.py">
-          <pv_name>loc://$(PD=LLRF:)$(RD=DIG01:)$(PI_TYPE)_save_calib(0)</pv_name>
-          <pv_name trigger="false">loc://$(PD=LLRF:)$(RD=DIG01:)$(PI_TYPE)_filename("")</pv_name>
-          <pv_name trigger="false">$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE)CalEGU</pv_name>
-          <pv_name trigger="false">$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE)CalRaw</pv_name>
-        </script>
-      </scripts>
-      <tooltip>$(actions)</tooltip>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>Action Button_3</name>
-      <actions>
-        <action type="write_pv">
-          <pv_name>loc://$(PD=LLRF:)$(RD=DIG01:)$(PI_TYPE)_load_calib(0)</pv_name>
-          <value>1</value>
-          <description>Write PV</description>
-        </action>
-      </actions>
-      <text>Load calibration tables</text>
-      <x>400</x>
-      <y>450</y>
-      <width>110</width>
-      <height>50</height>
-      <scripts>
-        <script file="scripts/loadCSVPICalib.py">
-          <pv_name>loc://$(PD=LLRF:)$(RD=DIG01:)$(PI_TYPE)_load_calib(0)</pv_name>
-          <pv_name trigger="false">loc://$(PD=LLRF:)$(RD=DIG01:)$(PI_TYPE)_filename("")</pv_name>
-          <pv_name trigger="false">$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE)CalEGU</pv_name>
-          <pv_name trigger="false">$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE)CalRaw</pv_name>
-        </script>
-      </scripts>
-      <tooltip>$(actions)</tooltip>
-    </widget>
-  </widget>
-</display>
diff --git a/99-Shared/llrf/pierror-limited.bob b/99-Shared/llrf/pierror-limited.bob
new file mode 100644
index 0000000000000000000000000000000000000000..689ed874de1d3b177d291cec9fe110a4ad59ed49
--- /dev/null
+++ b/99-Shared/llrf/pierror-limited.bob
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Display</name>
+  <width>660</width>
+  <height>350</height>
+  <widget type="xyplot" version="2.0.0">
+    <name>X/Y Plot_11</name>
+    <width>660</width>
+    <height>340</height>
+    <show_legend>false</show_legend>
+    <x_axis>
+      <title>ms</title>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+      <minimum>0.0</minimum>
+      <maximum>100.0</maximum>
+      <show_grid>false</show_grid>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+        </font>
+      </scale_font>
+      <visible>true</visible>
+    </x_axis>
+    <y_axes>
+      <y_axis>
+        <title></title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </y_axis>
+      <y_axis>
+        <title></title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </y_axis>
+    </y_axes>
+    <traces>
+      <trace>
+        <name>Magnitude</name>
+        <x_pv>$(PD=LLRF:)$(RD=DIG01:)IntChRFCErrXAxis.{"arr":{"s":$(S=0),"i":1,"e":$(E=-1)}}</x_pv>
+        <y_pv>$(PD=LLRF:)$(RD=DIG01:)IntChRFCErr-Cmp0.{"arr":{"s":$(S=0),"i":1,"e":$(E=-1)}}</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="0" green="0" blue="255">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>10</point_size>
+        <visible>true</visible>
+      </trace>
+      <trace>
+        <name>Angle</name>
+        <x_pv>$(PD=LLRF:)$(RD=DIG01:)IntChRFCErrXAxis.{"arr":{"s":$(S=0),"i":1,"e":$(E=-1)}}</x_pv>
+        <y_pv>$(PD=LLRF:)$(RD=DIG01:)IntChRFCErr-Cmp1.{"arr":{"s":$(S=0),"i":1,"e":$(E=-1)}}</y_pv>
+        <err_pv></err_pv>
+        <axis>1</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="255" green="0" blue="0">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>10</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
+  </widget>
+</display>
diff --git a/99-Shared/llrf/freq-tracking.bob b/99-Shared/llrf/pulse-gen.bob
similarity index 84%
rename from 99-Shared/llrf/freq-tracking.bob
rename to 99-Shared/llrf/pulse-gen.bob
index 1600245912c496877eeea58b6a4adbed879901d3..16742d3d737676ca9bdc4a8902365eb7f543ad3c 100644
--- a/99-Shared/llrf/freq-tracking.bob
+++ b/99-Shared/llrf/pulse-gen.bob
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>Pulse Generation</name>
+  <name>Pulse generation - $(SYSNAME=LLRF)</name>
   <width>920</width>
-  <height>750</height>
+  <height>960</height>
   <widget type="rectangle" version="2.0.0">
     <name>Titlebar</name>
     <class>TITLE-BAR</class>
@@ -19,10 +19,10 @@
   <widget type="label" version="2.0.0">
     <name>Title</name>
     <class>TITLE</class>
-    <text>Pulse generation</text>
+    <text>Pulse generation - $(SYSNAME=LLRF)</text>
     <x use_class="true">20</x>
     <y use_class="true">0</y>
-    <width>410</width>
+    <width>900</width>
     <height use_class="true">50</height>
     <font use_class="true">
       <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -225,7 +225,6 @@
       <y>79</y>
       <width>140</width>
       <height>30</height>
-      <precision>2</precision>
       <show_units>true</show_units>
       <maximum>1000.0</maximum>
       <increment>10.0</increment>
@@ -237,7 +236,6 @@
       <y>119</y>
       <width>140</width>
       <height>30</height>
-      <precision>2</precision>
       <minimum>1.0</minimum>
       <maximum>2.0</maximum>
       <increment>0.1</increment>
@@ -282,7 +280,6 @@
       <y>259</y>
       <width>140</width>
       <height>30</height>
-      <precision>1</precision>
     </widget>
   </widget>
   <widget type="group" version="2.0.0">
@@ -385,7 +382,6 @@
       <y>169</y>
       <width>129</width>
       <height>30</height>
-      <precision>0</precision>
       <show_units>true</show_units>
       <minimum>-1000000.0</minimum>
       <maximum>1000000.0</maximum>
@@ -426,18 +422,18 @@
     <y>100</y>
     <width>530</width>
     <height>210</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </line_color>
-    <arrows>2</arrows>
     <points>
       <point x="10.0" y="200.0">
       </point>
       <point x="10.0" y="10.0">
       </point>
     </points>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </line_color>
+    <arrows>2</arrows>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_1</name>
@@ -445,18 +441,18 @@
     <y>300</y>
     <width>510</width>
     <height>1</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color name="BLACK" red="0" green="0" blue="0">
-      </color>
-    </line_color>
-    <arrows>2</arrows>
     <points>
       <point x="0.0" y="0.0">
       </point>
       <point x="510.0" y="0.0">
       </point>
     </points>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </line_color>
+    <arrows>2</arrows>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
@@ -502,6 +498,12 @@
     <y>116</y>
     <width>1</width>
     <height>184</height>
+    <points>
+      <point x="0.0" y="10.0">
+      </point>
+      <point x="0.0" y="180.0">
+      </point>
+    </points>
     <line_width>2</line_width>
     <line_color>
       <color name="BLACK" red="0" green="0" blue="0">
@@ -509,12 +511,6 @@
     </line_color>
     <arrows>3</arrows>
     <arrow_length>10</arrow_length>
-    <points>
-      <point x="0.0" y="10.0">
-      </point>
-      <point x="0.0" y="180.0">
-      </point>
-    </points>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_2</name>
@@ -562,6 +558,12 @@
     <y>100</y>
     <width>80</width>
     <height>5</height>
+    <points>
+      <point x="80.0" y="0.0">
+      </point>
+      <point x="0.0" y="0.0">
+      </point>
+    </points>
     <line_width>2</line_width>
     <line_color>
       <color name="BLACK" red="0" green="0" blue="0">
@@ -569,12 +571,6 @@
     </line_color>
     <arrows>3</arrows>
     <arrow_length>10</arrow_length>
-    <points>
-      <point x="80.0" y="0.0">
-      </point>
-      <point x="0.0" y="0.0">
-      </point>
-    </points>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_7</name>
@@ -582,6 +578,12 @@
     <y>100</y>
     <width>105</width>
     <height>5</height>
+    <points>
+      <point x="105.0" y="0.0">
+      </point>
+      <point x="0.0" y="0.0">
+      </point>
+    </points>
     <line_width>2</line_width>
     <line_color>
       <color name="BLACK" red="0" green="0" blue="0">
@@ -589,12 +591,6 @@
     </line_color>
     <arrows>3</arrows>
     <arrow_length>10</arrow_length>
-    <points>
-      <point x="105.0" y="0.0">
-      </point>
-      <point x="0.0" y="0.0">
-      </point>
-    </points>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Polyline_8</name>
@@ -602,6 +598,12 @@
     <y>179</y>
     <width>1</width>
     <height>120</height>
+    <points>
+      <point x="0.0" y="6.521739130434782">
+      </point>
+      <point x="0.0" y="117.3913043478261">
+      </point>
+    </points>
     <line_width>2</line_width>
     <line_color>
       <color name="BLACK" red="0" green="0" blue="0">
@@ -609,11 +611,105 @@
     </line_color>
     <arrows>3</arrows>
     <arrow_length>10</arrow_length>
-    <points>
-      <point x="0.0" y="6.521739130434782">
-      </point>
-      <point x="0.0" y="117.3913043478261">
-      </point>
-    </points>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Static FeedForward Compensation</name>
+    <x>10</x>
+    <y>750</y>
+    <width>350</width>
+    <height>210</height>
+    <visible>$(FFCOMP=false)</visible>
+    <widget type="label" version="2.0.0">
+      <name>Label_24</name>
+      <class>CAPTION</class>
+      <text>Beam Start Detec.</text>
+      <y>59</y>
+      <width>139</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>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_25</name>
+      <class>CAPTION</class>
+      <text>Increase signal on Magnitude</text>
+      <y>9</y>
+      <width>130</width>
+      <height>50</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="spinner" version="2.0.0">
+      <name>Spinner_13</name>
+      <pv_name>$(P=LLRF:)$(R=)$(PI_TYPE=FF)StatCompMagInc</pv_name>
+      <x>159</x>
+      <y>9</y>
+      <width>138</width>
+      <height>30</height>
+      <precision>2</precision>
+      <show_units>true</show_units>
+      <maximum>1000.0</maximum>
+      <increment>10.0</increment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_26</name>
+      <class>CAPTION</class>
+      <text>Beam Start</text>
+      <x>19</x>
+      <y>99</y>
+      <width>120</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>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_11</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)PosBeamStart</pv_name>
+      <x>160</x>
+      <y>99</y>
+      <width>137</width>
+      <height>30</height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_27</name>
+      <class>CAPTION</class>
+      <text>Beam End</text>
+      <x>19</x>
+      <y>139</y>
+      <width>120</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>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_12</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)PosBeamEnd</pv_name>
+      <x>160</x>
+      <y>139</y>
+      <width>137</width>
+      <height>30</height>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)TrigBeamStart</pv_name>
+      <x>170</x>
+      <y>59</y>
+    </widget>
   </widget>
 </display>
diff --git a/99-Shared/llrf/scaling.bob b/99-Shared/llrf/scaling.bob
index 3fc44238d030458994a4cf1cf7479213a6b4a62c..57f0e0dcc06feb6e7b02b7ec2310ac4bb9ecb72c 100644
--- a/99-Shared/llrf/scaling.bob
+++ b/99-Shared/llrf/scaling.bob
@@ -1,86 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>Calibration Details - Dig $(RD=01) Channel $(CHANNEL=0)</name>
-  <width>1000</width>
-  <height>700</height>
-  <actions>
-  </actions>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Entry_2</name>
-    <pv_name>$(PD=LLRF:)$(RD=DIG01:)$(CHANNEL)-CalCSV</pv_name>
-    <x>160</x>
-    <y>500</y>
-    <width>170</width>
-    <height>49</height>
-    <format>6</format>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Calibration File Name:</text>
-    <y>519</y>
-    <width>160</width>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_1</name>
-    <text>Calculated Slope:</text>
-    <x>3</x>
-    <y>558</y>
-    <width>160</width>
+  <name>Polynomial fit calibration Channel $(CH=0)</name>
+  <width>1520</width>
+  <height>1020</height>
+  <widget type="rectangle" version="2.0.0">
+    <name>Titlebar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1520</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_2</name>
-    <text>Calculated Offset:</text>
-    <x>3</x>
-    <y>590</y>
-    <width>160</width>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update</name>
-    <pv_name>$(PD=LLRF:)$(RD=DIG01:)$(CHANNEL)-LinCvF-RB</pv_name>
-    <x>163</x>
-    <y>558</y>
-    <precision>4</precision>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_1</name>
-    <pv_name>$(PD=LLRF:)$(RD=DIG01:)$(CHANNEL)-LinCvO-RB</pv_name>
-    <x>163</x>
-    <y>590</y>
-    <precision>4</precision>
+    <name>Title</name>
+    <class>TITLE</class>
+    <text>Polynomial fit calibration Channel $(CH=0)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>880</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
   </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>X/Y Plot_1</name>
-    <x>520</x>
-    <y>90</y>
-    <width>470</width>
-    <height>340</height>
-    <title>Calibrated Waveform</title>
-    <show_legend>false</show_legend>
-    <tooltip></tooltip>
-    <x_axis>
-      <title>ms</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>1024.0</maximum>
-      <show_grid>false</show_grid>
-      <title_font>
-        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
-        </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>Y</title>
+  <widget type="group" version="2.0.0">
+    <name>MGGrey03</name>
+    <y>50</y>
+    <width>1520</width>
+    <height>970</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>MGGrey03-background_1</name>
+      <width>1520</width>
+      <height>970</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="xyplot" version="2.0.0">
+      <name>X/Y Plot</name>
+      <x>40</x>
+      <y>40</y>
+      <width>470</width>
+      <height>340</height>
+      <title>Calibration Values</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title>Raw Values</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
-        <minimum>-10.0</minimum>
-        <maximum>10.0</maximum>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
         <show_grid>false</show_grid>
         <title_font>
           <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
@@ -91,60 +88,208 @@
           </font>
         </scale_font>
         <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name></name>
-        <x_pv>$(PD=LLRF:)$(RD=DIG01:)$(CHANNEL)-XAxis</x_pv>
-        <y_pv>$(PD=LLRF:)$(RD=DIG01:)$(CHANNEL)</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="0" green="0" blue="255">
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>EGU Values</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>Calibration Values</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalRaw</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalEGU</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
           </color>
-        </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>10</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
-  </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>X/Y Plot</name>
-    <y>90</y>
-    <width>470</width>
-    <height>340</height>
-    <title>Calibration Values</title>
-    <show_legend>false</show_legend>
-    <tooltip></tooltip>
-    <x_axis>
-      <title>Raw Values</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>false</show_grid>
-      <title_font>
-        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+        <trace>
+          <name>Fitted curve</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalRaw</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalFitLin</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="255" green="0" blue="0">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="slide_button" version="2.0.0">
+      <name>Slide Button_1</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalEn</pv_name>
+      <label></label>
+      <x>630</x>
+      <y>460</y>
+      <width>80</width>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_4</name>
+      <text>Enable</text>
+      <x>550</x>
+      <y>460</y>
+      <width>60</width>
+    </widget>
+    <widget type="spinner" version="2.0.0">
+      <name>Spinner</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalOrd</pv_name>
+      <x>850</x>
+      <y>450</y>
+      <width>70</width>
+      <height>30</height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_68</name>
+      <text>Degree</text>
+      <x>760</x>
+      <y>450</y>
+      <width>60</width>
+      <height>30</height>
+    </widget>
+    <widget type="fileselector" version="2.0.0">
+      <name>File Selector</name>
+      <pv_name>loc://filename("")</pv_name>
+      <x>310</x>
+      <y>400</y>
+      <height>40</height>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Entry</name>
+      <pv_name>loc://filename("")</pv_name>
+      <x>120</x>
+      <y>400</y>
+      <width>170</width>
+      <height>40</height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_67</name>
+      <text>FIle name:</text>
+      <x>40</x>
+      <y>410</y>
+      <height>30</height>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_3</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>loc://loadtable$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)(0)</pv_name>
+          <value>1</value>
+          <description>Write PV</description>
+        </action>
+      </actions>
+      <text>Load calibration tables</text>
+      <x>390</x>
+      <y>400</y>
+      <width>110</width>
+      <height>50</height>
+      <scripts>
+        <script file="EmbeddedPy">
+          <text><![CDATA[# Embedded python script
+from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
+from jarray import array
+import csv
+
+run = PVUtil.getInt(pvs[0])
+if run == 1:
+    file_name = PVUtil.getString(pvs[1])
+
+    def decomment(csvfile):
+        for row in csvfile:
+            raw = row.split('#')[0].strip()
+            if raw: yield raw
+    with open(file_name) as csvfile:
+        reader = csv.reader(decomment(csvfile))
+        rows1 = []
+        rows2 = []
+        for row in reader:
+            rows1.append(float(row[0]))
+            rows2.append(float(row[1]))
+
+    pvs[2].setValue(array(rows1, 'd'))
+    pvs[3].setValue(array(rows2, 'd'))
+    pvs[0].setValue(0)]]></text>
+          <pv_name>loc://loadtable$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)(0)</pv_name>
+          <pv_name trigger="false">loc://filename("")</pv_name>
+          <pv_name trigger="false">$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalEGU</pv_name>
+          <pv_name trigger="false">$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalRaw</pv_name>
+        </script>
+      </scripts>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="text-symbol" version="2.0.0">
+      <name>Text Symbol_1</name>
+      <symbols>
+        <symbol>↦</symbol>
+      </symbols>
+      <x>540</x>
+      <y>130</y>
+      <width>100</width>
+      <height>90</height>
+      <font>
+        <font family="Source Sans Pro" style="REGULAR" size="72.0">
         </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>EGU Values</title>
+      </font>
+    </widget>
+    <widget type="array" version="2.0.0">
+      <name>Array_1</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalCoef</pv_name>
+      <x>710</x>
+      <y>70</y>
+      <width>240</width>
+      <height>350</height>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_1</name>
+        <width>220</width>
+        <height>30</height>
+        <format>3</format>
+        <precision>3</precision>
+      </widget>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_1</name>
+      <x>1020</x>
+      <y>40</y>
+      <width>470</width>
+      <height>340</height>
+      <title>Downsampled Channel $(CH=0)</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title></title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
-        <minimum>-10.0</minimum>
-        <maximum>10.0</maximum>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
         <show_grid>false</show_grid>
         <title_font>
           <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
@@ -155,123 +300,291 @@
           </font>
         </scale_font>
         <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>Calibration Values</name>
-        <x_pv>$(PD=LLRF:)$(RD=DIG01:)$(CHANNEL)-CalRaw</x_pv>
-        <y_pv>$(PD=LLRF:)$(RD=DIG01:)$(CHANNEL)-CalEGU</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="0" green="0" blue="255">
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Magnitude</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name></name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)Dwn$(CH=0)-XAxis.{"arr":{"s":0,"i":100,"e":-1}}</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)Dwn$(CH=0)-Cmp0.{"arr":{"s":0,"i":100,"e":-1}}</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
           </color>
-        </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>10</point_size>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <class>HEADER2</class>
+      <text>Calculated Coefficients </text>
+      <x>720</x>
+      <y>20</y>
+      <width>220</width>
+      <height>50</height>
+      <font use_class="true">
+        <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_4</name>
+      <actions>
+        <action type="open_display">
+          <file>full-scaling.bob</file>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text>...</text>
+      <x>470</x>
+      <y>360</y>
+      <width>40</width>
+      <height>20</height>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_5</name>
+      <actions>
+        <action type="open_display">
+          <file>plot-full.bob</file>
+          <macros>
+            <PLOT>$(PD=LLRF:)$(RD=DIG01:)Dwn$(CH=0)</PLOT>
+          </macros>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text>...</text>
+      <x>1470</x>
+      <y>360</y>
+      <width>21</width>
+      <height>20</height>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_5</name>
+      <text>Valid</text>
+      <x>550</x>
+      <y>410</y>
+      <width>60</width>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalEn-RB</pv_name>
+      <x>600</x>
+      <y>410</y>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_3</name>
+      <x>60</x>
+      <y>570</y>
+      <width>470</width>
+      <height>340</height>
+      <title>Residuals</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title>Raw Values</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
         <visible>true</visible>
-      </trace>
-      <trace>
-        <name>Fitted line</name>
-        <x_pv>$(PD=LLRF:)$(RD=DIG01:)$(CHANNEL)-CalRaw</x_pv>
-        <y_pv>$(PD=LLRF:)$(RD=DIG01:)$(CHANNEL)-CalFit</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color name="ERROR" red="252" green="13" blue="27">
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>Residuals</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalRaw</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalResid</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
           </color>
-        </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>10</point_size>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_2</name>
+      <x>1020</x>
+      <y>560</y>
+      <width>470</width>
+      <height>340</height>
+      <title>AI Channel $(CH=0)</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title></title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
         <visible>true</visible>
-      </trace>
-    </traces>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button</name>
-    <actions execute_as_one="true">
-      <action type="write_pv">
-        <pv_name>$(PD=LLRF:)$(RD=DIG01:)$(CHANNEL)-CalCSV</pv_name>
-        <value></value>
-        <description>Reset file name</description>
-      </action>
-    </actions>
-    <text>Reset Calibration</text>
-    <x>400</x>
-    <y>500</y>
-    <width>130</width>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Combo Box</name>
-    <pv_name>$(PD=LLRF:)$(RD=DIG01:)$(CHANNEL)-CalLin</pv_name>
-    <x>163</x>
-    <y>630</y>
-    <width>150</width>
-    <height>20</height>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_3</name>
-    <text>Linear/Non-Linear:</text>
-    <x>3</x>
-    <y>630</y>
-    <width>160</width>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
-    <width>1000</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
-      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_4</name>
-    <class>TITLE</class>
-    <text>Calibration Details - Dig $(RD=01) Channel $(CHANNEL=0)</text>
-    <x use_class="true">20</x>
-    <y use_class="true">0</y>
-    <width>980</width>
-    <height use_class="true">50</height>
-    <font use_class="true">
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
-      </font>
-    </font>
-    <foreground_color use_class="true">
-      <color name="HEADER-TEXT" red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <transparent use_class="true">true</transparent>
-    <horizontal_alignment use_class="true">0</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <wrap_words use_class="true">false</wrap_words>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_1</name>
-    <actions execute_as_one="true">
-      <action type="open_display">
-        <file>full-plot-calib.bob</file>
-        <target>window</target>
-        <description>Open Display</description>
-      </action>
-    </actions>
-    <text>...</text>
-    <x>440</x>
-    <y>410</y>
-    <width>30</width>
-    <height>20</height>
-    <tooltip>$(actions)</tooltip>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Magnitude</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name></name>
+          <x_pv></x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0).{"arr":{"s":0,"i":100,"e":-1}}</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_70</name>
+      <text>Chisq</text>
+      <x>100</x>
+      <y>920</y>
+      <width>60</width>
+      <height>30</height>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalChisq</pv_name>
+      <x>170</x>
+      <y>920</y>
+      <width>170</width>
+      <height>30</height>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_10</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>loc://$(PD=LLRF:)$(RD=DIG01:)$(CH)_save_tbl(0)</pv_name>
+          <value>1</value>
+          <description>Write PV</description>
+        </action>
+      </actions>
+      <text>Save Calibration</text>
+      <x>390</x>
+      <y>460</y>
+      <width>110</width>
+      <height>60</height>
+      <scripts>
+        <script file="EmbeddedPy">
+          <text><![CDATA[from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
+from jarray import array
+import csv
+
+run = PVUtil.getInt(pvs[0])
+if run == 1:
+    file_name = PVUtil.getString(pvs[1])
+    col1 = PVUtil.getDoubleArray(pvs[2])
+    col2 = PVUtil.getDoubleArray(pvs[3])
+    with open(file_name, "w") as csvfile:
+        writer = csv.writer(csvfile)
+        for i in range(len(col1)):
+            writer.writerow([col1[i], col2[i]])
+
+    pvs[0].setValue(0)]]></text>
+          <pv_name>loc://$(PD=LLRF:)$(RD=DIG01:)$(CH)_save_tbl(0)</pv_name>
+          <pv_name trigger="false">loc://filename("")</pv_name>
+          <pv_name trigger="false">$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalEGU</pv_name>
+          <pv_name trigger="false">$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalRaw</pv_name>
+        </script>
+      </scripts>
+      <tooltip>$(actions)</tooltip>
+    </widget>
   </widget>
 </display>
diff --git a/99-Shared/llrf/scaling_grad.bob b/99-Shared/llrf/scaling_grad.bob
new file mode 100644
index 0000000000000000000000000000000000000000..b8ba37329a9be0cb9d7d2a05adf836a7995f1c1f
--- /dev/null
+++ b/99-Shared/llrf/scaling_grad.bob
@@ -0,0 +1,781 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Cavity Calibration - Channel $(CH=0)</name>
+  <width>1770</width>
+  <height>1030</height>
+  <widget type="rectangle" version="2.0.0">
+    <name>Titlebar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1770</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Title</name>
+    <class>TITLE</class>
+    <text>Cavity Calibration - Channel $(CH=0)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>880</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="stripchart" version="2.0.0">
+    <name>Strip Chart</name>
+    <x>10</x>
+    <y>1050</y>
+    <width>440</width>
+    <height>390</height>
+    <traces>
+      <trace>
+        <name>$(traces[0].y_pv)</name>
+        <y_pv>$(PD=LLRF:)$(RD=DIG01:)Dwn$(CH=0)-Perf</y_pv>
+        <axis>0</axis>
+        <trace_type>2</trace_type>
+        <color>
+          <color red="0" green="0" blue="255">
+          </color>
+        </color>
+        <line_width>2</line_width>
+        <point_type>0</point_type>
+        <point_size>10</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>MGGrey02</name>
+    <x>10</x>
+    <y>60</y>
+    <width>770</width>
+    <height>400</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>MGGrey02-background</name>
+      <width>770</width>
+      <height>400</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>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>MGGrey02-title</name>
+      <text>Configure Polynomial calibration</text>
+      <x>10</x>
+      <width>750</width>
+      <height>30</height>
+      <font>
+        <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </font>
+      <background_color>
+        <color name="RED-BORDER" red="150" green="8" blue="16">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot</name>
+      <x>20</x>
+      <y>40</y>
+      <width>470</width>
+      <height>340</height>
+      <title>Calibration Values</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title>Raw Values</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>EGU Values</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>Calibration Values</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalRaw</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalEGU</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+        <trace>
+          <name>Fitted curve</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalRaw</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalFitLin</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="255" green="0" blue="0">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_4</name>
+      <actions>
+        <action type="open_display">
+          <file>full-scaling.bob</file>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text>...</text>
+      <x>450</x>
+      <y>360</y>
+      <width>40</width>
+      <height>20</height>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_3</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>loc://loadtable$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)(0)</pv_name>
+          <value>1</value>
+          <description>Write PV</description>
+        </action>
+      </actions>
+      <text>Load calibration tables from file</text>
+      <x>500</x>
+      <y>90</y>
+      <width>260</width>
+      <height>50</height>
+      <scripts>
+        <script file="EmbeddedPy">
+          <text><![CDATA[# Embedded python script
+from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
+from jarray import array
+import csv
+
+run = PVUtil.getInt(pvs[0])
+if run == 1:
+    file_name = PVUtil.getString(pvs[1])
+
+    def decomment(csvfile):
+        for row in csvfile:
+            raw = row.split('#')[0].strip()
+            if raw: yield raw
+    with open(file_name) as csvfile:
+        reader = csv.reader(decomment(csvfile))
+        rows1 = []
+        rows2 = []
+        for row in reader:
+            rows1.append(float(row[0]))
+            rows2.append(float(row[1]))
+
+    pvs[2].setValue(array(rows1, 'd'))
+    pvs[3].setValue(array(rows2, 'd'))
+    pvs[0].setValue(0)]]></text>
+          <pv_name>loc://loadtable$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)(0)</pv_name>
+          <pv_name trigger="false">loc://filename("")</pv_name>
+          <pv_name trigger="false">$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalEGU</pv_name>
+          <pv_name trigger="false">$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalRaw</pv_name>
+        </script>
+      </scripts>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_68</name>
+      <text>Degree</text>
+      <x>500</x>
+      <y>300</y>
+      <width>60</width>
+      <height>30</height>
+    </widget>
+    <widget type="spinner" version="2.0.0">
+      <name>Spinner</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalOrd</pv_name>
+      <x>580</x>
+      <y>300</y>
+      <width>80</width>
+      <height>30</height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_4</name>
+      <text>Enable</text>
+      <x>500</x>
+      <y>348</y>
+      <width>60</width>
+    </widget>
+    <widget type="slide_button" version="2.0.0">
+      <name>Slide Button_1</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalEn</pv_name>
+      <label></label>
+      <x>580</x>
+      <y>348</y>
+      <width>80</width>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalEn-RB</pv_name>
+      <x>643</x>
+      <y>351</y>
+    </widget>
+    <widget type="fileselector" version="2.0.0">
+      <name>File Selector</name>
+      <pv_name>loc://filename("")</pv_name>
+      <x>720</x>
+      <y>40</y>
+      <height>40</height>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Entry</name>
+      <pv_name>loc://filename("")</pv_name>
+      <x>580</x>
+      <y>40</y>
+      <width>130</width>
+      <height>40</height>
+    </widget>
+  </widget>
+  <widget type="text-symbol" version="2.0.0">
+    <name>Text Symbol_1</name>
+    <symbols>
+      <symbol>↧</symbol>
+    </symbols>
+    <x>360</x>
+    <y>460</y>
+    <width>100</width>
+    <height>90</height>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="72.0">
+      </font>
+    </font>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>MGGrey02_1</name>
+    <x>10</x>
+    <y>550</y>
+    <width>770</width>
+    <height>470</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>MGGrey02-background_1</name>
+      <width>770</width>
+      <height>470</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>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>MGGrey02-title_1</name>
+      <text>Polynomial calibration information</text>
+      <x>10</x>
+      <width>750</width>
+      <height>30</height>
+      <font>
+        <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </font>
+      <background_color>
+        <color name="RED-BORDER" red="150" green="8" blue="16">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="array" version="2.0.0">
+      <name>Array_1</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalCoef</pv_name>
+      <x>20</x>
+      <y>60</y>
+      <width>240</width>
+      <height>350</height>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_1</name>
+        <width>220</width>
+        <height>30</height>
+        <format>3</format>
+        <precision>3</precision>
+      </widget>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_3</name>
+      <x>280</x>
+      <y>60</y>
+      <width>470</width>
+      <height>350</height>
+      <title>Residuals</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title>Raw Values</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>Residuals</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalRaw</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalResid</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_70</name>
+      <text>Chisq</text>
+      <x>390</x>
+      <y>420</y>
+      <width>60</width>
+      <height>30</height>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalChisq</pv_name>
+      <x>460</x>
+      <y>420</y>
+      <width>170</width>
+      <height>30</height>
+    </widget>
+  </widget>
+  <widget type="text-symbol" version="2.0.0">
+    <name>Text Symbol_2</name>
+    <symbols>
+      <symbol>↦</symbol>
+    </symbols>
+    <x>780</x>
+    <y>260</y>
+    <width>100</width>
+    <height>90</height>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="72.0">
+      </font>
+    </font>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>MGGrey02_2</name>
+    <x>870</x>
+    <y>180</y>
+    <width>280</width>
+    <height>240</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>MGGrey02-background_2</name>
+      <width>280</width>
+      <height>240</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>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>MGGrey02-title_2</name>
+      <text>Gradient calibration</text>
+      <x>10</x>
+      <width>260</width>
+      <height>30</height>
+      <font>
+        <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </font>
+      <background_color>
+        <color name="RED-BORDER" red="150" green="8" blue="16">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_69</name>
+      <text>A</text>
+      <x>40</x>
+      <y>80</y>
+      <width>60</width>
+      <height>30</height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_71</name>
+      <text>Kt</text>
+      <x>40</x>
+      <y>120</y>
+      <width>60</width>
+      <height>30</height>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Entry_1</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalGradA</pv_name>
+      <x>70</x>
+      <y>70</y>
+      <width>170</width>
+      <height>40</height>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Entry_2</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalGradKt</pv_name>
+      <x>70</x>
+      <y>110</y>
+      <width>170</width>
+      <height>40</height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_72</name>
+      <text>Enable</text>
+      <x>60</x>
+      <y>190</y>
+      <width>70</width>
+    </widget>
+    <widget type="slide_button" version="2.0.0">
+      <name>Slide Button_2</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalGradEn</pv_name>
+      <label></label>
+      <x>160</x>
+      <y>190</y>
+      <width>80</width>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_73</name>
+      <text>Eacc=Kt*Sqrt(CavCh * 10^(A/10))</text>
+      <x>30</x>
+      <y>30</y>
+      <width>240</width>
+    </widget>
+  </widget>
+  <widget type="text-symbol" version="2.0.0">
+    <name>Text Symbol_3</name>
+    <symbols>
+      <symbol>↦</symbol>
+    </symbols>
+    <x>1150</x>
+    <y>260</y>
+    <width>100</width>
+    <height>90</height>
+    <font>
+      <font family="Source Sans Pro" style="REGULAR" size="72.0">
+      </font>
+    </font>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>MGGrey02_3</name>
+    <x>1240</x>
+    <y>60</y>
+    <width>520</width>
+    <height>760</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>MGGrey02-background_3</name>
+      <width>520</width>
+      <height>760</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>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>MGGrey02-title_3</name>
+      <text>Calibrated channel</text>
+      <x>10</x>
+      <width>500</width>
+      <height>30</height>
+      <font>
+        <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </font>
+      <background_color>
+        <color name="RED-BORDER" red="150" green="8" blue="16">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_1</name>
+      <x>30</x>
+      <y>50</y>
+      <width>470</width>
+      <height>340</height>
+      <title>Downsampled Channel $(CH=0)</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title></title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Magnitude</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name></name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)Dwn$(CH=0)-XAxis.{"arr":{"s":0,"i":100,"e":-1}}</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)Dwn$(CH=0)-Cmp0.{"arr":{"s":0,"i":100,"e":-1}}</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_5</name>
+      <actions>
+        <action type="open_display">
+          <file>plot-full.bob</file>
+          <macros>
+            <PLOT>$(PD=LLRF:)$(RD=DIG01:)Dwn$(CH=0)</PLOT>
+          </macros>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text>...</text>
+      <x>479</x>
+      <y>369</y>
+      <width>21</width>
+      <height>20</height>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_2</name>
+      <x>30</x>
+      <y>400</y>
+      <width>470</width>
+      <height>340</height>
+      <title>AI Channel $(CH=0)</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title></title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Magnitude</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name></name>
+          <x_pv></x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0).{"arr":{"s":0,"i":100,"e":-1}}</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_67</name>
+    <text>FIle name:</text>
+    <x>510</x>
+    <y>110</y>
+    <height>30</height>
+  </widget>
+</display>
diff --git a/99-Shared/llrf/scaling_output.bob b/99-Shared/llrf/scaling_output.bob
new file mode 100644
index 0000000000000000000000000000000000000000..1184d77b1dbd6c420a9f316e5cbd9de6383dabc0
--- /dev/null
+++ b/99-Shared/llrf/scaling_output.bob
@@ -0,0 +1,681 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Polynomial fit calibration - Output - $(PI_TYPE=FF)</name>
+  <width>1520</width>
+  <height>1130</height>
+  <widget type="rectangle" version="2.0.0">
+    <name>Titlebar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1520</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Title</name>
+    <class>TITLE</class>
+    <text>Polynomial fit calibration - Output - $(PI_TYPE=FF)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>920</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>MGGrey03</name>
+    <y>50</y>
+    <width>1520</width>
+    <height>1080</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>MGGrey03-background_1</name>
+      <width>1520</width>
+      <height>1080</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="xyplot" version="2.0.0">
+      <name>X/Y Plot</name>
+      <x>40</x>
+      <y>40</y>
+      <width>470</width>
+      <height>340</height>
+      <title>Calibration Values - Raw to EGU</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title>Raw Values</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>EGU Values</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>Calibration Values</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalRaw</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalEGU</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+        <trace>
+          <name>Fitted curve</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalRaw</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalFitLinR2E</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="255" green="0" blue="0">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="slide_button" version="2.0.0">
+      <name>Slide Button_1</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalEn</pv_name>
+      <label></label>
+      <x>150</x>
+      <y>966</y>
+      <width>80</width>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_4</name>
+      <text>Enable</text>
+      <x>70</x>
+      <y>970</y>
+      <width>60</width>
+    </widget>
+    <widget type="spinner" version="2.0.0">
+      <name>Spinner</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalOrdR2E</pv_name>
+      <x>850</x>
+      <y>450</y>
+      <width>70</width>
+      <height>30</height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_68</name>
+      <text>Degree</text>
+      <x>760</x>
+      <y>450</y>
+      <width>60</width>
+      <height>30</height>
+    </widget>
+    <widget type="text-symbol" version="2.0.0">
+      <name>Text Symbol_1</name>
+      <symbols>
+        <symbol>↦</symbol>
+      </symbols>
+      <x>540</x>
+      <y>130</y>
+      <width>100</width>
+      <height>90</height>
+      <font>
+        <font family="Source Sans Pro" style="REGULAR" size="72.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="array" version="2.0.0">
+      <name>Array_1</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalCoefR2E</pv_name>
+      <x>710</x>
+      <y>70</y>
+      <width>240</width>
+      <height>350</height>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_1</name>
+        <width>220</width>
+        <height>30</height>
+        <format>3</format>
+        <precision>3</precision>
+      </widget>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <class>HEADER2</class>
+      <text>Calculated Coefficients </text>
+      <x>720</x>
+      <y>20</y>
+      <width>220</width>
+      <height>50</height>
+      <font use_class="true">
+        <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_4</name>
+      <actions>
+        <action type="open_display">
+          <file>full-scaling_pi.bob</file>
+          <macros>
+            <FIT>R2E</FIT>
+            <XAX>Raw</XAX>
+            <YAX>EGU</YAX>
+          </macros>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text>...</text>
+      <x>470</x>
+      <y>360</y>
+      <width>40</width>
+      <height>20</height>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="spinner" version="2.0.0">
+      <name>Spinner_1</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalOrdE2R</pv_name>
+      <x>850</x>
+      <y>950</y>
+      <width>70</width>
+      <height>30</height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_69</name>
+      <text>Degree</text>
+      <x>760</x>
+      <y>950</y>
+      <width>60</width>
+      <height>30</height>
+    </widget>
+    <widget type="text-symbol" version="2.0.0">
+      <name>Text Symbol_2</name>
+      <symbols>
+        <symbol>↦</symbol>
+      </symbols>
+      <x>540</x>
+      <y>630</y>
+      <width>100</width>
+      <height>90</height>
+      <font>
+        <font family="Source Sans Pro" style="REGULAR" size="72.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="array" version="2.0.0">
+      <name>Array_2</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalCoefE2R</pv_name>
+      <x>710</x>
+      <y>570</y>
+      <width>240</width>
+      <height>350</height>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_2</name>
+        <width>220</width>
+        <height>30</height>
+        <format>3</format>
+        <precision>3</precision>
+      </widget>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_70</name>
+      <class>HEADER2</class>
+      <text>Calculated Coefficients </text>
+      <x>720</x>
+      <y>520</y>
+      <width>220</width>
+      <height>50</height>
+      <font use_class="true">
+        <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_3</name>
+      <x>40</x>
+      <y>560</y>
+      <width>470</width>
+      <height>340</height>
+      <title>Calibration Values - EGU to Raw</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title>EGU Values</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Raw Values</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>Calibration Values</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalEGU</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalRaw</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+        <trace>
+          <name>Fitted curve</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalEGU</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalFitLinE2R</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="255" green="0" blue="0">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_4</name>
+      <x>1020</x>
+      <y>70</y>
+      <width>470</width>
+      <height>340</height>
+      <title>Residuals</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title>Raw Values</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>Residuals</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalRaw</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalResidR2E</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_5</name>
+      <x>1030</x>
+      <y>600</y>
+      <width>470</width>
+      <height>340</height>
+      <title>Residuals</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title>EGU Values</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>Residuals</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalEGU</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalResidE2R</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_5</name>
+      <actions>
+        <action type="open_display">
+          <file>full-scaling_pi.bob</file>
+          <macros>
+            <FIT>E2R</FIT>
+            <XAX>EGU</XAX>
+            <YAX>Raw</YAX>
+          </macros>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text>...</text>
+      <x>470</x>
+      <y>880</y>
+      <width>40</width>
+      <height>20</height>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_71</name>
+      <text>Chisq</text>
+      <x>1160</x>
+      <y>420</y>
+      <width>60</width>
+      <height>30</height>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalChisqR2E</pv_name>
+      <x>1230</x>
+      <y>420</y>
+      <width>170</width>
+      <height>30</height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_72</name>
+      <text>Chisq</text>
+      <x>1180</x>
+      <y>950</y>
+      <width>60</width>
+      <height>30</height>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_3</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalChisqE2R</pv_name>
+      <x>1250</x>
+      <y>950</y>
+      <width>170</width>
+      <height>30</height>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalEn-RB</pv_name>
+      <x>210</x>
+      <y>970</y>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_67</name>
+      <text>FIle name:</text>
+      <x>50</x>
+      <y>420</y>
+      <height>30</height>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Entry</name>
+      <pv_name>loc://filename("")</pv_name>
+      <x>130</x>
+      <y>410</y>
+      <width>170</width>
+      <height>40</height>
+    </widget>
+    <widget type="fileselector" version="2.0.0">
+      <name>File Selector</name>
+      <pv_name>loc://filename("")</pv_name>
+      <x>320</x>
+      <y>410</y>
+      <height>40</height>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_10</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>loc://$(PD=LLRF:)$(RD=DIG01:)$(PI_TYPE=FF)_save_tbl(0)</pv_name>
+          <value>1</value>
+          <description>Write PV</description>
+        </action>
+      </actions>
+      <text>Save Calibration</text>
+      <x>400</x>
+      <y>470</y>
+      <width>110</width>
+      <height>60</height>
+      <scripts>
+        <script file="EmbeddedPy">
+          <text><![CDATA[from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
+from jarray import array
+import csv
+
+run = PVUtil.getInt(pvs[0])
+if run == 1:
+    file_name = PVUtil.getString(pvs[1])
+    col1 = PVUtil.getDoubleArray(pvs[2])
+    col2 = PVUtil.getDoubleArray(pvs[3])
+    with open(file_name, "w") as csvfile:
+        writer = csv.writer(csvfile)
+        for i in range(len(col1)):
+            writer.writerow([col1[i], col2[i]])
+
+    pvs[0].setValue(0)]]></text>
+          <pv_name>loc://$(PD=LLRF:)$(RD=DIG01:)$(PI_TYPE=FF)_save_tbl(0)</pv_name>
+          <pv_name trigger="false">loc://filename("")</pv_name>
+          <pv_name trigger="false">$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalEGU</pv_name>
+          <pv_name trigger="false">$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalRaw</pv_name>
+        </script>
+      </scripts>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_3</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>loc://$(PD=LLRF:)$(RD=DIG01:)$(PI_TYPE=FF)_load_tbl(0)</pv_name>
+          <value>1</value>
+          <description>Write PV</description>
+        </action>
+      </actions>
+      <text>Load calibration tables</text>
+      <x>400</x>
+      <y>410</y>
+      <width>110</width>
+      <height>50</height>
+      <scripts>
+        <script file="EmbeddedPy">
+          <text><![CDATA[# Embedded python script
+from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
+from jarray import array
+import csv
+
+run = PVUtil.getInt(pvs[0])
+if run == 1:
+    file_name = PVUtil.getString(pvs[1])
+
+    def decomment(csvfile):
+        for row in csvfile:
+            raw = row.split('#')[0].strip()
+            if raw: yield raw
+    with open(file_name) as csvfile:
+        reader = csv.reader(decomment(csvfile))
+        rows1 = []
+        rows2 = []
+        for row in reader:
+            rows1.append(float(row[0]))
+            rows2.append(float(row[1]))
+
+    pvs[2].setValue(array(rows1, 'd'))
+    pvs[3].setValue(array(rows2, 'd'))
+    pvs[0].setValue(0)]]></text>
+          <pv_name>loc://$(PD=LLRF:)$(RD=DIG01:)$(PI_TYPE=FF)_load_tbl(0)</pv_name>
+          <pv_name trigger="false">loc://filename("")</pv_name>
+          <pv_name trigger="false">$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalEGU</pv_name>
+          <pv_name trigger="false">$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalRaw</pv_name>
+        </script>
+      </scripts>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+  </widget>
+</display>
diff --git a/99-Shared/llrf/scaling_sp.bob b/99-Shared/llrf/scaling_sp.bob
new file mode 100644
index 0000000000000000000000000000000000000000..147cfbb44d29c865b48de328116b428c26980c9a
--- /dev/null
+++ b/99-Shared/llrf/scaling_sp.bob
@@ -0,0 +1,638 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Polynomial fit calibration - Output - $(PI_TYPE=SP)</name>
+  <width>1520</width>
+  <height>1130</height>
+  <widget type="rectangle" version="2.0.0">
+    <name>Titlebar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1520</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Title</name>
+    <class>TITLE</class>
+    <text>Polynomial fit calibration - Output - $(PI_TYPE=FF)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>920</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>MGGrey03</name>
+    <y>50</y>
+    <width>1520</width>
+    <height>1080</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="rectangle" version="2.0.0">
+      <name>MGGrey03-background_1</name>
+      <width>1520</width>
+      <height>1080</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="xyplot" version="2.0.0">
+      <name>X/Y Plot</name>
+      <x>40</x>
+      <y>40</y>
+      <width>470</width>
+      <height>340</height>
+      <title>Calibration Values - Raw to EGU</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title>Raw Values</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>EGU Values</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>Calibration Values</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalRaw</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalEGU</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+        <trace>
+          <name>Fitted curve</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalRaw</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalFitLinR2E</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="255" green="0" blue="0">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="slide_button" version="2.0.0">
+      <name>Slide Button_1</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalEn</pv_name>
+      <label></label>
+      <x>150</x>
+      <y>966</y>
+      <width>80</width>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_4</name>
+      <text>Enable</text>
+      <x>70</x>
+      <y>970</y>
+      <width>60</width>
+    </widget>
+    <widget type="text-symbol" version="2.0.0">
+      <name>Text Symbol_1</name>
+      <symbols>
+        <symbol>↦</symbol>
+      </symbols>
+      <x>540</x>
+      <y>130</y>
+      <width>100</width>
+      <height>90</height>
+      <font>
+        <font family="Source Sans Pro" style="REGULAR" size="72.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="array" version="2.0.0">
+      <name>Array_1</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalCoefR2E</pv_name>
+      <x>710</x>
+      <y>70</y>
+      <width>240</width>
+      <height>350</height>
+      <widget type="textupdate" version="2.0.0">
+        <name>Text Update_1</name>
+        <width>220</width>
+        <height>30</height>
+        <format>3</format>
+        <precision>3</precision>
+      </widget>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <class>HEADER2</class>
+      <text>Calculated Coefficients </text>
+      <x>720</x>
+      <y>20</y>
+      <width>220</width>
+      <height>50</height>
+      <font use_class="true">
+        <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_4</name>
+      <actions>
+        <action type="open_display">
+          <file>full-scaling_pi.bob</file>
+          <macros>
+            <FIT>R2E</FIT>
+            <XAX>Raw</XAX>
+            <YAX>EGU</YAX>
+          </macros>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text>...</text>
+      <x>470</x>
+      <y>360</y>
+      <width>40</width>
+      <height>20</height>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="text-symbol" version="2.0.0">
+      <name>Text Symbol_2</name>
+      <symbols>
+        <symbol>↦</symbol>
+      </symbols>
+      <x>540</x>
+      <y>630</y>
+      <width>100</width>
+      <height>90</height>
+      <font>
+        <font family="Source Sans Pro" style="REGULAR" size="72.0">
+        </font>
+      </font>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_3</name>
+      <x>40</x>
+      <y>560</y>
+      <width>470</width>
+      <height>340</height>
+      <title>Calibration Values - EGU to Raw</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title>EGU Values</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Raw Values</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>Calibration Values</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalEGU</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalRaw</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+        <trace>
+          <name>Fitted curve</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalEGU</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalFitLinE2R</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="255" green="0" blue="0">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_4</name>
+      <x>1020</x>
+      <y>70</y>
+      <width>470</width>
+      <height>340</height>
+      <title>Residuals</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title>Raw Values</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>Residuals</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalRaw</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalResidR2E</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>X/Y Plot_5</name>
+      <x>1030</x>
+      <y>600</y>
+      <width>470</width>
+      <height>340</height>
+      <title>Residuals</title>
+      <show_legend>false</show_legend>
+      <tooltip></tooltip>
+      <x_axis>
+        <title>EGU Values</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-10.0</minimum>
+          <maximum>10.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>Residuals</name>
+          <x_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalEGU</x_pv>
+          <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalResidE2R</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>10</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_5</name>
+      <actions>
+        <action type="open_display">
+          <file>full-scaling_pi.bob</file>
+          <macros>
+            <FIT>E2R</FIT>
+            <XAX>EGU</XAX>
+            <YAX>Raw</YAX>
+          </macros>
+          <target>window</target>
+          <description>Open Display</description>
+        </action>
+      </actions>
+      <text>...</text>
+      <x>470</x>
+      <y>880</y>
+      <width>40</width>
+      <height>20</height>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_71</name>
+      <text>Chisq</text>
+      <x>1160</x>
+      <y>420</y>
+      <width>60</width>
+      <height>30</height>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalChisqR2E</pv_name>
+      <x>1230</x>
+      <y>420</y>
+      <width>170</width>
+      <height>30</height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_72</name>
+      <text>Chisq</text>
+      <x>1180</x>
+      <y>950</y>
+      <width>60</width>
+      <height>30</height>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_3</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalChisqE2R</pv_name>
+      <x>1250</x>
+      <y>950</y>
+      <width>170</width>
+      <height>30</height>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalEn-RB</pv_name>
+      <x>210</x>
+      <y>970</y>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_5</name>
+      <class>CAPTION</class>
+      <text>Use Sqrt Fit</text>
+      <x>30</x>
+      <y>1014</y>
+      <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="slide_button" version="2.0.0">
+      <name>Slide Button_2</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)SPCalSqrtFitEn</pv_name>
+      <label></label>
+      <x>150</x>
+      <y>1010</y>
+      <width>80</width>
+    </widget>
+    <widget type="group" version="2.0.0">
+      <name>Group</name>
+      <x>700</x>
+      <y>510</y>
+      <width>260</width>
+      <height>470</height>
+      <style>3</style>
+      <rules>
+        <rule name="sqrt" prop_id="visible" out_exp="false">
+          <exp bool_exp="pv0=0">
+            <value>true</value>
+          </exp>
+          <exp bool_exp="pv0=1">
+            <value>false</value>
+          </exp>
+          <pv_name>$(PD=LLRF:)$(RD=DIG01:)SPCalSqrtFitEn</pv_name>
+        </rule>
+      </rules>
+      <widget type="spinner" version="2.0.0">
+        <name>Spinner_1</name>
+        <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalOrdE2R</pv_name>
+        <x>150</x>
+        <y>430</y>
+        <width>70</width>
+        <height>30</height>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_69</name>
+        <text>Degree</text>
+        <x>60</x>
+        <y>430</y>
+        <width>60</width>
+        <height>30</height>
+      </widget>
+      <widget type="array" version="2.0.0">
+        <name>Array_2</name>
+        <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCtrl$(PI_TYPE=FF)-CalCoefE2R</pv_name>
+        <x>10</x>
+        <y>50</y>
+        <width>240</width>
+        <height>350</height>
+        <widget type="textupdate" version="2.0.0">
+          <name>Text Update_2</name>
+          <width>220</width>
+          <height>30</height>
+          <format>3</format>
+          <precision>3</precision>
+        </widget>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_70</name>
+        <class>HEADER2</class>
+        <text>Calculated Coefficients </text>
+        <x>20</x>
+        <width>220</width>
+        <height>50</height>
+        <font use_class="true">
+          <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+          </font>
+        </font>
+      </widget>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_73</name>
+      <class>CAPTION</class>
+      <text>Gradient calibration</text>
+      <x>290</x>
+      <y>966</y>
+      <width>140</width>
+      <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="slide_button" version="2.0.0">
+      <name>Slide Button_3</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)AI$(CH=0)-CalGradEn</pv_name>
+      <label></label>
+      <x>450</x>
+      <y>966</y>
+      <width>80</width>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_74</name>
+      <class>CAPTION</class>
+      <text>Loop Closed on</text>
+      <x>290</x>
+      <y>1010</y>
+      <width>140</width>
+      <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="textupdate" version="2.0.0">
+      <name>Text Update_4</name>
+      <pv_name>$(PD=LLRF:)$(RD=DIG01:)CloseLoopCav</pv_name>
+      <x>450</x>
+      <y>1010</y>
+      <width>160</width>
+    </widget>
+  </widget>
+</display>
diff --git a/99-Shared/llrf/sp-ramping.bob b/99-Shared/llrf/sp-ramping.bob
new file mode 100644
index 0000000000000000000000000000000000000000..d198555c1a7a059b7c2b8371b4a5b898e375e98e
--- /dev/null
+++ b/99-Shared/llrf/sp-ramping.bob
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>$(SYSNAME=LLRF) - SP Ramping</name>
+  <width>920</width>
+  <height>960</height>
+  <widget type="rectangle" version="2.0.0">
+    <name>Titlebar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1200</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Title</name>
+    <class>TITLE</class>
+    <text>$(SYSNAME=LLRF) - SP Ramping</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>410</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="xyplot" version="2.0.0">
+    <name>X/Y Plot_5</name>
+    <x>380</x>
+    <y>60</y>
+    <width>530</width>
+    <height>340</height>
+    <title>SP Table</title>
+    <x_axis>
+      <title>X</title>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+      <minimum>0.0</minimum>
+      <maximum>100.0</maximum>
+      <show_grid>false</show_grid>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+        </font>
+      </scale_font>
+      <visible>true</visible>
+    </x_axis>
+    <y_axes>
+      <y_axis>
+        <title>Cavity Field [kV]</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </y_axis>
+      <y_axis>
+        <title>Phase</title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>-3.2</minimum>
+        <maximum>3.2</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </y_axis>
+    </y_axes>
+    <traces>
+      <trace>
+        <name>MAG</name>
+        <x_pv></x_pv>
+        <y_pv>$(PD=LLRF:)$(RD=DIG01:)SPTbl-Mag</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="0" green="0" blue="255">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>10</point_size>
+        <visible>true</visible>
+      </trace>
+      <trace>
+        <name>ANG</name>
+        <x_pv></x_pv>
+        <y_pv>$(PD=LLRF:)$(RD=DIG01:)SPTbl-Ang</y_pv>
+        <err_pv></err_pv>
+        <axis>1</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color name="MAJOR" red="252" green="13" blue="27">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>10</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Pulse generation</name>
+    <x>10</x>
+    <y>70</y>
+    <width>350</width>
+    <height>240</height>
+    <widget type="label" version="2.0.0">
+      <name>Label_9</name>
+      <class>CAPTION</class>
+      <text>Enable</text>
+      <y>19</y>
+      <width>130</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>
+    </widget>
+    <widget type="slide_button" version="2.0.0">
+      <name>Slide Button_2</name>
+      <pv_name>$(P=LLRF:)$(R=)SPRampingEn</pv_name>
+      <label></label>
+      <x>249</x>
+      <y>19</y>
+      <width>50</width>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_10</name>
+      <class>CAPTION</class>
+      <text>Cavity Field A:</text>
+      <y>79</y>
+      <width>130</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>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_11</name>
+      <class>CAPTION</class>
+      <text>Filling time:</text>
+      <y>119</y>
+      <width>130</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>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_13</name>
+      <class>CAPTION</class>
+      <text>Tao:</text>
+      <y>159</y>
+      <width>130</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>
+    </widget>
+    <widget type="spinner" version="2.0.0">
+      <name>Spinner</name>
+      <pv_name>$(P=LLRF:)$(R=)SPRampingA</pv_name>
+      <x>159</x>
+      <y>79</y>
+      <width>140</width>
+      <height>30</height>
+      <precision>2</precision>
+      <show_units>true</show_units>
+      <maximum>1000.0</maximum>
+      <increment>10.0</increment>
+    </widget>
+    <widget type="spinner" version="2.0.0">
+      <name>Spinner_2</name>
+      <pv_name>$(P=LLRF:)$(R=)SPRampingTfill</pv_name>
+      <x>159</x>
+      <y>119</y>
+      <width>140</width>
+      <height>30</height>
+      <show_units>true</show_units>
+      <increment>0.1</increment>
+    </widget>
+    <widget type="spinner" version="2.0.0">
+      <name>Spinner_3</name>
+      <pv_name>$(P=LLRF:)$(R=)SPRampingTao</pv_name>
+      <x>159</x>
+      <y>159</y>
+      <width>140</width>
+      <height>30</height>
+      <show_units>true</show_units>
+      <increment>0.1</increment>
+    </widget>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_22</name>
+    <text>Maximum pulse length:</text>
+    <x>370</x>
+    <y>410</y>
+    <width>200</width>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update</name>
+    <pv_name>$(P=LLRF:)$(R=)SPRampingT</pv_name>
+    <x>570</x>
+    <y>410</y>
+    <width>140</width>
+  </widget>
+</display>
diff --git a/99-Shared/llrf/synoptic.bob b/99-Shared/llrf/synoptic.bob
index b8c51ffcf672451c1329806fa461b36673f00ac2..bf4e7ecf21e19272080d600ead23b90726b9425e 100644
--- a/99-Shared/llrf/synoptic.bob
+++ b/99-Shared/llrf/synoptic.bob
@@ -726,7 +726,7 @@
     </line_color>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -799,7 +799,7 @@
     <resize>2</resize>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -827,7 +827,7 @@
     </line_color>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -855,7 +855,7 @@
     </line_color>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -871,7 +871,7 @@
     <transparent>true</transparent>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -896,7 +896,7 @@
     <arrow_length>5</arrow_length>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -921,7 +921,7 @@
     <arrow_length>5</arrow_length>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -937,7 +937,7 @@
     <transparent>true</transparent>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -963,7 +963,7 @@
     </line_color>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -989,7 +989,7 @@
     </line_color>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -1015,7 +1015,7 @@
     </line_color>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -1041,7 +1041,7 @@
     </line_color>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -1104,7 +1104,7 @@
     <arrow_length>5</arrow_length>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -1119,7 +1119,7 @@
     <transparent>true</transparent>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
     <widget type="rectangle" version="2.0.0">
@@ -1213,7 +1213,7 @@
     <transparent>true</transparent>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
     <widget type="rectangle" version="2.0.0">
@@ -1348,7 +1348,7 @@
     <transparent>true</transparent>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
     <widget type="polyline" version="2.0.0">
@@ -1398,7 +1398,7 @@
     <transparent>true</transparent>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
     <widget type="polyline" version="2.0.0">
@@ -1535,7 +1535,7 @@
     <arrow_length>5</arrow_length>
     <scripts>
       <script file="scripts/hideCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -1550,7 +1550,7 @@
     <transparent>true</transparent>
     <scripts>
       <script file="scripts/hideCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -1573,7 +1573,7 @@
     <arrow_length>5</arrow_length>
     <scripts>
       <script file="scripts/hideCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
   </widget>
@@ -1598,7 +1598,7 @@
     <visible>false</visible>
     <scripts>
       <script file="scripts/showCavity.py">
-        <pv_name>$(P=LLRF::)$(R=)CavityEn</pv_name>
+        <pv_name>loc://showCav$(P=LLRF::)$(R=)(0)</pv_name>
       </script>
     </scripts>
     <tooltip>$(actions)</tooltip>
diff --git a/99-Shared/llrf/trends.bob b/99-Shared/llrf/trends.bob
new file mode 100644
index 0000000000000000000000000000000000000000..8ca00d0126da55082c9347af8b10bb5ab6b3a67b
--- /dev/null
+++ b/99-Shared/llrf/trends.bob
@@ -0,0 +1,2015 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Trends</name>
+  <width>1130</width>
+  <height>1020</height>
+  <widget type="tabs" version="2.0.0">
+    <name>Tabs</name>
+    <tabs>
+      <tab>
+        <name>PI Error RMS - Conf.</name>
+        <children>
+          <widget type="label" version="2.0.0">
+            <name>Label_451</name>
+            <class>TITLE</class>
+            <text>PI Error RMS - Configuration</text>
+            <x use_class="true">20</x>
+            <y use_class="true">0</y>
+            <width>490</width>
+            <height use_class="true">50</height>
+            <font use_class="true">
+              <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+              </font>
+            </font>
+            <foreground_color use_class="true">
+              <color name="HEADER-TEXT" red="0" green="0" blue="0">
+              </color>
+            </foreground_color>
+            <transparent use_class="true">true</transparent>
+            <horizontal_alignment use_class="true">0</horizontal_alignment>
+            <vertical_alignment use_class="true">1</vertical_alignment>
+            <wrap_words use_class="true">false</wrap_words>
+          </widget>
+          <widget type="group" version="2.0.0">
+            <name>MGGrey02_4</name>
+            <x>548</x>
+            <y>68</y>
+            <width>520</width>
+            <height>250</height>
+            <style>3</style>
+            <background_color>
+              <color name="BACKGROUND" red="220" green="225" blue="221">
+              </color>
+            </background_color>
+            <widget type="rectangle" version="2.0.0">
+              <name>MGGrey02-background_4</name>
+              <width>520</width>
+              <height>250</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>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>MGGrey02-title_4</name>
+              <text>Configure Limits</text>
+              <x>10</x>
+              <width>500</width>
+              <height>30</height>
+              <font>
+                <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+                </font>
+              </font>
+              <background_color>
+                <color name="RED-BORDER" red="150" green="8" blue="16">
+                </color>
+              </background_color>
+              <horizontal_alignment>1</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_449</name>
+              <text>Magnitude Limit Beam Arrival</text>
+              <x>10</x>
+              <y>80</y>
+              <width>200</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textentry" version="3.0.0">
+              <name>Text Entry_137</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSLim-BA-Cmp0</pv_name>
+              <x>220</x>
+              <y>80</y>
+              <width>140</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_450</name>
+              <text>Angle Limit Beam Arrival</text>
+              <x>10</x>
+              <y>110</y>
+              <width>200</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textentry" version="3.0.0">
+              <name>Text Entry_138</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSLim-BA-Cmp1</pv_name>
+              <x>220</x>
+              <y>110</y>
+              <width>140</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_471</name>
+              <text>Magnitude Limit Stable Beam</text>
+              <x>10</x>
+              <y>150</y>
+              <width>200</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textentry" version="3.0.0">
+              <name>Text Entry_139</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSLim-SB-Cmp0</pv_name>
+              <x>220</x>
+              <y>150</y>
+              <width>140</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_472</name>
+              <text>Angle Limit Stable Beam</text>
+              <x>10</x>
+              <y>180</y>
+              <width>200</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textentry" version="3.0.0">
+              <name>Text Entry_140</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSLim-SB-Cmp1</pv_name>
+              <x>220</x>
+              <y>180</y>
+              <width>140</width>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_151</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrLimBACmp0</pv_name>
+              <x>400</x>
+              <y>80</y>
+              <width>90</width>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_153</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrLimBACmp1</pv_name>
+              <x>400</x>
+              <y>110</y>
+              <width>90</width>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_155</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrLimSBCmp0</pv_name>
+              <x>400</x>
+              <y>150</y>
+              <width>90</width>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_157</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrLimSBCmp1</pv_name>
+              <x>400</x>
+              <y>180</y>
+              <width>90</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_470</name>
+              <class>CAPTION</class>
+              <text>Calculated  Limit</text>
+              <x>340</x>
+              <y>50</y>
+              <width>150</width>
+              <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>
+          <widget type="group" version="2.0.0">
+            <name>MGGrey02_3</name>
+            <x>8</x>
+            <y>68</y>
+            <width>520</width>
+            <height>250</height>
+            <style>3</style>
+            <background_color>
+              <color name="BACKGROUND" red="220" green="225" blue="221">
+              </color>
+            </background_color>
+            <widget type="rectangle" version="2.0.0">
+              <name>MGGrey02-background_3</name>
+              <width>520</width>
+              <height>250</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>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>MGGrey02-title_3</name>
+              <text>Configure RMS</text>
+              <x>10</x>
+              <width>500</width>
+              <height>30</height>
+              <font>
+                <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+                </font>
+              </font>
+              <background_color>
+                <color name="RED-BORDER" red="150" green="8" blue="16">
+                </color>
+              </background_color>
+              <horizontal_alignment>1</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_442</name>
+              <text>Pulse Count</text>
+              <x>120</x>
+              <y>130</y>
+              <width>130</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_133</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSPulses</pv_name>
+              <x>260</x>
+              <y>130</y>
+              <width>140</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_443</name>
+              <text>Beam arrival time</text>
+              <x>120</x>
+              <y>160</y>
+              <width>130</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_444</name>
+              <text>Width Beam arrival</text>
+              <x>120</x>
+              <y>40</y>
+              <width>130</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textentry" version="3.0.0">
+              <name>Text Entry_134</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSWidth-BA</pv_name>
+              <x>260</x>
+              <y>40</y>
+              <width>140</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_445</name>
+              <text>Beam Start</text>
+              <x>120</x>
+              <y>70</y>
+              <width>130</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textentry" version="3.0.0">
+              <name>Text Entry_135</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSBeamStart</pv_name>
+              <x>260</x>
+              <y>70</y>
+              <width>140</width>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_134</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)PosBeamStart</pv_name>
+              <x>260</x>
+              <y>160</y>
+              <width>140</width>
+            </widget>
+            <widget type="slide_button" version="2.0.0">
+              <name>Slide Button_3</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSUseBeamMeas</pv_name>
+              <label></label>
+              <x>262</x>
+              <y>94</y>
+              <width>50</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_446</name>
+              <class>CAPTION</class>
+              <text>Use beam arrival from firmware</text>
+              <x>20</x>
+              <y>100</y>
+              <width>230</width>
+              <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_12</name>
+              <actions execute_as_one="true">
+                <action type="write_pv">
+                  <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSRst</pv_name>
+                  <value>1</value>
+                  <description>Write PV</description>
+                </action>
+              </actions>
+              <text>Reset</text>
+              <x>262</x>
+              <y>200</y>
+              <width>90</width>
+              <height>40</height>
+              <tooltip>$(actions)</tooltip>
+            </widget>
+          </widget>
+          <widget type="group" version="2.0.0">
+            <name>MGGrey02_2</name>
+            <x>8</x>
+            <y>338</y>
+            <width>520</width>
+            <height>250</height>
+            <style>3</style>
+            <background_color>
+              <color name="BACKGROUND" red="220" green="225" blue="221">
+              </color>
+            </background_color>
+            <widget type="rectangle" version="2.0.0">
+              <name>MGGrey02-background_2</name>
+              <width>520</width>
+              <height>250</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>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>MGGrey02-title_2</name>
+              <text>Beam Arrival RMS Values</text>
+              <x>10</x>
+              <width>500</width>
+              <height>30</height>
+              <font>
+                <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+                </font>
+              </font>
+              <background_color>
+                <color name="RED-BORDER" red="150" green="8" blue="16">
+                </color>
+              </background_color>
+              <horizontal_alignment>1</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_434</name>
+              <text>Average Mag among last pulses</text>
+              <x>30</x>
+              <y>102</y>
+              <width>240</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_436</name>
+              <text>Maximum Mag among last pulses</text>
+              <y>72</y>
+              <width>270</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_126</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSMax-BA-Cmp0</pv_name>
+              <x>311</x>
+              <y>72</y>
+              <width>99</width>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_128</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSAvg-BA-Cmp0</pv_name>
+              <x>311</x>
+              <y>102</y>
+              <width>99</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_447</name>
+              <text>Last Pulse Mag</text>
+              <x>110</x>
+              <y>42</y>
+              <width>160</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_135</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-BA-Cmp0</pv_name>
+              <x>311</x>
+              <y>42</y>
+              <width>99</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_448</name>
+              <text>Last Pulse Ang</text>
+              <x>65</x>
+              <y>140</y>
+              <width>210</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_136</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-BA-Cmp1</pv_name>
+              <x>311</x>
+              <y>140</y>
+              <width>99</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_435</name>
+              <text>Average Ang among last pulses</text>
+              <x>60</x>
+              <y>200</y>
+              <width>220</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_125</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSAvg-BA-Cmp1</pv_name>
+              <x>310</x>
+              <y>200</y>
+              <width>99</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_437</name>
+              <text>Maximum Ang among last pulses</text>
+              <x>30</x>
+              <y>170</y>
+              <width>245</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_127</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSMax-BA-Cmp1</pv_name>
+              <x>311</x>
+              <y>170</y>
+              <width>99</width>
+            </widget>
+          </widget>
+          <widget type="group" version="2.0.0">
+            <name>MGGrey02_5</name>
+            <x>548</x>
+            <y>338</y>
+            <width>520</width>
+            <height>250</height>
+            <style>3</style>
+            <background_color>
+              <color name="BACKGROUND" red="220" green="225" blue="221">
+              </color>
+            </background_color>
+            <widget type="rectangle" version="2.0.0">
+              <name>MGGrey02-background_5</name>
+              <width>520</width>
+              <height>250</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>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>MGGrey02-title_5</name>
+              <text>Stable RMS Values</text>
+              <x>10</x>
+              <width>500</width>
+              <height>30</height>
+              <font>
+                <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+                </font>
+              </font>
+              <background_color>
+                <color name="RED-BORDER" red="150" green="8" blue="16">
+                </color>
+              </background_color>
+              <horizontal_alignment>1</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_129</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSMax-SB-Cmp0</pv_name>
+              <x>330</x>
+              <y>80</y>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_132</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSAvg-SB-Cmp0</pv_name>
+              <x>330</x>
+              <y>110</y>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_137</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-SB-Cmp0</pv_name>
+              <x>330</x>
+              <y>50</y>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_452</name>
+              <text>Last Pulse Mag</text>
+              <x>130</x>
+              <y>50</y>
+              <width>160</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_453</name>
+              <text>Maximum Mag among last pulses</text>
+              <x>20</x>
+              <y>80</y>
+              <width>270</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_454</name>
+              <text>Average Mag among last pulses</text>
+              <x>50</x>
+              <y>110</y>
+              <width>240</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_130</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSMax-SB-Cmp1</pv_name>
+              <x>331</x>
+              <y>170</y>
+              <width>99</width>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_131</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSAvg-SB-Cmp1</pv_name>
+              <x>330</x>
+              <y>200</y>
+              <width>99</width>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_138</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-SB-Cmp1</pv_name>
+              <x>331</x>
+              <y>140</y>
+              <width>99</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_455</name>
+              <text>Last Pulse Ang</text>
+              <x>75</x>
+              <y>140</y>
+              <width>210</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_456</name>
+              <text>Maximum Ang among last pulses</text>
+              <x>40</x>
+              <y>170</y>
+              <width>245</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_457</name>
+              <text>Average Ang among last pulses</text>
+              <x>70</x>
+              <y>200</y>
+              <width>220</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+          </widget>
+        </children>
+      </tab>
+      <tab>
+        <name>Controller/Ref. Line</name>
+        <children>
+          <widget type="group" version="2.0.0">
+            <name>MGGrey02_6</name>
+            <x>8</x>
+            <y>68</y>
+            <width>520</width>
+            <height>480</height>
+            <style>3</style>
+            <background_color>
+              <color name="BACKGROUND" red="220" green="225" blue="221">
+              </color>
+            </background_color>
+            <widget type="rectangle" version="2.0.0">
+              <name>MGGrey02-background_6</name>
+              <width>520</width>
+              <height>480</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>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>MGGrey02-title_6</name>
+              <text>Controler Input</text>
+              <x>10</x>
+              <width>500</width>
+              <height>30</height>
+              <font>
+                <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+                </font>
+              </font>
+              <background_color>
+                <color name="RED-BORDER" red="150" green="8" blue="16">
+                </color>
+              </background_color>
+              <horizontal_alignment>1</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="stripchart" version="2.0.0">
+              <name>Strip Chart_3</name>
+              <x>10</x>
+              <y>40</y>
+              <width>500</width>
+              <height>310</height>
+              <time_range>30 seconds</time_range>
+              <y_axes>
+                <y_axis>
+                  <title></title>
+                  <autoscale>true</autoscale>
+                  <log_scale>false</log_scale>
+                  <minimum>0.0</minimum>
+                  <maximum>100.0</maximum>
+                  <show_grid>false</show_grid>
+                  <visible>true</visible>
+                </y_axis>
+                <y_axis>
+                  <title></title>
+                  <autoscale>true</autoscale>
+                  <log_scale>false</log_scale>
+                  <minimum>0.0</minimum>
+                  <maximum>100.0</maximum>
+                  <show_grid>false</show_grid>
+                  <visible>true</visible>
+                </y_axis>
+              </y_axes>
+              <traces>
+                <trace>
+                  <name>Magnitude</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)CtrlIn-Mag</y_pv>
+                  <axis>0</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="0" green="0" blue="255">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+                <trace>
+                  <name>Angle</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)CtrlIn-Ang</y_pv>
+                  <axis>1</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="255" green="0" blue="0">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+              </traces>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_423</name>
+              <text>I</text>
+              <x>40</x>
+              <y>410</y>
+              <width>80</width>
+              <height>50</height>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_166</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)CtrlIn-I</pv_name>
+              <x>140</x>
+              <y>420</y>
+              <width>120</width>
+              <height>30</height>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_167</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)CtrlIn-Q</pv_name>
+              <x>360</x>
+              <y>420</y>
+              <width>120</width>
+              <height>30</height>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_424</name>
+              <text>Q</text>
+              <x>260</x>
+              <y>410</y>
+              <width>80</width>
+              <height>50</height>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_168</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)CtrlIn-Mag</pv_name>
+              <x>140</x>
+              <y>380</y>
+              <width>120</width>
+              <height>30</height>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_425</name>
+              <text>Magnitude</text>
+              <x>40</x>
+              <y>370</y>
+              <width>80</width>
+              <height>50</height>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_426</name>
+              <text>Angle</text>
+              <x>260</x>
+              <y>370</y>
+              <width>80</width>
+              <height>50</height>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_169</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)CtrlIn-Ang</pv_name>
+              <x>360</x>
+              <y>380</y>
+              <width>120</width>
+              <height>30</height>
+            </widget>
+          </widget>
+          <widget type="group" version="2.0.0">
+            <name>MGGrey02_7</name>
+            <x>548</x>
+            <y>68</y>
+            <width>520</width>
+            <height>480</height>
+            <style>3</style>
+            <background_color>
+              <color name="BACKGROUND" red="220" green="225" blue="221">
+              </color>
+            </background_color>
+            <widget type="rectangle" version="2.0.0">
+              <name>MGGrey02-background_7</name>
+              <width>520</width>
+              <height>480</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>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>MGGrey02-title_7</name>
+              <text>Reference Line</text>
+              <x>10</x>
+              <width>500</width>
+              <height>30</height>
+              <font>
+                <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+                </font>
+              </font>
+              <background_color>
+                <color name="RED-BORDER" red="150" green="8" blue="16">
+                </color>
+              </background_color>
+              <horizontal_alignment>1</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_427</name>
+              <text>I</text>
+              <x>30</x>
+              <y>420</y>
+              <width>80</width>
+              <height>50</height>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_170</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RefLine-I</pv_name>
+              <x>130</x>
+              <y>430</y>
+              <width>120</width>
+              <height>30</height>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_171</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RefLine-Q</pv_name>
+              <x>350</x>
+              <y>430</y>
+              <width>120</width>
+              <height>30</height>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_428</name>
+              <text>Q</text>
+              <x>250</x>
+              <y>420</y>
+              <width>80</width>
+              <height>50</height>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_172</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RefLine-Mag</pv_name>
+              <x>130</x>
+              <y>390</y>
+              <width>120</width>
+              <height>30</height>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_429</name>
+              <text>Magnitude</text>
+              <x>30</x>
+              <y>370</y>
+              <width>80</width>
+              <height>50</height>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_430</name>
+              <text>Angle</text>
+              <x>250</x>
+              <y>370</y>
+              <width>80</width>
+              <height>50</height>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_173</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RefLine-Ang</pv_name>
+              <x>350</x>
+              <y>390</y>
+              <width>120</width>
+              <height>30</height>
+            </widget>
+            <widget type="stripchart" version="2.0.0">
+              <name>Strip Chart_4</name>
+              <x>10</x>
+              <y>40</y>
+              <width>500</width>
+              <height>310</height>
+              <title>Reference Line</title>
+              <time_range>30 seconds</time_range>
+              <y_axes>
+                <y_axis>
+                  <title></title>
+                  <autoscale>true</autoscale>
+                  <log_scale>false</log_scale>
+                  <minimum>0.0</minimum>
+                  <maximum>100.0</maximum>
+                  <show_grid>false</show_grid>
+                  <visible>true</visible>
+                </y_axis>
+                <y_axis>
+                  <title></title>
+                  <autoscale>true</autoscale>
+                  <log_scale>false</log_scale>
+                  <minimum>0.0</minimum>
+                  <maximum>100.0</maximum>
+                  <show_grid>false</show_grid>
+                  <visible>true</visible>
+                </y_axis>
+              </y_axes>
+              <traces>
+                <trace>
+                  <name>Magnitude</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RefLine-Mag</y_pv>
+                  <axis>0</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="0" green="0" blue="255">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+                <trace>
+                  <name>Angle</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RefLine-Ang</y_pv>
+                  <axis>1</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="255" green="0" blue="0">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+              </traces>
+            </widget>
+          </widget>
+          <widget type="label" version="2.0.0">
+            <name>Label_506</name>
+            <class>TITLE</class>
+            <text>Controller Input / Reference Line</text>
+            <x use_class="true">20</x>
+            <y use_class="true">0</y>
+            <width>588</width>
+            <height use_class="true">50</height>
+            <font use_class="true">
+              <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+              </font>
+            </font>
+            <foreground_color use_class="true">
+              <color name="HEADER-TEXT" red="0" green="0" blue="0">
+              </color>
+            </foreground_color>
+            <transparent use_class="true">true</transparent>
+            <horizontal_alignment use_class="true">0</horizontal_alignment>
+            <vertical_alignment use_class="true">1</vertical_alignment>
+            <wrap_words use_class="true">false</wrap_words>
+          </widget>
+        </children>
+      </tab>
+      <tab>
+        <name>PI Error RMS - Trends</name>
+        <children>
+          <widget type="label" version="2.0.0">
+            <name>Label_422</name>
+            <class>TITLE</class>
+            <text>PI Error RMS</text>
+            <x use_class="true">20</x>
+            <y use_class="true">0</y>
+            <width>490</width>
+            <height use_class="true">50</height>
+            <font use_class="true">
+              <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+              </font>
+            </font>
+            <foreground_color use_class="true">
+              <color name="HEADER-TEXT" red="0" green="0" blue="0">
+              </color>
+            </foreground_color>
+            <transparent use_class="true">true</transparent>
+            <horizontal_alignment use_class="true">0</horizontal_alignment>
+            <vertical_alignment use_class="true">1</vertical_alignment>
+            <wrap_words use_class="true">false</wrap_words>
+          </widget>
+          <widget type="group" version="2.0.0">
+            <name>MGGrey02</name>
+            <x>8</x>
+            <y>58</y>
+            <width>540</width>
+            <height>920</height>
+            <style>3</style>
+            <background_color>
+              <color name="BACKGROUND" red="220" green="225" blue="221">
+              </color>
+            </background_color>
+            <widget type="rectangle" version="2.0.0">
+              <name>MGGrey02-background</name>
+              <width>540</width>
+              <height>920</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>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>MGGrey02-title</name>
+              <text>Beam Arrival</text>
+              <x>10</x>
+              <width>520</width>
+              <height>30</height>
+              <font>
+                <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+                </font>
+              </font>
+              <background_color>
+                <color name="RED-BORDER" red="150" green="8" blue="16">
+                </color>
+              </background_color>
+              <horizontal_alignment>1</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="stripchart" version="2.0.0">
+              <name>Strip Chart_5</name>
+              <x>10</x>
+              <y>40</y>
+              <width>520</width>
+              <height>310</height>
+              <title>Magnitude</title>
+              <time_range>30 seconds</time_range>
+              <y_axes>
+                <y_axis>
+                  <title></title>
+                  <autoscale>true</autoscale>
+                  <log_scale>false</log_scale>
+                  <minimum>0.0</minimum>
+                  <maximum>100.0</maximum>
+                  <show_grid>false</show_grid>
+                  <visible>true</visible>
+                </y_axis>
+              </y_axes>
+              <traces>
+                <trace>
+                  <name>Magnitude</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-BA-Cmp0</y_pv>
+                  <axis>0</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="0" green="0" blue="255">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+                <trace>
+                  <name>Average RMS</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSAvg-BA-Cmp0</y_pv>
+                  <axis>0</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="255" green="0" blue="0">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+                <trace>
+                  <name>Limit</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrLimBACmp0</y_pv>
+                  <axis>0</axis>
+                  <trace_type>1</trace_type>
+                  <color>
+                    <color red="0" green="255" blue="0">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+                <trace>
+                  <name>Average</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrAvg-BA-Cmp0</y_pv>
+                  <axis>0</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="170" green="0" blue="255">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+              </traces>
+            </widget>
+            <widget type="stripchart" version="2.0.0">
+              <name>Strip Chart_8</name>
+              <x>10</x>
+              <y>360</y>
+              <width>520</width>
+              <height>310</height>
+              <title>Angle</title>
+              <time_range>30 seconds</time_range>
+              <y_axes>
+                <y_axis>
+                  <title></title>
+                  <autoscale>true</autoscale>
+                  <log_scale>false</log_scale>
+                  <minimum>0.0</minimum>
+                  <maximum>100.0</maximum>
+                  <show_grid>false</show_grid>
+                  <visible>true</visible>
+                </y_axis>
+              </y_axes>
+              <traces>
+                <trace>
+                  <name>Magnitude</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-BA-Cmp1</y_pv>
+                  <axis>0</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="0" green="0" blue="255">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+                <trace>
+                  <name>Average RMS</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSAvg-BA-Cmp1</y_pv>
+                  <axis>0</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="255" green="0" blue="0">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+                <trace>
+                  <name>Limit</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrLimBACmp1</y_pv>
+                  <axis>0</axis>
+                  <trace_type>1</trace_type>
+                  <color>
+                    <color red="0" green="255" blue="0">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+                <trace>
+                  <name>Average</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrAvg-BA-Cmp1</y_pv>
+                  <axis>0</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="170" green="0" blue="255">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+              </traces>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_458</name>
+              <text>Average Mag among last pulses</text>
+              <x>90</x>
+              <y>760</y>
+              <width>240</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_460</name>
+              <text>Maximum Mag among last pulses</text>
+              <x>60</x>
+              <y>730</y>
+              <width>270</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_140</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSMax-BA-Cmp0</pv_name>
+              <x>341</x>
+              <y>730</y>
+              <width>99</width>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_142</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSAvg-BA-Cmp0</pv_name>
+              <x>341</x>
+              <y>760</y>
+              <width>99</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_462</name>
+              <text>Last Pulse Mag</text>
+              <x>170</x>
+              <y>700</y>
+              <width>160</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_147</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-BA-Cmp0</pv_name>
+              <x>341</x>
+              <y>700</y>
+              <width>99</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_459</name>
+              <text>Average Ang among last pulses</text>
+              <x>110</x>
+              <y>870</y>
+              <width>220</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_139</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSAvg-BA-Cmp1</pv_name>
+              <x>340</x>
+              <y>870</y>
+              <width>99</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_461</name>
+              <text>Maximum Ang among last pulses</text>
+              <x>80</x>
+              <y>840</y>
+              <width>245</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_141</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSMax-BA-Cmp1</pv_name>
+              <x>341</x>
+              <y>840</y>
+              <width>99</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_463</name>
+              <text>Last Pulse Ang</text>
+              <x>115</x>
+              <y>810</y>
+              <width>210</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_148</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-BA-Cmp1</pv_name>
+              <x>341</x>
+              <y>810</y>
+              <width>99</width>
+            </widget>
+          </widget>
+          <widget type="group" version="2.0.0">
+            <name>MGGrey02_1</name>
+            <x>558</x>
+            <y>58</y>
+            <width>540</width>
+            <height>920</height>
+            <style>3</style>
+            <background_color>
+              <color name="BACKGROUND" red="220" green="225" blue="221">
+              </color>
+            </background_color>
+            <widget type="rectangle" version="2.0.0">
+              <name>MGGrey02-background_1</name>
+              <width>540</width>
+              <height>920</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>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>MGGrey02-title_1</name>
+              <text>Stable Beam</text>
+              <x>10</x>
+              <width>520</width>
+              <height>30</height>
+              <font>
+                <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+                </font>
+              </font>
+              <background_color>
+                <color name="RED-BORDER" red="150" green="8" blue="16">
+                </color>
+              </background_color>
+              <horizontal_alignment>1</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="stripchart" version="2.0.0">
+              <name>Strip Chart_6</name>
+              <x>10</x>
+              <y>40</y>
+              <width>520</width>
+              <height>310</height>
+              <title>Magnitude</title>
+              <time_range>30 seconds</time_range>
+              <y_axes>
+                <y_axis>
+                  <title></title>
+                  <autoscale>true</autoscale>
+                  <log_scale>false</log_scale>
+                  <minimum>0.0</minimum>
+                  <maximum>100.0</maximum>
+                  <show_grid>false</show_grid>
+                  <visible>true</visible>
+                </y_axis>
+              </y_axes>
+              <traces>
+                <trace>
+                  <name>Magnitude</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-SB-Cmp0</y_pv>
+                  <axis>0</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="0" green="0" blue="255">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+                <trace>
+                  <name>Average RMS</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSAvg-SB-Cmp0</y_pv>
+                  <axis>1</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="255" green="0" blue="0">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+                <trace>
+                  <name>Limit</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrLimSBCmp0</y_pv>
+                  <axis>0</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="0" green="255" blue="0">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+                <trace>
+                  <name>Average</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrAvg-SB-Cmp0</y_pv>
+                  <axis>0</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="170" green="0" blue="255">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+              </traces>
+            </widget>
+            <widget type="stripchart" version="2.0.0">
+              <name>Strip Chart_9</name>
+              <x>10</x>
+              <y>360</y>
+              <width>520</width>
+              <height>310</height>
+              <title>Angle</title>
+              <time_range>30 seconds</time_range>
+              <y_axes>
+                <y_axis>
+                  <title></title>
+                  <autoscale>true</autoscale>
+                  <log_scale>false</log_scale>
+                  <minimum>0.0</minimum>
+                  <maximum>100.0</maximum>
+                  <show_grid>false</show_grid>
+                  <visible>true</visible>
+                </y_axis>
+              </y_axes>
+              <traces>
+                <trace>
+                  <name>Angle</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-SB-Cmp1</y_pv>
+                  <axis>0</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="0" green="0" blue="255">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+                <trace>
+                  <name>Average RMS</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSAvg-SB-Cmp1</y_pv>
+                  <axis>1</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="255" green="0" blue="0">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+                <trace>
+                  <name>Limit</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrLimSBCmp1</y_pv>
+                  <axis>0</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="0" green="255" blue="0">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+                <trace>
+                  <name>Average</name>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)RFCErrAvg-SB-Cmp1</y_pv>
+                  <axis>0</axis>
+                  <trace_type>2</trace_type>
+                  <color>
+                    <color red="170" green="0" blue="255">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+              </traces>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_143</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSMax-SB-Cmp0</pv_name>
+              <x>360</x>
+              <y>730</y>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_146</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSAvg-SB-Cmp0</pv_name>
+              <x>360</x>
+              <y>760</y>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_149</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-SB-Cmp0</pv_name>
+              <x>360</x>
+              <y>700</y>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_464</name>
+              <text>Last Pulse Mag</text>
+              <x>190</x>
+              <y>700</y>
+              <width>160</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_465</name>
+              <text>Maximum Mag among last pulses</text>
+              <x>80</x>
+              <y>730</y>
+              <width>270</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_466</name>
+              <text>Average Mag among last pulses</text>
+              <x>110</x>
+              <y>760</y>
+              <width>240</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_144</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSMax-SB-Cmp1</pv_name>
+              <x>361</x>
+              <y>840</y>
+              <width>99</width>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_145</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSAvg-SB-Cmp1</pv_name>
+              <x>360</x>
+              <y>870</y>
+              <width>99</width>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_150</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-SB-Cmp1</pv_name>
+              <x>361</x>
+              <y>810</y>
+              <width>99</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_467</name>
+              <text>Last Pulse Ang</text>
+              <x>135</x>
+              <y>810</y>
+              <width>210</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_468</name>
+              <text>Maximum Ang among last pulses</text>
+              <x>100</x>
+              <y>840</y>
+              <width>245</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_469</name>
+              <text>Average Ang among last pulses</text>
+              <x>130</x>
+              <y>870</y>
+              <width>220</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+          </widget>
+        </children>
+      </tab>
+      <tab>
+        <name>PI Error Last Pulse</name>
+        <children>
+          <widget type="label" version="2.0.0">
+            <name>Label_507</name>
+            <class>TITLE</class>
+            <text>PI Error - Last Pulse</text>
+            <x use_class="true">20</x>
+            <y use_class="true">0</y>
+            <width>490</width>
+            <height use_class="true">50</height>
+            <font use_class="true">
+              <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+              </font>
+            </font>
+            <foreground_color use_class="true">
+              <color name="HEADER-TEXT" red="0" green="0" blue="0">
+              </color>
+            </foreground_color>
+            <transparent use_class="true">true</transparent>
+            <horizontal_alignment use_class="true">0</horizontal_alignment>
+            <vertical_alignment use_class="true">1</vertical_alignment>
+            <wrap_words use_class="true">false</wrap_words>
+          </widget>
+          <widget type="group" version="2.0.0">
+            <name>MGGrey02_8</name>
+            <x>8</x>
+            <y>58</y>
+            <width>680</width>
+            <height>430</height>
+            <style>3</style>
+            <background_color>
+              <color name="BACKGROUND" red="220" green="225" blue="221">
+              </color>
+            </background_color>
+            <widget type="rectangle" version="2.0.0">
+              <name>MGGrey02-background_8</name>
+              <width>680</width>
+              <height>430</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>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>MGGrey02-title_8</name>
+              <text>Full Pulse</text>
+              <x>10</x>
+              <width>660</width>
+              <height>30</height>
+              <font>
+                <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+                </font>
+              </font>
+              <background_color>
+                <color name="RED-BORDER" red="150" green="8" blue="16">
+                </color>
+              </background_color>
+              <horizontal_alignment>1</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="action_button" version="3.0.0">
+              <name>Action Button_8</name>
+              <actions>
+                <action type="open_display">
+                  <file>plot_ch.bob</file>
+                  <macros>
+                    <AXSEP></AXSEP>
+                    <CHANNEL>IntChRFCErr</CHANNEL>
+                    <DECCMPPLT>0</DECCMPPLT>
+                    <TITLE>$(SYSNAME=LLRF) - Channel $(PLTCHAN)</TITLE>
+                  </macros>
+                  <target>window</target>
+                  <description>Open Display</description>
+                </action>
+              </actions>
+              <text>Full Plot</text>
+              <x>600</x>
+              <y>390</y>
+              <width>70</width>
+              <tooltip>$(actions)</tooltip>
+            </widget>
+            <widget type="xyplot" version="2.0.0">
+              <name>X/Y Plot_11</name>
+              <x>10</x>
+              <y>40</y>
+              <width>660</width>
+              <height>340</height>
+              <show_legend>false</show_legend>
+              <x_axis>
+                <title>ms</title>
+                <autoscale>true</autoscale>
+                <log_scale>false</log_scale>
+                <minimum>0.0</minimum>
+                <maximum>100.0</maximum>
+                <show_grid>false</show_grid>
+                <title_font>
+                  <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+                  </font>
+                </title_font>
+                <scale_font>
+                  <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+                  </font>
+                </scale_font>
+                <visible>true</visible>
+              </x_axis>
+              <y_axes>
+                <y_axis>
+                  <title></title>
+                  <autoscale>true</autoscale>
+                  <log_scale>false</log_scale>
+                  <minimum>0.0</minimum>
+                  <maximum>100.0</maximum>
+                  <show_grid>false</show_grid>
+                  <title_font>
+                    <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+                    </font>
+                  </title_font>
+                  <scale_font>
+                    <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+                    </font>
+                  </scale_font>
+                  <visible>true</visible>
+                </y_axis>
+                <y_axis>
+                  <title></title>
+                  <autoscale>true</autoscale>
+                  <log_scale>false</log_scale>
+                  <minimum>0.0</minimum>
+                  <maximum>100.0</maximum>
+                  <show_grid>false</show_grid>
+                  <title_font>
+                    <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+                    </font>
+                  </title_font>
+                  <scale_font>
+                    <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+                    </font>
+                  </scale_font>
+                  <visible>true</visible>
+                </y_axis>
+              </y_axes>
+              <traces>
+                <trace>
+                  <name>Magnitude</name>
+                  <x_pv>$(PD=LLRF:)$(RD=DIG01:)IntChRFCErrXAxis.{"arr":{"s":0,"i":100,"e":-1}}</x_pv>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)IntChRFCErr-Cmp0.{"arr":{"s":0,"i":100,"e":-1}}</y_pv>
+                  <err_pv></err_pv>
+                  <axis>0</axis>
+                  <trace_type>1</trace_type>
+                  <color>
+                    <color red="0" green="0" blue="255">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <line_style>0</line_style>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+                <trace>
+                  <name>Angle</name>
+                  <x_pv>$(PD=LLRF:)$(RD=DIG01:)IntChRFCErrXAxis.{"arr":{"s":0,"i":100,"e":-1}}</x_pv>
+                  <y_pv>$(PD=LLRF:)$(RD=DIG01:)IntChRFCErr-Cmp1.{"arr":{"s":0,"i":100,"e":-1}}</y_pv>
+                  <err_pv></err_pv>
+                  <axis>1</axis>
+                  <trace_type>1</trace_type>
+                  <color>
+                    <color red="255" green="0" blue="0">
+                    </color>
+                  </color>
+                  <line_width>1</line_width>
+                  <line_style>0</line_style>
+                  <point_type>0</point_type>
+                  <point_size>10</point_size>
+                  <visible>true</visible>
+                </trace>
+              </traces>
+            </widget>
+          </widget>
+          <widget type="group" version="2.0.0">
+            <name>MGGrey02_9</name>
+            <x>8</x>
+            <y>498</y>
+            <width>680</width>
+            <height>430</height>
+            <style>3</style>
+            <background_color>
+              <color name="BACKGROUND" red="220" green="225" blue="221">
+              </color>
+            </background_color>
+            <widget type="rectangle" version="2.0.0">
+              <name>MGGrey02-background_9</name>
+              <width>680</width>
+              <height>430</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>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>MGGrey02-title_9</name>
+              <text>Beal Arrival</text>
+              <x>10</x>
+              <width>660</width>
+              <height>30</height>
+              <font>
+                <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+                </font>
+              </font>
+              <background_color>
+                <color name="RED-BORDER" red="150" green="8" blue="16">
+                </color>
+              </background_color>
+              <horizontal_alignment>1</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="embedded" version="2.0.0">
+              <name>Embedded Display</name>
+              <file>pierror-limited.bob</file>
+              <x>10</x>
+              <y>40</y>
+              <width>660</width>
+              <height>350</height>
+              <scripts>
+                <script file="EmbeddedPy">
+                  <text><![CDATA[# Embedded python script
+from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
+# widget.setPropertyValue('text', PVUtil.getString(pvs[0]))
+usebeammeas = PVUtil.getInt(pvs[0])
+freqsamp = PVUtil.getDouble(pvs[4])
+neariqn = PVUtil.getDouble(pvs[5])
+laststart = PVUtil.getInt(pvs[6])
+if usebeammeas == 1:
+  beamstartcyc = PVUtil.getDouble(pvs[1])
+  s = int(beamstartcyc/neariqn) - int((0.05 / (neariqn/freqsamp))*1000) # - 5us
+else:
+  beamstart = PVUtil.getDouble(pvs[2])
+  s =  int(((beamstart - 0.05) / (neariqn/freqsamp))*1000) # - 5s
+
+if s < 0:
+  s = 0
+
+widthbeamarrival = PVUtil.getDouble(pvs[3])
+e = s + int(((widthbeamarrival + 0.05)/ (neariqn/freqsamp))*1000)
+
+
+if s != laststart :
+
+  widget.getPropertyValue("macros").add("S", str(s))
+  widget.getPropertyValue("macros").add("E", str(e))
+
+  widget.setPropertyValue("file", "")
+  widget.setPropertyValue("file", "pierror-limited.bob")
+
+  pvs[6].setValue(s)]]></text>
+                  <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSUseBeamMeas</pv_name>
+                  <pv_name>$(PD=LLRF:)$(RD=DIG01:)PosBeamStartCyc</pv_name>
+                  <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSBeamStart</pv_name>
+                  <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMSWidth-BA</pv_name>
+                  <pv_name trigger="false">$(P=LLRF::)$(R=)FreqSampling</pv_name>
+                  <pv_name trigger="false">$(PD=LLRF:)$(RD=DIG01:)IQSmpNearIQ-N-RB</pv_name>
+                  <pv_name trigger="false">loc://laststart$(PD=LLRF:)$(RD=DIG01:)(-1)</pv_name>
+                </script>
+              </scripts>
+            </widget>
+          </widget>
+          <widget type="group" version="2.0.0">
+            <name>MGGrey02_10</name>
+            <x>708</x>
+            <y>58</y>
+            <width>360</width>
+            <height>180</height>
+            <style>3</style>
+            <background_color>
+              <color name="BACKGROUND" red="220" green="225" blue="221">
+              </color>
+            </background_color>
+            <widget type="rectangle" version="2.0.0">
+              <name>MGGrey02-background_11</name>
+              <width>360</width>
+              <height>190</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>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>MGGrey02-title_10</name>
+              <text>PI Error - RMS Values</text>
+              <x>10</x>
+              <width>340</width>
+              <height>30</height>
+              <font>
+                <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+                </font>
+              </font>
+              <background_color>
+                <color name="RED-BORDER" red="150" green="8" blue="16">
+                </color>
+              </background_color>
+              <horizontal_alignment>1</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Group Title_66</name>
+              <text>Beam Arrival - Last Pulse</text>
+              <x>30</x>
+              <y>40</y>
+              <width>320</width>
+              <height>30</height>
+              <font>
+                <font family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+                </font>
+              </font>
+              <background_color>
+                <color name="BACKGROUND" red="220" green="225" blue="221">
+                </color>
+              </background_color>
+              <horizontal_alignment>1</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Group Title_67</name>
+              <text>Stable Beam- Last Pulse</text>
+              <x>30</x>
+              <y>120</y>
+              <width>330</width>
+              <height>30</height>
+              <font>
+                <font family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+                </font>
+              </font>
+              <background_color>
+                <color name="BACKGROUND" red="220" green="225" blue="221">
+                </color>
+              </background_color>
+              <horizontal_alignment>1</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_400</name>
+              <text>Magnitude</text>
+              <x>30</x>
+              <y>80</y>
+              <width>80</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_107</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-BA-Cmp0</pv_name>
+              <x>120</x>
+              <y>80</y>
+              <width>60</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_401</name>
+              <text>Angle</text>
+              <x>210</x>
+              <y>80</y>
+              <width>60</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_108</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-BA-Cmp1</pv_name>
+              <x>280</x>
+              <y>80</y>
+              <width>60</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_402</name>
+              <text>Magnitude</text>
+              <x>30</x>
+              <y>148</y>
+              <width>80</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_109</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-SB-Cmp0</pv_name>
+              <x>120</x>
+              <y>148</y>
+              <width>60</width>
+            </widget>
+            <widget type="label" version="2.0.0">
+              <name>Label_403</name>
+              <text>Angle</text>
+              <x>230</x>
+              <y>148</y>
+              <width>45</width>
+              <horizontal_alignment>2</horizontal_alignment>
+              <vertical_alignment>1</vertical_alignment>
+            </widget>
+            <widget type="textupdate" version="2.0.0">
+              <name>Text Update_AI0-ATT-RBV_110</name>
+              <pv_name>$(PD=LLRF:)$(RD=DIG01:)RFCErrRMS-SB-Cmp1</pv_name>
+              <x>285</x>
+              <y>148</y>
+              <width>60</width>
+            </widget>
+          </widget>
+        </children>
+      </tab>
+    </tabs>
+    <width>1130</width>
+    <height>1020</height>
+  </widget>
+</display>
diff --git a/99-Shared/timing/mixed_mode.bob b/99-Shared/timing/mixed_mode.bob
index 67233873a041421385cd602bd70206cb0b6aaa69..0c46c5fe4bd953c009a1bcd56155f74d5dfe3e53 100644
--- a/99-Shared/timing/mixed_mode.bob
+++ b/99-Shared/timing/mixed_mode.bob
@@ -15,24 +15,6 @@
     <width>120</width>
     <height>30</height>
   </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Combo Box_3</name>
-    <pv_name>$(PREFIX)MixFreq</pv_name>
-    <x>230</x>
-    <y>141</y>
-    <width>120</width>
-    <rules>
-      <rule name="enable" prop_id="enabled" out_exp="false">
-        <exp bool_exp="pv0==1">
-          <value>true</value>
-        </exp>
-        <exp bool_exp="pv0==0">
-          <value>false</value>
-        </exp>
-        <pv_name>$(PREFIX)OpMode</pv_name>
-      </rule>
-    </rules>
-  </widget>
   <widget type="group" version="2.0.0">
     <name>Cycles</name>
     <x>370</x>
@@ -193,4 +175,20 @@
     <height>30</height>
     <precision>3</precision>
   </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Entry_7</name>
+    <pv_name>$(PREFIX)MixFreq</pv_name>
+    <x>130</x>
+    <y>141</y>
+    <width>90</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_10</name>
+    <pv_name>$(PREFIX)MixFreq-RB</pv_name>
+    <x>230</x>
+    <y>141</y>
+    <width>120</width>
+    <height>30</height>
+  </widget>
 </display>
diff --git a/Engineering/10-Top/monitorevrs.bob b/Engineering/10-Top/monitorevrs.bob
index f225b19849bf5a8500542758c880d0305c824081..b5c03a5d644a21a6419d5e24da3a77f2c17fc99b 100644
--- a/Engineering/10-Top/monitorevrs.bob
+++ b/Engineering/10-Top/monitorevrs.bob
@@ -6,7 +6,7 @@
     <name>Embedded Display</name>
     <macros>
       <EVRPREFIX>DTL-030:RFS-EVR-101</EVRPREFIX>
-      <IOCNAME>DTL-030:Ctrl-IOC-002</IOCNAME>
+      <IOCNAME>DTL-030:SC-IOC-003</IOCNAME>
       <SYSNAME>DTL - 3</SYSNAME>
     </macros>
     <file>../99-Shared/evrisland_stats.bob</file>
@@ -32,7 +32,7 @@
     <name>Embedded Display_2</name>
     <macros>
       <EVRPREFIX>DTL-050:RFS-EVR-101</EVRPREFIX>
-      <IOCNAME>DTL-050:Ctrl-IOC-002</IOCNAME>
+      <IOCNAME>DTL-050:SC-IOC-003</IOCNAME>
       <SYSNAME>DTL - 5</SYSNAME>
     </macros>
     <file>../99-Shared/evrisland_stats.bob</file>
@@ -99,7 +99,7 @@
     <name>Embedded Display_5</name>
     <macros>
       <EVRPREFIX>DTL-020:RFS-EVR-101</EVRPREFIX>
-      <IOCNAME>DTL-020:Ctrl-IOC-002</IOCNAME>
+      <IOCNAME>DTL-020:SC-IOC-003</IOCNAME>
       <SYSNAME>DTL - 2</SYSNAME>
     </macros>
     <file>../99-Shared/evrisland_stats.bob</file>
@@ -112,7 +112,7 @@
     <name>Embedded Display_6</name>
     <macros>
       <EVRPREFIX>MEBT-010:RFS-EVR-101</EVRPREFIX>
-      <IOCNAME>MEBT-010:Ctrl-IOC-013</IOCNAME>
+      <IOCNAME>MEBT-010:SC-IOC-103</IOCNAME>
       <SYSNAME>MEBT - 1</SYSNAME>
     </macros>
     <file>../99-Shared/evrisland_stats.bob</file>
@@ -125,7 +125,7 @@
     <name>Embedded Display_7</name>
     <macros>
       <EVRPREFIX>MEBT-010:RFS-EVR-201</EVRPREFIX>
-      <IOCNAME>MEBT-010:Ctrl-IOC-014</IOCNAME>
+      <IOCNAME>MEBT-010:SC-IOC-203</IOCNAME>
       <SYSNAME>MEBT - 2</SYSNAME>
     </macros>
     <file>../99-Shared/evrisland_stats.bob</file>
@@ -138,7 +138,7 @@
     <name>Embedded Display_8</name>
     <macros>
       <EVRPREFIX>MEBT-010:RFS-EVR-301</EVRPREFIX>
-      <IOCNAME>MEBT-010:Ctrl-IOC-015</IOCNAME>
+      <IOCNAME>MEBT-010:SC-IOC-303</IOCNAME>
       <SYSNAME>MEBT - 3</SYSNAME>
     </macros>
     <file>../99-Shared/evrisland_stats.bob</file>
@@ -151,7 +151,7 @@
     <name>Embedded Display_9</name>
     <macros>
       <EVRPREFIX>MBL-020RFC:RFS-EVR-101</EVRPREFIX>
-      <IOCNAME>MBL-020RFC:Ctrl-IOC-102</IOCNAME>
+      <IOCNAME>MBL-020RFC:SC-IOC-103</IOCNAME>
       <SYSNAME>MBL - 020 - 1</SYSNAME>
     </macros>
     <file>../99-Shared/evrisland_stats.bob</file>
@@ -164,7 +164,7 @@
     <name>Embedded Display_10</name>
     <macros>
       <EVRPREFIX>MBL-020RFC:RFS-EVR-201</EVRPREFIX>
-      <IOCNAME>MBL-020RFC:Ctrl-IOC-202</IOCNAME>
+      <IOCNAME>MBL-020RFC:SC-IOC-203</IOCNAME>
       <SYSNAME>MBL - 020 - 2</SYSNAME>
     </macros>
     <file>../99-Shared/evrisland_stats.bob</file>
@@ -177,7 +177,7 @@
     <name>Embedded Display_11</name>
     <macros>
       <EVRPREFIX>MBL-020RFC:RFS-EVR-301</EVRPREFIX>
-      <IOCNAME>MBL-020RFC:Ctrl-IOC-302</IOCNAME>
+      <IOCNAME>MBL-020RFC:SC-IOC-303</IOCNAME>
       <SYSNAME>MBL - 020 - 3</SYSNAME>
     </macros>
     <file>../99-Shared/evrisland_stats.bob</file>
@@ -190,7 +190,7 @@
     <name>Embedded Display_12</name>
     <macros>
       <EVRPREFIX>MBL-020RFC:RFS-EVR-401</EVRPREFIX>
-      <IOCNAME>MBL-020RFC:Ctrl-IOC-402</IOCNAME>
+      <IOCNAME>MBL-020RFC:SC-IOC-403</IOCNAME>
       <SYSNAME>MBL - 020 - 4</SYSNAME>
     </macros>
     <file>../99-Shared/evrisland_stats.bob</file>
@@ -203,7 +203,7 @@
     <name>Embedded Display_13</name>
     <macros>
       <EVRPREFIX>MBL-030RFC:RFS-EVR-101</EVRPREFIX>
-      <IOCNAME>MBL-030RFC:Ctrl-IOC-102</IOCNAME>
+      <IOCNAME>MBL-030RFC:SC-IOC-103</IOCNAME>
       <SYSNAME>MBL - 030 - 1</SYSNAME>
     </macros>
     <file>../99-Shared/evrisland_stats.bob</file>
@@ -216,7 +216,7 @@
     <name>Embedded Display_14</name>
     <macros>
       <EVRPREFIX>MBL-030RFC:RFS-EVR-201</EVRPREFIX>
-      <IOCNAME>MBL-030RFC:Ctrl-IOC-202</IOCNAME>
+      <IOCNAME>MBL-030RFC:SC-IOC-203</IOCNAME>
       <SYSNAME>MBL - 030 - 2</SYSNAME>
     </macros>
     <file>../99-Shared/evrisland_stats.bob</file>
@@ -229,7 +229,7 @@
     <name>Embedded Display_15</name>
     <macros>
       <EVRPREFIX>MBL-030RFC:RFS-EVR-301</EVRPREFIX>
-      <IOCNAME>MBL-030RFC:Ctrl-IOC-302</IOCNAME>
+      <IOCNAME>MBL-030RFC:SC-IOC-303</IOCNAME>
       <SYSNAME>MBL - 030 - 3</SYSNAME>
     </macros>
     <file>../99-Shared/evrisland_stats.bob</file>
@@ -242,7 +242,7 @@
     <name>Embedded Display_16</name>
     <macros>
       <EVRPREFIX>MBL-030RFC:RFS-EVR-401</EVRPREFIX>
-      <IOCNAME>MBL-030RFC:Ctrl-IOC-402</IOCNAME>
+      <IOCNAME>MBL-030RFC:SC-IOC-403</IOCNAME>
       <SYSNAME>MBL - 030 - 4</SYSNAME>
     </macros>
     <file>../99-Shared/evrisland_stats.bob</file>
@@ -269,7 +269,7 @@
     <name>Embedded Display_17</name>
     <macros>
       <EVRPREFIX>DTL-010:RFS-EVR-101</EVRPREFIX>
-      <IOCNAME>DTL-010:RFS-EVR-101</IOCNAME>
+      <IOCNAME>DTL-010:SC-IOC-003</IOCNAME>
       <SYSNAME>DTL - 1</SYSNAME>
     </macros>
     <file>../99-Shared/evrisland_stats.bob</file>
@@ -278,4 +278,56 @@
     <width>1090</width>
     <height>30</height>
   </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_18</name>
+    <macros>
+      <EVRPREFIX>MBL-040RFC:RFS-EVR-101</EVRPREFIX>
+      <IOCNAME>MBL-040RFC:SC-IOC-103</IOCNAME>
+      <SYSNAME>MBL - 040 - 1</SYSNAME>
+    </macros>
+    <file>../99-Shared/evrisland_stats.bob</file>
+    <x>10</x>
+    <y>650</y>
+    <width>1090</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_19</name>
+    <macros>
+      <EVRPREFIX>MBL-040RFC:RFS-EVR-201</EVRPREFIX>
+      <IOCNAME>MBL-040RFC:SC-IOC-203</IOCNAME>
+      <SYSNAME>MBL - 040 - 2</SYSNAME>
+    </macros>
+    <file>../99-Shared/evrisland_stats.bob</file>
+    <x>10</x>
+    <y>680</y>
+    <width>1090</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_20</name>
+    <macros>
+      <EVRPREFIX>MBL-040RFC:RFS-EVR-301</EVRPREFIX>
+      <IOCNAME>MBL-040RFC:SC-IOC-303</IOCNAME>
+      <SYSNAME>MBL - 040 - 3</SYSNAME>
+    </macros>
+    <file>../99-Shared/evrisland_stats.bob</file>
+    <x>10</x>
+    <y>710</y>
+    <width>1090</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_21</name>
+    <macros>
+      <EVRPREFIX>MBL-040RFC:RFS-EVR-401</EVRPREFIX>
+      <IOCNAME>MBL-040RFC:SC-IOC-403</IOCNAME>
+      <SYSNAME>MBL - 040 - 4</SYSNAME>
+    </macros>
+    <file>../99-Shared/evrisland_stats.bob</file>
+    <x>10</x>
+    <y>740</y>
+    <width>1090</width>
+    <height>30</height>
+  </widget>
 </display>
diff --git a/Engineering/10-Top/monitorllrf-labs.bob b/Engineering/10-Top/monitorllrf-labs.bob
index b672599afade50cfac37085fe66586c00a8b2983..97bcd9a5f361d7964bee29c8d87531f8721e9b32 100644
--- a/Engineering/10-Top/monitorllrf-labs.bob
+++ b/Engineering/10-Top/monitorllrf-labs.bob
@@ -69,4 +69,16 @@
     <width>130</width>
     <height>30</height>
   </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_1</name>
+    <macros>
+      <DIGPREFIX>TIGER-010:RFS-DIG-101</DIGPREFIX>
+      <IOCNAME>TIGER-LLRF1:Ctrl-IOC-001</IOCNAME>
+      <SYSNAME>TIGER</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>70</y>
+    <width>1170</width>
+    <height>30</height>
+  </widget>
 </display>
diff --git a/Engineering/10-Top/monitorllrf.bob b/Engineering/10-Top/monitorllrf.bob
index b4202def31d1d271bc540977d69813e311d67046..d6cc12a0f2bb9c078ec91bebfd3eb6ff724a98a0 100644
--- a/Engineering/10-Top/monitorllrf.bob
+++ b/Engineering/10-Top/monitorllrf.bob
@@ -13,12 +13,12 @@
       <DIG4>true</DIG4>
       <DIG4PREFIX>RFQ-010:RFS-DIG-104</DIG4PREFIX>
       <DIGPREFIX>RFQ-010:RFS-DIG-101</DIGPREFIX>
-      <IOCNAME>RFQ-LLRF1:Ctrl-IOC-001</IOCNAME>
+      <IOCNAME>RFQ-010:SC-IOC-001</IOCNAME>
       <SYSNAME>RFQ</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>40</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="label" version="2.0.0">
@@ -72,157 +72,169 @@
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_3</name>
     <macros>
+      <DIG2>true</DIG2>
+      <DIG2PREFIX>DTL-010:RFS-DIG-102</DIG2PREFIX>
+      <DIG3>true</DIG3>
+      <DIG3PREFIX>DTL-010:RFS-DIG-103</DIG3PREFIX>
       <DIGPREFIX>DTL-010:RFS-DIG-101</DIGPREFIX>
-      <IOCNAME>DTL-010:Ctrl-IOC-001</IOCNAME>
+      <IOCNAME>DTL-010:SC-IOC-001</IOCNAME>
       <SYSNAME>DTL 1</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>160</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_4</name>
     <macros>
+      <DIG2>true</DIG2>
+      <DIG3>true</DIG3>
       <DIGPREFIX>DTL-020:RFS-DIG-101</DIGPREFIX>
-      <IOCNAME>DTL-020:Ctrl-IOC-001</IOCNAME>
+      <IOCNAME>DTL-020:SC-IOC-001</IOCNAME>
       <SYSNAME>DTL 2</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>190</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_5</name>
     <macros>
+      <DIG2>true</DIG2>
+      <DIG3>true</DIG3>
       <DIGPREFIX>DTL-030:RFS-DIG-101</DIGPREFIX>
-      <IOCNAME>DTL-030:Ctrl-IOC-001</IOCNAME>
+      <IOCNAME>DTL-030:SC-IOC-001</IOCNAME>
       <SYSNAME>DTL 3</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>220</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_6</name>
     <macros>
+      <DIG2>true</DIG2>
+      <DIG3>true</DIG3>
       <DIGPREFIX>DTL-040:RFS-DIG-101</DIGPREFIX>
-      <IOCNAME>DTL-040:Ctrl-IOC-001</IOCNAME>
+      <IOCNAME>DTL-040:SC-IOC-001</IOCNAME>
       <SYSNAME>DTL 4</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>250</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_7</name>
     <macros>
+      <DIG2>true</DIG2>
+      <DIG3>true</DIG3>
       <DIGPREFIX>DTL-050:RFS-DIG-101</DIGPREFIX>
-      <IOCNAME>DTL-050:Ctrl-IOC-001</IOCNAME>
+      <IOCNAME>DTL-050:SC-IOC-001</IOCNAME>
       <SYSNAME>DTL 5</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>280</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_8</name>
     <macros>
       <DIGPREFIX>MBL-020RFC:RFS-DIG-101</DIGPREFIX>
-      <IOCNAME>MBL-020RFC:Ctrl-IOC-101</IOCNAME>
+      <IOCNAME>MBL-020RFC:SC-IOC-101</IOCNAME>
       <SYSNAME>MBL-020  1</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>330</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_9</name>
     <macros>
       <DIGPREFIX>MBL-020RFC:RFS-DIG-201</DIGPREFIX>
-      <IOCNAME>MBL-020RFC:Ctrl-IOC-201</IOCNAME>
+      <IOCNAME>MBL-020RFC:SC-IOC-201</IOCNAME>
       <SYSNAME>MBL-020  2</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>360</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_10</name>
     <macros>
       <DIGPREFIX>MBL-020RFC:RFS-DIG-301</DIGPREFIX>
-      <IOCNAME>MBL-020RFC:Ctrl-IOC-301</IOCNAME>
+      <IOCNAME>MBL-020RFC:SC-IOC-301</IOCNAME>
       <SYSNAME>MBL-020  3</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>390</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_11</name>
     <macros>
       <DIGPREFIX>MBL-020RFC:RFS-DIG-401</DIGPREFIX>
-      <IOCNAME>MBL-020RFC:Ctrl-IOC-401</IOCNAME>
+      <IOCNAME>MBL-020RFC:SC-IOC-401</IOCNAME>
       <SYSNAME>MBL-020  4</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>420</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_12</name>
     <macros>
       <DIGPREFIX>MBL-030RFC:RFS-DIG-101</DIGPREFIX>
-      <IOCNAME>MBL-030RFC:Ctrl-IOC-101</IOCNAME>
+      <IOCNAME>MBL-030RFC:SC-IOC-101</IOCNAME>
       <SYSNAME>MBL-030  1</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>450</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_13</name>
     <macros>
       <DIGPREFIX>MBL-030RFC:RFS-DIG-201</DIGPREFIX>
-      <IOCNAME>MBL-030RFC:Ctrl-IOC-201</IOCNAME>
+      <IOCNAME>MBL-030RFC:SC-IOC-201</IOCNAME>
       <SYSNAME>MBL-030  2</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>480</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_14</name>
     <macros>
       <DIGPREFIX>MBL-030RFC:RFS-DIG-301</DIGPREFIX>
-      <IOCNAME>MBL-030RFC:Ctrl-IOC-301</IOCNAME>
+      <IOCNAME>MBL-030RFC:SC-IOC-301</IOCNAME>
       <SYSNAME>MBL-030  3</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>510</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_16</name>
     <macros>
       <DIGPREFIX>MBL-030RFC:RFS-DIG-401</DIGPREFIX>
-      <IOCNAME>MBL-030RFC:Ctrl-IOC-401</IOCNAME>
+      <IOCNAME>MBL-030RFC:SC-IOC-401</IOCNAME>
       <SYSNAME>MBL-030  4</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>540</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="label" version="2.0.0">
@@ -237,88 +249,144 @@
     <name>Embedded Display_17</name>
     <macros>
       <DIGPREFIX>MEBT-010:RFS-DIG-101</DIGPREFIX>
-      <IOCNAME>MEBT-010:Ctrl-IOC-010</IOCNAME>
+      <IOCNAME>MEBT-010:SC-IOC-101</IOCNAME>
       <SYSNAME>MEBT 1</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>70</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_18</name>
     <macros>
       <DIGPREFIX>MEBT-010:RFS-DIG-201</DIGPREFIX>
-      <IOCNAME>MEBT-010:Ctrl-IOC-011</IOCNAME>
+      <IOCNAME>MEBT-010:SC-IOC-201</IOCNAME>
       <SYSNAME>MEBT 2</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>100</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_19</name>
     <macros>
       <DIGPREFIX>MEBT-010:RFS-DIG-301</DIGPREFIX>
-      <IOCNAME>MEBT-010:Ctrl-IOC-012</IOCNAME>
+      <IOCNAME>MEBT-010:SC-IOC-301</IOCNAME>
       <SYSNAME>MEBT 3</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <y>130</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_15</name>
     <macros>
       <DIGPREFIX>TS2-010RFC:RFS-DIG-101</DIGPREFIX>
-      <IOCNAME>TS2-010RFC:Ctrl-IOC-001</IOCNAME>
+      <IOCNAME>TS2-010RFC:SC-IOC-101</IOCNAME>
       <SYSNAME>TS2 - Sys 1 - 1</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <x>20</x>
     <y>800</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_20</name>
     <macros>
       <DIGPREFIX>TS2-010RFC:RFS-DIG-102</DIGPREFIX>
-      <IOCNAME>TS2-010RFC:Ctrl-IOC-002</IOCNAME>
+      <IOCNAME>TS2-010RFC:SC-IOC-102</IOCNAME>
       <SYSNAME>TS2 - Sys 1 - 2</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <x>20</x>
     <y>830</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_21</name>
     <macros>
       <DIGPREFIX>TS2-010RFC:RFS-DIG-201</DIGPREFIX>
-      <IOCNAME>TS2-010RFC:Ctrl-IOC-003</IOCNAME>
+      <IOCNAME>TS2-010RFC:SC-IOC-201</IOCNAME>
       <SYSNAME>TS2 - Sys 2 - 1</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <x>20</x>
     <y>860</y>
-    <width>1170</width>
+    <width>1320</width>
     <height>30</height>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display_22</name>
     <macros>
       <DIGPREFIX>TS2-010RFC:RFS-DIG-202</DIGPREFIX>
-      <IOCNAME>TS2-010RFC:Ctrl-IOC-004</IOCNAME>
+      <IOCNAME>TS2-010RFC:SC-IOC-202</IOCNAME>
       <SYSNAME>TS2 - Sys 2 - 2</SYSNAME>
     </macros>
     <file>../99-Shared/llrf_stats.bob</file>
     <x>20</x>
     <y>890</y>
-    <width>1170</width>
+    <width>1320</width>
+    <height>30</height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_7</name>
+    <text>Missed Pulses</text>
+    <x>1190</x>
+    <y>10</y>
+    <width>130</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_23</name>
+    <macros>
+      <DIGPREFIX>MBL-040RFC:RFS-DIG-101</DIGPREFIX>
+      <IOCNAME>MBL-040RFC:SC-IOC-101</IOCNAME>
+      <SYSNAME>MBL-040  1</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>570</y>
+    <width>1320</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_24</name>
+    <macros>
+      <DIGPREFIX>MBL-040RFC:RFS-DIG-201</DIGPREFIX>
+      <IOCNAME>MBL-040RFC:SC-IOC-201</IOCNAME>
+      <SYSNAME>MBL-040  2</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>600</y>
+    <width>1320</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_26</name>
+    <macros>
+      <DIGPREFIX>MBL-040RFC:RFS-DIG-401</DIGPREFIX>
+      <IOCNAME>MBL-040RFC:SC-IOC-401</IOCNAME>
+      <SYSNAME>MBL-040  4</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>660</y>
+    <width>1320</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_27</name>
+    <macros>
+      <DIGPREFIX>MBL-040RFC:RFS-DIG-301</DIGPREFIX>
+      <IOCNAME>MBL-040RFC:SC-IOC-301</IOCNAME>
+      <SYSNAME>MBL-040  3</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>630</y>
+    <width>1320</width>
     <height>30</height>
   </widget>
 </display>
diff --git a/Engineering/10-Top/monitorllrf_active.bob b/Engineering/10-Top/monitorllrf_active.bob
new file mode 100644
index 0000000000000000000000000000000000000000..63ec507ef22c12600dde70be9b0275f1daef4751
--- /dev/null
+++ b/Engineering/10-Top/monitorllrf_active.bob
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>LLRF Deployed Systems</name>
+  <width>920</width>
+  <height>300</height>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display</name>
+    <macros>
+      <DIGPREFIX>RFQ-010:RFS-DIG-101</DIGPREFIX>
+      <IOCNAME>RFQ-LLRF1:Ctrl-IOC-001</IOCNAME>
+      <SYSNAME>RFQ</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>40</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>SYS NAME</text>
+    <x>10</x>
+    <y>10</y>
+    <width>80</width>
+    <height>30</height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <text>FSM</text>
+    <x>100</x>
+    <y>10</y>
+    <width>80</width>
+    <height>30</height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_2</name>
+    <text>Pulse Done</text>
+    <x>250</x>
+    <y>10</y>
+    <width>80</width>
+    <height>30</height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_3</name>
+    <text>sis8300llrf ver</text>
+    <x>400</x>
+    <y>10</y>
+    <width>130</width>
+    <height>30</height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_4</name>
+    <text>llrfsystem ver</text>
+    <x>540</x>
+    <y>10</y>
+    <width>130</width>
+    <height>30</height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_5</name>
+    <text>Heartbeat</text>
+    <x>700</x>
+    <y>10</y>
+    <width>130</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_3</name>
+    <macros>
+      <DIGPREFIX>DTL-010:RFS-DIG-101</DIGPREFIX>
+      <IOCNAME>DTL-010:Ctrl-IOC-001</IOCNAME>
+      <SYSNAME>DTL 1</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>80</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_4</name>
+    <macros>
+      <DIGPREFIX>DTL-020:RFS-DIG-101</DIGPREFIX>
+      <IOCNAME>DTL-020:Ctrl-IOC-001</IOCNAME>
+      <SYSNAME>DTL 2</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>110</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_5</name>
+    <macros>
+      <DIGPREFIX>DTL-030:RFS-DIG-101</DIGPREFIX>
+      <IOCNAME>DTL-030:Ctrl-IOC-001</IOCNAME>
+      <SYSNAME>DTL 3</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>140</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_6</name>
+    <macros>
+      <DIGPREFIX>DTL-040:RFS-DIG-101</DIGPREFIX>
+      <IOCNAME>DTL-040:Ctrl-IOC-001</IOCNAME>
+      <SYSNAME>DTL 4</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>170</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_7</name>
+    <macros>
+      <DIGPREFIX>DTL-050:RFS-DIG-101</DIGPREFIX>
+      <IOCNAME>DTL-050:Ctrl-IOC-001</IOCNAME>
+      <SYSNAME>DTL 5</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>200</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_8</name>
+    <macros>
+      <DIGPREFIX>MBL-020RFC:RFS-DIG-101</DIGPREFIX>
+      <IOCNAME>MBL-020RFC:Ctrl-IOC-101</IOCNAME>
+      <SYSNAME>MBL-020  1</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>250</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_9</name>
+    <macros>
+      <DIGPREFIX>MBL-020RFC:RFS-DIG-201</DIGPREFIX>
+      <IOCNAME>MBL-020RFC:Ctrl-IOC-201</IOCNAME>
+      <SYSNAME>MBL-020  2</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>280</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_10</name>
+    <macros>
+      <DIGPREFIX>MBL-020RFC:RFS-DIG-301</DIGPREFIX>
+      <IOCNAME>MBL-020RFC:Ctrl-IOC-301</IOCNAME>
+      <SYSNAME>MBL-020  3</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>310</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_11</name>
+    <macros>
+      <DIGPREFIX>MBL-020RFC:RFS-DIG-401</DIGPREFIX>
+      <IOCNAME>MBL-020RFC:Ctrl-IOC-401</IOCNAME>
+      <SYSNAME>MBL-020  4</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>340</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_12</name>
+    <macros>
+      <DIGPREFIX>MBL-030RFC:RFS-DIG-101</DIGPREFIX>
+      <IOCNAME>MBL-030RFC:Ctrl-IOC-101</IOCNAME>
+      <SYSNAME>MBL-030  1</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>370</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_13</name>
+    <macros>
+      <DIGPREFIX>MBL-030RFC:RFS-DIG-201</DIGPREFIX>
+      <IOCNAME>MBL-030RFC:Ctrl-IOC-201</IOCNAME>
+      <SYSNAME>MBL-030  2</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>400</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_14</name>
+    <macros>
+      <DIGPREFIX>MBL-030RFC:RFS-DIG-301</DIGPREFIX>
+      <IOCNAME>MBL-030RFC:Ctrl-IOC-301</IOCNAME>
+      <SYSNAME>MBL-030  3</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>430</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_16</name>
+    <macros>
+      <DIGPREFIX>MBL-030RFC:RFS-DIG-401</DIGPREFIX>
+      <IOCNAME>MBL-030RFC:Ctrl-IOC-401</IOCNAME>
+      <SYSNAME>MBL-030  4</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>460</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_6</name>
+    <text>Stats</text>
+    <x>880</x>
+    <y>10</y>
+    <width>40</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_15</name>
+    <macros>
+      <DIGPREFIX>TS2-010RFC:RFS-DIG-101</DIGPREFIX>
+      <IOCNAME>TS2-010RFC:Ctrl-IOC-001</IOCNAME>
+      <SYSNAME>TS2 - Sys 1 - 1</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>500</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_20</name>
+    <macros>
+      <DIGPREFIX>TS2-010RFC:RFS-DIG-102</DIGPREFIX>
+      <IOCNAME>TS2-010RFC:Ctrl-IOC-002</IOCNAME>
+      <SYSNAME>TS2 - Sys 1 - 2</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>530</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_21</name>
+    <macros>
+      <DIGPREFIX>TS2-010RFC:RFS-DIG-201</DIGPREFIX>
+      <IOCNAME>TS2-010RFC:Ctrl-IOC-003</IOCNAME>
+      <SYSNAME>TS2 - Sys 2 - 1</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>560</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_22</name>
+    <macros>
+      <DIGPREFIX>TS2-010RFC:RFS-DIG-202</DIGPREFIX>
+      <IOCNAME>TS2-010RFC:Ctrl-IOC-004</IOCNAME>
+      <SYSNAME>TS2 - Sys 2 - 2</SYSNAME>
+    </macros>
+    <file>../99-Shared/llrf_stats.bob</file>
+    <y>590</y>
+    <width>920</width>
+    <height>30</height>
+  </widget>
+</display>
diff --git a/Engineering/99-Shared/llrf_stats.bob b/Engineering/99-Shared/llrf_stats.bob
index 9adc36fc2953bf96b82ffe77c4b0792c90f72791..daf746d6e14c5ee1ea8d30c927dfcd608ea6a3d4 100644
--- a/Engineering/99-Shared/llrf_stats.bob
+++ b/Engineering/99-Shared/llrf_stats.bob
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>Display</name>
-  <width>1180</width>
+  <width>1320</width>
   <height>30</height>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_72</name>
@@ -199,4 +199,11 @@
     <tooltip>$(actions)</tooltip>
     <enabled>$(DIG4=false)</enabled>
   </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(DIGPREFIX):PulseMissed</pv_name>
+    <x>1190</x>
+    <width>120</width>
+    <height>30</height>
+  </widget>
 </display>