diff --git a/99-Shared/bpmmanager/bpmmanager-bpm-instance.bob b/99-Shared/bpmmanager/bpmmanager-bpm-instance.bob
index bdb6e197ba02e52c1509c36e5f7000bc72956996..2e3e4d7e26c75c30d107503b76bfb9b6b8d72551 100644
--- a/99-Shared/bpmmanager/bpmmanager-bpm-instance.bob
+++ b/99-Shared/bpmmanager/bpmmanager-bpm-instance.bob
@@ -2,7 +2,7 @@
 <display version="2.0.0">
   <name>$(P)$(R) instance</name>
   <width>1040</width>
-  <height>1090</height>
+  <height>1200</height>
   <actions>
   </actions>
   <widget type="rectangle" version="2.0.0">
@@ -10,7 +10,7 @@
     <x>570</x>
     <y>70</y>
     <width>450</width>
-    <height>940</height>
+    <height>1100</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -22,9 +22,9 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_17</name>
     <x>590</x>
-    <y>650</y>
+    <y>580</y>
     <width>410</width>
-    <height>110</height>
+    <height>80</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -36,9 +36,9 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_16</name>
     <x>590</x>
-    <y>450</y>
+    <y>410</y>
     <width>410</width>
-    <height>150</height>
+    <height>120</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -52,7 +52,7 @@
     <x>20</x>
     <y>70</y>
     <width>530</width>
-    <height>940</height>
+    <height>1100</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -66,7 +66,7 @@
     <x>590</x>
     <y>120</y>
     <width>410</width>
-    <height>280</height>
+    <height>240</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -77,9 +77,9 @@
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_18</name>
-    <x>40</x>
+    <x>590</x>
     <y>920</y>
-    <width>490</width>
+    <width>410</width>
     <height>80</height>
     <line_width>0</line_width>
     <background_color>
@@ -93,7 +93,7 @@
     <name>Label_66</name>
     <text>X Low:</text>
     <x>610</x>
-    <y>230</y>
+    <y>205</y>
     <width>110</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -110,7 +110,7 @@
     <name>Text Input</name>
     <pv_name>$(P)$(R)ThrXPosLow</pv_name>
     <x>870</x>
-    <y>230</y>
+    <y>205</y>
     <width>120</width>
     <height>30</height>
     <precision>2</precision>
@@ -126,7 +126,7 @@
     <name>Text Update_76</name>
     <pv_name>$(P)$(R)ThrXPosLow</pv_name>
     <x>730</x>
-    <y>230</y>
+    <y>205</y>
     <width>130</width>
     <height>30</height>
     <precision>2</precision>
@@ -145,7 +145,7 @@
     <name>Label_278</name>
     <text>X High:</text>
     <x>610</x>
-    <y>270</y>
+    <y>245</y>
     <width>110</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -162,7 +162,7 @@
     <name>Text Input_1</name>
     <pv_name>$(P)$(R)ThrXPosHigh</pv_name>
     <x>870</x>
-    <y>270</y>
+    <y>245</y>
     <width>120</width>
     <height>30</height>
     <precision>2</precision>
@@ -178,7 +178,7 @@
     <name>Text Update_1</name>
     <pv_name>$(P)$(R)ThrXPosHigh</pv_name>
     <x>730</x>
-    <y>270</y>
+    <y>245</y>
     <width>130</width>
     <height>30</height>
     <precision>2</precision>
@@ -197,7 +197,7 @@
     <name>Label_279</name>
     <text>Y Low:</text>
     <x>610</x>
-    <y>310</y>
+    <y>285</y>
     <width>110</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -214,7 +214,7 @@
     <name>Text Input_2</name>
     <pv_name>$(P)$(R)ThrYPosLow</pv_name>
     <x>870</x>
-    <y>310</y>
+    <y>285</y>
     <width>120</width>
     <height>30</height>
     <precision>2</precision>
@@ -230,7 +230,7 @@
     <name>Text Update_2</name>
     <pv_name>$(P)$(R)ThrYPosLow</pv_name>
     <x>730</x>
-    <y>310</y>
+    <y>285</y>
     <width>130</width>
     <height>30</height>
     <precision>2</precision>
@@ -249,7 +249,7 @@
     <name>Label_280</name>
     <text>Y High:</text>
     <x>610</x>
-    <y>350</y>
+    <y>325</y>
     <width>110</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -266,7 +266,7 @@
     <name>Text Input_3</name>
     <pv_name>$(P)$(R)ThrYPosHigh</pv_name>
     <x>870</x>
-    <y>350</y>
+    <y>325</y>
     <width>120</width>
     <height>30</height>
     <precision>2</precision>
@@ -282,7 +282,7 @@
     <name>Text Update_3</name>
     <pv_name>$(P)$(R)ThrYPosHigh</pv_name>
     <x>730</x>
-    <y>350</y>
+    <y>325</y>
     <width>130</width>
     <height>30</height>
     <precision>2</precision>
@@ -301,7 +301,7 @@
     <name>Label_281</name>
     <text>Magnitude:</text>
     <x>610</x>
-    <y>550</y>
+    <y>495</y>
     <width>110</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -318,7 +318,7 @@
     <name>Text Input_4</name>
     <pv_name>$(P)$(R)ThrMagnitude</pv_name>
     <x>870</x>
-    <y>550</y>
+    <y>495</y>
     <width>120</width>
     <height>30</height>
     <actions>
@@ -333,7 +333,7 @@
     <name>Text Update_4</name>
     <pv_name>$(P)$(R)ThrMagnitude</pv_name>
     <x>730</x>
-    <y>550</y>
+    <y>495</y>
     <width>130</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -351,7 +351,7 @@
     <name>Label_322</name>
     <text>Control:</text>
     <x>610</x>
-    <y>150</y>
+    <y>125</y>
     <width>110</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -368,7 +368,7 @@
     <name>LED_4</name>
     <pv_name>$(P)$(R)IlkPositionControl</pv_name>
     <x>740</x>
-    <y>155</y>
+    <y>130</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -392,7 +392,7 @@
     <pv_name>$(P)$(R)IlkPositionControl</pv_name>
     <text>Enable</text>
     <x>780</x>
-    <y>150</y>
+    <y>125</y>
     <width>80</width>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
@@ -407,7 +407,7 @@
     <pv_name>$(P)$(R)IlkPositionControl</pv_name>
     <text>Disable</text>
     <x>870</x>
-    <y>150</y>
+    <y>125</y>
     <width>80</width>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
@@ -415,7 +415,7 @@
     <name>Label_323</name>
     <text>Status:</text>
     <x>610</x>
-    <y>190</y>
+    <y>165</y>
     <width>110</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -439,7 +439,7 @@
     <pv_name>$(P)$(R)IlkPositionClear</pv_name>
     <text>Clear</text>
     <x>780</x>
-    <y>190</y>
+    <y>165</y>
     <width>80</width>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
@@ -447,7 +447,7 @@
     <name>LED_3</name>
     <pv_name>$(P)$(R)IlkPositionClear</pv_name>
     <x>740</x>
-    <y>195</y>
+    <y>170</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -464,7 +464,7 @@
     <name>Label_344</name>
     <text>Control:</text>
     <x>610</x>
-    <y>470</y>
+    <y>415</y>
     <width>110</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -481,7 +481,7 @@
     <name>LED_5</name>
     <pv_name>$(P)$(R)IlkMagnitudeControl</pv_name>
     <x>740</x>
-    <y>476</y>
+    <y>421</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -505,7 +505,7 @@
     <pv_name>$(P)$(R)IlkMagnitudeControl</pv_name>
     <text>Enable</text>
     <x>780</x>
-    <y>470</y>
+    <y>415</y>
     <width>80</width>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
@@ -520,7 +520,7 @@
     <pv_name>$(P)$(R)IlkMagnitudeControl</pv_name>
     <text>Disable</text>
     <x>870</x>
-    <y>470</y>
+    <y>415</y>
     <width>80</width>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
@@ -528,7 +528,7 @@
     <name>Label_345</name>
     <text>Status:</text>
     <x>610</x>
-    <y>510</y>
+    <y>455</y>
     <width>110</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -544,9 +544,9 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_12</name>
     <x>40</x>
-    <y>310</y>
+    <y>510</y>
     <width>490</width>
-    <height>280</height>
+    <height>355</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -566,7 +566,7 @@
     <pv_name>$(P)$(R)IlkMagnitudeClear</pv_name>
     <text>Clear</text>
     <x>780</x>
-    <y>510</y>
+    <y>455</y>
     <width>80</width>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
@@ -574,7 +574,7 @@
     <name>LED_6</name>
     <pv_name>$(P)$(R)IlkPositionClear</pv_name>
     <x>740</x>
-    <y>516</y>
+    <y>461</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -590,9 +590,9 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_13</name>
     <x>590</x>
-    <y>810</y>
+    <y>710</y>
     <width>410</width>
-    <height>190</height>
+    <height>160</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -605,7 +605,7 @@
     <name>BGGrey02-title_20</name>
     <text>BPM Parameters</text>
     <x>20</x>
-    <y>265</y>
+    <y>460</y>
     <width>530</width>
     <height>50</height>
     <font>
@@ -643,7 +643,7 @@
     <name>BGGrey02-title_22</name>
     <text>Reference Line Parameters $(BPM_PAIR)</text>
     <x>20</x>
-    <y>585</y>
+    <y>865</y>
     <width>530</width>
     <height>50</height>
     <font>
@@ -662,7 +662,7 @@
     <name>Text Update_112</name>
     <pv_name>$(P)$(R)SelfTrigThreshold</pv_name>
     <x>730</x>
-    <y>710</y>
+    <y>625</y>
     <width>130</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -680,7 +680,7 @@
     <name>Text Input_6</name>
     <pv_name>$(P)$(R)SelfTrigThreshold</pv_name>
     <x>870</x>
-    <y>710</y>
+    <y>625</y>
     <width>120</width>
     <height>30</height>
     <actions>
@@ -695,7 +695,7 @@
     <name>Label_338</name>
     <text>Threshold:</text>
     <x>610</x>
-    <y>710</y>
+    <y>625</y>
     <width>110</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -712,7 +712,7 @@
     <name>Label_337</name>
     <text>Control:</text>
     <x>610</x>
-    <y>670</y>
+    <y>585</y>
     <width>110</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -736,7 +736,7 @@
     <pv_name>$(P)$(R)SelfTrigControl</pv_name>
     <text>Disable</text>
     <x>870</x>
-    <y>670</y>
+    <y>585</y>
     <width>80</width>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
@@ -751,7 +751,7 @@
     <pv_name>$(P)$(R)SelfTrigControl</pv_name>
     <text>Enable</text>
     <x>780</x>
-    <y>670</y>
+    <y>585</y>
     <width>80</width>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
@@ -759,7 +759,7 @@
     <name>LED_4</name>
     <pv_name>$(P)$(R)SelfTrigControl</pv_name>
     <x>740</x>
-    <y>675</y>
+    <y>590</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -810,7 +810,7 @@
     <name>BGGrey02-title_24</name>
     <text>Magnitude Interlock</text>
     <x>570</x>
-    <y>400</y>
+    <y>360</y>
     <width>450</width>
     <height>50</height>
     <font>
@@ -829,7 +829,7 @@
     <name>BGGrey02-title_25</name>
     <text>Self Trigger Threshold</text>
     <x>570</x>
-    <y>600</y>
+    <y>530</y>
     <width>450</width>
     <height>50</height>
     <font>
@@ -847,9 +847,9 @@
   <widget type="label" version="2.0.0">
     <name>BGGrey02-title_26</name>
     <text>PLL $(BPM_PAIR)</text>
-    <x>20</x>
+    <x>570</x>
     <y>875</y>
-    <width>530</width>
+    <width>450</width>
     <height>50</height>
     <font>
       <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -867,7 +867,7 @@
     <name>Label_346</name>
     <text>Channels Control:</text>
     <x>70</x>
-    <y>320</y>
+    <y>520</y>
     <width>140</width>
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
@@ -883,7 +883,7 @@
     <name>LED_7</name>
     <pv_name>$(P)$(R)Control</pv_name>
     <x>290</x>
-    <y>326</y>
+    <y>526</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -907,7 +907,7 @@
     <pv_name>$(P)$(R)Control</pv_name>
     <text>Enable</text>
     <x>330</x>
-    <y>320</y>
+    <y>520</y>
     <width>80</width>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
@@ -922,7 +922,7 @@
     <pv_name>$(P)$(R)Control</pv_name>
     <text>Disable</text>
     <x>420</x>
-    <y>320</y>
+    <y>520</y>
     <width>80</width>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
@@ -930,7 +930,7 @@
     <name>Label_347</name>
     <text>Position Scaling Factor:</text>
     <x>70</x>
-    <y>360</y>
+    <y>560</y>
     <width>170</width>
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
@@ -946,7 +946,7 @@
     <name>Text Update_77</name>
     <pv_name>$(P)$(R)PositionScalingFactor</pv_name>
     <x>240</x>
-    <y>360</y>
+    <y>560</y>
     <width>130</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -964,7 +964,7 @@
     <name>Text Input_5</name>
     <pv_name>$(P)$(R)PositionScalingFactor</pv_name>
     <x>380</x>
-    <y>360</y>
+    <y>560</y>
     <width>120</width>
     <height>30</height>
     <actions>
@@ -979,7 +979,7 @@
     <name>Label_348</name>
     <text>Phase Scaling Factor:</text>
     <x>70</x>
-    <y>400</y>
+    <y>676</y>
     <width>170</width>
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
@@ -995,7 +995,7 @@
     <name>Text Update_78</name>
     <pv_name>$(P)$(R)PhaseScalingFactor</pv_name>
     <x>240</x>
-    <y>400</y>
+    <y>676</y>
     <width>130</width>
     <height>30</height>
     <precision>3</precision>
@@ -1014,7 +1014,7 @@
     <name>Text Input_7</name>
     <pv_name>$(P)$(R)PhaseScalingFactor</pv_name>
     <x>380</x>
-    <y>400</y>
+    <y>676</y>
     <width>120</width>
     <height>30</height>
     <precision>3</precision>
@@ -1030,7 +1030,7 @@
     <name>Label_349</name>
     <text>RTM Attenuation:</text>
     <x>70</x>
-    <y>555</y>
+    <y>831</y>
     <width>170</width>
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
@@ -1046,7 +1046,7 @@
     <name>Text Update_79</name>
     <pv_name>$(P)$(R)RTMAttn</pv_name>
     <x>240</x>
-    <y>555</y>
+    <y>831</y>
     <width>130</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -1064,7 +1064,7 @@
     <name>Text Input_8</name>
     <pv_name>$(P)$(R)RTMAttn</pv_name>
     <x>380</x>
-    <y>555</y>
+    <y>831</y>
     <width>120</width>
     <height>30</height>
     <actions>
@@ -1079,7 +1079,7 @@
     <name>Label_350</name>
     <text>RF Gain:</text>
     <x>70</x>
-    <y>440</y>
+    <y>716</y>
     <width>170</width>
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
@@ -1095,7 +1095,7 @@
     <name>Combo Box</name>
     <pv_name>$(P)$(R)RFGain</pv_name>
     <x>240</x>
-    <y>440</y>
+    <y>716</y>
     <width>260</width>
     <height>25</height>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1104,7 +1104,7 @@
     <name>Label_353</name>
     <text>RF Gain Attenuator 1:</text>
     <x>70</x>
-    <y>475</y>
+    <y>751</y>
     <width>170</width>
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
@@ -1120,7 +1120,7 @@
     <name>Text Update_81</name>
     <pv_name>$(P)$(R)Attn1</pv_name>
     <x>240</x>
-    <y>475</y>
+    <y>750</y>
     <width>130</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -1138,7 +1138,7 @@
     <name>Text Input_10</name>
     <pv_name>$(P)$(R)Attn1</pv_name>
     <x>380</x>
-    <y>475</y>
+    <y>750</y>
     <width>120</width>
     <height>30</height>
     <actions>
@@ -1153,7 +1153,7 @@
     <name>Label_354</name>
     <text>RF Gain Attenuator 2:</text>
     <x>70</x>
-    <y>515</y>
+    <y>791</y>
     <width>170</width>
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
@@ -1169,7 +1169,7 @@
     <name>Text Update_82</name>
     <pv_name>$(P)$(R)Attn2</pv_name>
     <x>240</x>
-    <y>515</y>
+    <y>791</y>
     <width>130</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -1187,7 +1187,7 @@
     <name>Text Input_11</name>
     <pv_name>$(P)$(R)Attn2</pv_name>
     <x>380</x>
-    <y>515</y>
+    <y>791</y>
     <width>120</width>
     <height>30</height>
     <actions>
@@ -1202,7 +1202,7 @@
     <name>Label_356</name>
     <text>Lower Threshold:</text>
     <x>600</x>
-    <y>910</y>
+    <y>795</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1219,7 +1219,7 @@
     <name>Text Input_13</name>
     <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockLowerThreshold</pv_name>
     <x>870</x>
-    <y>910</y>
+    <y>795</y>
     <width>120</width>
     <height>30</height>
     <actions>
@@ -1234,7 +1234,7 @@
     <name>Text Update_84</name>
     <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockLowerThreshold</pv_name>
     <x>730</x>
-    <y>910</y>
+    <y>795</y>
     <width>130</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -1252,7 +1252,7 @@
     <name>Label_357</name>
     <text>Upper Threshold:</text>
     <x>600</x>
-    <y>950</y>
+    <y>835</y>
     <width>120</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1269,7 +1269,7 @@
     <name>Text Input_14</name>
     <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockUpperThreshold</pv_name>
     <x>870</x>
-    <y>950</y>
+    <y>835</y>
     <width>120</width>
     <height>30</height>
     <actions>
@@ -1284,7 +1284,7 @@
     <name>Text Update_85</name>
     <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockUpperThreshold</pv_name>
     <x>730</x>
-    <y>950</y>
+    <y>835</y>
     <width>130</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -1302,7 +1302,7 @@
     <name>Label_358</name>
     <text>Control:</text>
     <x>610</x>
-    <y>830</y>
+    <y>715</y>
     <width>110</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1319,7 +1319,7 @@
     <name>LED_8</name>
     <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockControl</pv_name>
     <x>740</x>
-    <y>835</y>
+    <y>720</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -1343,7 +1343,7 @@
     <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockControl</pv_name>
     <text>Enable</text>
     <x>780</x>
-    <y>830</y>
+    <y>715</y>
     <width>80</width>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
@@ -1358,7 +1358,7 @@
     <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockControl</pv_name>
     <text>Disable</text>
     <x>870</x>
-    <y>830</y>
+    <y>715</y>
     <width>80</width>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
@@ -1366,7 +1366,7 @@
     <name>Label_359</name>
     <text>Clear:</text>
     <x>610</x>
-    <y>870</y>
+    <y>755</y>
     <width>110</width>
     <height>30</height>
     <horizontal_alignment>2</horizontal_alignment>
@@ -1382,9 +1382,9 @@
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-background_14</name>
     <x>40</x>
-    <y>630</y>
+    <y>915</y>
     <width>490</width>
-    <height>250</height>
+    <height>235</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -1404,7 +1404,7 @@
     <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockClear</pv_name>
     <text>Clear</text>
     <x>780</x>
-    <y>870</y>
+    <y>755</y>
     <width>80</width>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
@@ -1412,7 +1412,7 @@
     <name>LED_9</name>
     <pv_name>$(P)$(BPM_PAIR)-EnergyInterlockClear</pv_name>
     <x>740</x>
-    <y>875</y>
+    <y>760</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -1429,7 +1429,7 @@
     <name>Label_351</name>
     <text>RL1 Gain:</text>
     <x>70</x>
-    <y>640</y>
+    <y>915</y>
     <width>170</width>
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
@@ -1445,7 +1445,7 @@
     <name>Combo Box_1</name>
     <pv_name>$(P)$(BPM_PAIR)-RL1Gain</pv_name>
     <x>240</x>
-    <y>646</y>
+    <y>921</y>
     <width>260</width>
     <height>25</height>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1454,7 +1454,7 @@
     <name>Combo Box_2</name>
     <pv_name>$(P)$(BPM_PAIR)-RL2Gain</pv_name>
     <x>240</x>
-    <y>682</y>
+    <y>957</y>
     <width>260</width>
     <height>25</height>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1463,7 +1463,7 @@
     <name>Label_352</name>
     <text>RL2 Gain:</text>
     <x>70</x>
-    <y>682</y>
+    <y>957</y>
     <width>170</width>
     <height>31</height>
     <vertical_alignment>1</vertical_alignment>
@@ -1479,7 +1479,7 @@
     <name>BGGrey02-title_27</name>
     <text>Energy Interlock $(BPM_PAIR)</text>
     <x>570</x>
-    <y>760</y>
+    <y>660</y>
     <width>490</width>
     <height>50</height>
     <font>
@@ -1498,7 +1498,7 @@
     <name>Label_360</name>
     <text>RL Attenuator 1:</text>
     <x>70</x>
-    <y>720</y>
+    <y>995</y>
     <width>170</width>
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
@@ -1514,7 +1514,7 @@
     <name>Text Update_86</name>
     <pv_name>$(P)$(BPM_PAIR)-RefAttn1</pv_name>
     <x>240</x>
-    <y>720</y>
+    <y>995</y>
     <width>130</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -1532,7 +1532,7 @@
     <name>Text Input_15</name>
     <pv_name>$(P)$(BPM_PAIR)-RefAttn1</pv_name>
     <x>380</x>
-    <y>720</y>
+    <y>995</y>
     <width>120</width>
     <height>30</height>
     <actions>
@@ -1547,7 +1547,7 @@
     <name>Label_361</name>
     <text>RL Attenuator 2:</text>
     <x>70</x>
-    <y>760</y>
+    <y>1035</y>
     <width>170</width>
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
@@ -1563,7 +1563,7 @@
     <name>Text Update_87</name>
     <pv_name>$(P)$(BPM_PAIR)-RefAttn2</pv_name>
     <x>240</x>
-    <y>760</y>
+    <y>1035</y>
     <width>130</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -1581,7 +1581,7 @@
     <name>Text Input_16</name>
     <pv_name>$(P)$(BPM_PAIR)-RefAttn2</pv_name>
     <x>380</x>
-    <y>760</y>
+    <y>1035</y>
     <width>120</width>
     <height>30</height>
     <actions>
@@ -1596,7 +1596,7 @@
     <name>Label_362</name>
     <text>RL1 Attenuator 3:</text>
     <x>70</x>
-    <y>800</y>
+    <y>1075</y>
     <width>170</width>
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
@@ -1612,7 +1612,7 @@
     <name>Text Update_88</name>
     <pv_name>$(P)$(BPM_PAIR)-RL1Attn3</pv_name>
     <x>240</x>
-    <y>800</y>
+    <y>1075</y>
     <width>130</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -1630,7 +1630,7 @@
     <name>Text Input_17</name>
     <pv_name>$(P)$(BPM_PAIR)-RL1Attn3</pv_name>
     <x>380</x>
-    <y>800</y>
+    <y>1075</y>
     <width>120</width>
     <height>30</height>
     <actions>
@@ -1645,7 +1645,7 @@
     <name>Label_363</name>
     <text>RL2 Attenuator 3:</text>
     <x>70</x>
-    <y>840</y>
+    <y>1115</y>
     <width>170</width>
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
@@ -1661,7 +1661,7 @@
     <name>Text Update_89</name>
     <pv_name>$(P)$(BPM_PAIR)-RL2Attn3</pv_name>
     <x>240</x>
-    <y>840</y>
+    <y>1115</y>
     <width>130</width>
     <height>30</height>
     <horizontal_alignment>1</horizontal_alignment>
@@ -1679,7 +1679,7 @@
     <name>Text Input_18</name>
     <pv_name>$(P)$(BPM_PAIR)-RL2Attn3</pv_name>
     <x>380</x>
-    <y>840</y>
+    <y>1115</y>
     <width>120</width>
     <height>30</height>
     <actions>
@@ -1700,8 +1700,9 @@
       </action>
     </actions>
     <pv_name>$(P)$(BPM_PAIR)-LoadPLL</pv_name>
-    <x>240</x>
+    <x>740</x>
     <y>965</y>
+    <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -1711,10 +1712,11 @@
   <widget type="label" version="2.0.0">
     <name>Label_9</name>
     <text>Load/SetupIO:</text>
-    <x>70</x>
+    <x>600</x>
     <y>965</y>
-    <width>170</width>
+    <width>120</width>
     <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1727,8 +1729,9 @@
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(BPM_PAIR)-PLLConfig</pv_name>
-    <x>240</x>
+    <x>740</x>
     <y>925</y>
+    <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -1738,7 +1741,7 @@
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_5</name>
     <pv_name>$(P)$(BPM_PAIR)-PLLConfig</pv_name>
-    <x>380</x>
+    <x>870</x>
     <y>925</y>
     <width>120</width>
     <height>30</height>
@@ -1760,10 +1763,11 @@
   <widget type="label" version="2.0.0">
     <name>Label_10</name>
     <text>Config:</text>
-    <x>70</x>
+    <x>600</x>
     <y>925</y>
-    <width>170</width>
+    <width>120</width>
     <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1783,8 +1787,9 @@
       </action>
     </actions>
     <pv_name>$(P)$(BPM_PAIR)-SetupIO</pv_name>
-    <x>380</x>
+    <x>870</x>
     <y>965</y>
+    <width>120</width>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -1815,7 +1820,7 @@
     <x>40</x>
     <y>120</y>
     <width>490</width>
-    <height>155</height>
+    <height>340</height>
     <line_width>0</line_width>
     <background_color>
       <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -1826,7 +1831,7 @@
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_315</name>
-    <text>Trigger repeat:</text>
+    <text>Trigger Repeat:</text>
     <x>70</x>
     <y>125</y>
     <width>140</width>
@@ -1933,14 +1938,14 @@
     <pv_name>$(P)$(BPM_PAIR)-Acquire</pv_name>
     <text>Start</text>
     <x>255</x>
-    <y>205</y>
+    <y>245</y>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_10</name>
     <pv_name>$(P)$(BPM_PAIR)-Acquire</pv_name>
     <x>500</x>
-    <y>210</y>
+    <y>250</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -1960,14 +1965,14 @@
     <pv_name>$(P)$(BPM_PAIR)-Acquire</pv_name>
     <text>Stop</text>
     <x>390</x>
-    <y>205</y>
+    <y>245</y>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_316</name>
     <text>Control:</text>
     <x>70</x>
-    <y>205</y>
+    <y>245</y>
     <width>140</width>
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
@@ -1983,7 +1988,7 @@
     <name>Label_272</name>
     <text>Transfer waveforms:</text>
     <x>70</x>
-    <y>240</y>
+    <y>280</y>
     <width>140</width>
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
@@ -2006,7 +2011,7 @@
     <pv_name>$(P)$(BPM_PAIR)-TransferArrays</pv_name>
     <text>Yes</text>
     <x>255</x>
-    <y>240</y>
+    <y>280</y>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="action_button" version="3.0.0">
@@ -2020,14 +2025,266 @@
     <pv_name>$(P)$(BPM_PAIR)-TransferArrays</pv_name>
     <text>No</text>
     <x>390</x>
-    <y>240</y>
+    <y>280</y>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_11</name>
     <pv_name>$(P)$(BPM_PAIR)-TransferArrays</pv_name>
     <x>500</x>
-    <y>245</y>
+    <y>285</y>
+    <off_color>
+      <color name="IO Background" red="235" green="235" blue="235">
+      </color>
+    </off_color>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_355</name>
+    <text>Phase Unwrap Control:</text>
+    <x>70</x>
+    <y>600</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_12</name>
+    <pv_name>$(P)$(R)PhaseUnwrapControl</pv_name>
+    <x>290</x>
+    <y>606</y>
+    <off_color>
+      <color name="IO Background" red="235" green="235" blue="235">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+      </color>
+    </on_color>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_60</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)PhaseUnwrapControl</pv_name>
+    <text>Enable</text>
+    <x>330</x>
+    <y>600</y>
+    <width>80</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_61</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)PhaseUnwrapControl</pv_name>
+    <text>Disable</text>
+    <x>420</x>
+    <y>600</y>
+    <width>80</width>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_364</name>
+    <text>Phase Unwrap:</text>
+    <x>70</x>
+    <y>638</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_80</name>
+    <pv_name>$(P)$(R)PhaseUnwrap</pv_name>
+    <x>240</x>
+    <y>638</y>
+    <width>130</width>
+    <height>30</height>
+    <precision>3</precision>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_9</name>
+    <pv_name>$(P)$(R)PhaseUnwrap</pv_name>
+    <x>380</x>
+    <y>638</y>
+    <width>120</width>
+    <height>30</height>
+    <precision>3</precision>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_365</name>
+    <text>Trigger Timeout Value:</text>
+    <x>70</x>
+    <y>205</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_106</name>
+    <pv_name>$(P)$(BPM_PAIR)-TriggerTimeoutValue</pv_name>
+    <x>240</x>
+    <y>205</y>
+    <width>130</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_366</name>
+    <text>Clock interrupted:</text>
+    <x>70</x>
+    <y>315</y>
+    <width>140</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_62</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(BPM_PAIR)-HealthClockIntrClear</pv_name>
+    <text>Clear</text>
+    <x>390</x>
+    <y>315</y>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_13</name>
+    <pv_name>$(P)$(BPM_PAIR)-HealthClockIntrClear</pv_name>
+    <x>290</x>
+    <y>320</y>
+    <off_color>
+      <color name="IO Background" red="235" green="235" blue="235">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="Major" red="250" green="12" blue="14">
+      </color>
+    </on_color>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_367</name>
+    <text>Phase Unwrap Control:</text>
+    <x>70</x>
+    <y>350</y>
+    <width>155</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_63</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(BPM_PAIR)-AngleDiffPhaseUnwrapControl</pv_name>
+    <text>Enable</text>
+    <x>255</x>
+    <y>350</y>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_64</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(BPM_PAIR)-AngleDiffPhaseUnwrapControl</pv_name>
+    <text>Disable</text>
+    <x>390</x>
+    <y>350</y>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_14</name>
+    <pv_name>$(P)$(BPM_PAIR)-AngleDiffPhaseUnwrapControl</pv_name>
+    <x>500</x>
+    <y>355</y>
     <off_color>
       <color name="IO Background" red="235" green="235" blue="235">
       </color>
@@ -2036,4 +2293,121 @@
     </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_19</name>
+    <pv_name>$(P)$(BPM_PAIR)-TriggerTimeoutValue</pv_name>
+    <x>380</x>
+    <y>205</y>
+    <width>120</width>
+    <height>30</height>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input_20</name>
+    <pv_name>$(P)$(BPM_PAIR)-AngleDiffPhaseUnwrap</pv_name>
+    <x>380</x>
+    <y>390</y>
+    <width>120</width>
+    <height>30</height>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_107</name>
+    <pv_name>$(P)$(BPM_PAIR)-AngleDiffPhaseUnwrap</pv_name>
+    <x>240</x>
+    <y>390</y>
+    <width>130</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_368</name>
+    <text>Phase Unwrap:</text>
+    <x>70</x>
+    <y>390</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_369</name>
+    <text>BPM Ready:</text>
+    <x>70</x>
+    <y>425</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_108</name>
+    <pv_name>$(P)$(BPM_PAIR)-Ready</pv_name>
+    <x>240</x>
+    <y>425</y>
+    <width>130</width>
+    <height>30</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="combo" version="2.0.0">
+    <name>Text Input_21</name>
+    <pv_name>$(P)$(BPM_PAIR)-Ready</pv_name>
+    <x>380</x>
+    <y>425</y>
+    <width>120</width>
+    <background_color>
+      <color name="Write_Background" red="224" green="217" blue="202">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <items>
+      <item>0</item>
+      <item>1</item>
+    </items>
+    <items_from_pv>false</items_from_pv>
+  </widget>
 </display>