diff --git a/opi/EMU.opi b/opi/EMU.opi
index 8e1c0dfc88c8d0eba2bd1f77c72ed802cde2e04e..1c5b9f786ae36d6cbe04848355a1dd3ead6543af 100644
--- a/opi/EMU.opi
+++ b/opi/EMU.opi
@@ -334,7 +334,7 @@ $(pv_value)</tooltip>
         <background_color>
           <color red="186" green="189" blue="182" />
         </background_color>
-        <width>1261</width>
+        <width>1681</width>
         <x>414</x>
         <name>Rounded Rectangle_5</name>
         <y>18</y>
@@ -540,7 +540,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -637,7 +637,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -734,7 +734,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.combo" version="1.0.0">
@@ -915,7 +915,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -1012,7 +1012,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -1101,7 +1101,7 @@ $(pv_value)</tooltip>
           <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
         <width>84</width>
-        <x>109</x>
+        <x>99</x>
         <name>Label Orientation_2</name>
         <y>739</y>
         <foreground_color>
@@ -1109,7 +1109,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -1371,7 +1371,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -1411,7 +1411,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -1508,7 +1508,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -1605,7 +1605,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -1715,7 +1715,7 @@ $(pv_value)</tooltip>
         <horizon_profile_x_pv_name></horizon_profile_x_pv_name>
         <height>1027</height>
         <border_width>1</border_width>
-        <graph_area_width>1125</graph_area_width>
+        <graph_area_width>1539</graph_area_width>
         <y_axis_scale_font>
           <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </y_axis_scale_font>
@@ -1752,7 +1752,7 @@ $(pv_value)</tooltip>
           <color red="240" green="240" blue="240" />
         </background_color>
         <x_axis_axis_title>mm</x_axis_axis_title>
-        <width>1235</width>
+        <width>1649</width>
         <x>422</x>
         <y>84</y>
         <maximum>5.0</maximum>
@@ -1955,7 +1955,7 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="SubPanel" red="176" green="218" blue="249" />
         </background_color>
-        <width>1261</width>
+        <width>1681</width>
         <x>414</x>
         <name>Label_15</name>
         <y>39</y>
@@ -2012,8 +2012,8 @@ $(pv_value)</tooltip>
         <background_color>
           <color red="186" green="189" blue="182" />
         </background_color>
-        <width>739</width>
-        <x>1716</x>
+        <width>319</width>
+        <x>2136</x>
         <name>Rounded Rectangle_5</name>
         <y>18</y>
         <fill_level>0.0</fill_level>
@@ -2046,10 +2046,10 @@ $(pv_value)</tooltip>
         <background_color>
           <color red="186" green="189" blue="182" />
         </background_color>
-        <width>739</width>
-        <x>1716</x>
+        <width>319</width>
+        <x>2136</x>
         <horizontal_tabs>true</horizontal_tabs>
-        <y>103</y>
+        <y>70</y>
         <rules />
         <macros>
           <include_parent_macros>true</include_parent_macros>
@@ -2064,7 +2064,7 @@ $(pv_value)</tooltip>
         <tab_0_font>
           <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </tab_0_font>
-        <tab_0_title>Tab 0</tab_0_title>
+        <tab_0_title>Control</tab_0_title>
         <scripts />
         <tab_count>1</tab_count>
         <scale_options>
@@ -2104,9 +2104,9 @@ $(pv_value)</tooltip>
           <background_color>
             <color red="240" green="240" blue="240" />
           </background_color>
-          <width>737</width>
+          <width>317</width>
           <x>1</x>
-          <name>Tab 0</name>
+          <name>Control</name>
           <y>1</y>
           <foreground_color>
             <color red="192" green="192" blue="192" />
@@ -2146,15 +2146,15 @@ $(pv_value)</tooltip>
               <color name="IO Background" red="255" green="255" blue="205" />
             </background_color>
             <width>125</width>
-            <x>26</x>
+            <x>38</x>
             <name>Label Orientation_7</name>
-            <y>30</y>
+            <y>36</y>
             <foreground_color>
               <color name="IO Foreground" red="0" green="0" blue="0" />
             </foreground_color>
             <actions hook="false" hook_all="false" />
             <font>
-              <fontdata fontName="Sans" height="10" style="1" />
+              <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
             </font>
           </widget>
           <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -2203,8 +2203,8 @@ $(pv_value)</tooltip>
               <color name="TextBackground" red="70" green="70" blue="70" />
             </background_color>
             <width>100</width>
-            <x>150</x>
-            <y>24</y>
+            <x>186</x>
+            <y>30</y>
             <maximum>1.7976931348623157E308</maximum>
             <foreground_color>
               <color name="Green On" red="0" green="255" blue="0" />
@@ -2243,15 +2243,15 @@ $(pv_value)</tooltip>
               <color name="IO Background" red="255" green="255" blue="205" />
             </background_color>
             <width>127</width>
-            <x>18</x>
+            <x>30</x>
             <name>Label Orientation_7</name>
-            <y>70</y>
+            <y>84</y>
             <foreground_color>
               <color name="IO Foreground" red="0" green="0" blue="0" />
             </foreground_color>
             <actions hook="false" hook_all="false" />
             <font>
-              <fontdata fontName="Sans" height="10" style="1" />
+              <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
             </font>
           </widget>
           <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -2300,8 +2300,8 @@ $(pv_value)</tooltip>
               <color name="TextBackground" red="70" green="70" blue="70" />
             </background_color>
             <width>100</width>
-            <x>150</x>
-            <y>64</y>
+            <x>186</x>
+            <y>78</y>
             <maximum>1.7976931348623157E308</maximum>
             <foreground_color>
               <color name="Green On" red="0" green="255" blue="0" />
@@ -2320,7 +2320,7 @@ $(pv_value)</tooltip>
             <wuid>79429b6c:157dd491a6d:-7dd7</wuid>
             <transparent>true</transparent>
             <auto_size>false</auto_size>
-            <text>Angle</text>
+            <text>Angle STEP  in course ...</text>
             <scripts />
             <height>20</height>
             <border_width>2</border_width>
@@ -2339,16 +2339,16 @@ $(pv_value)</tooltip>
             <background_color>
               <color name="IO Background" red="255" green="255" blue="205" />
             </background_color>
-            <width>109</width>
-            <x>42</x>
+            <width>151</width>
+            <x>12</x>
             <name>Label Orientation_7</name>
-            <y>109</y>
+            <y>132</y>
             <foreground_color>
               <color name="IO Foreground" red="0" green="0" blue="0" />
             </foreground_color>
             <actions hook="false" hook_all="false" />
             <font>
-              <fontdata fontName="Sans" height="10" style="1" />
+              <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
             </font>
           </widget>
           <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -2397,8 +2397,8 @@ $(pv_value)</tooltip>
               <color name="TextBackground" red="70" green="70" blue="70" />
             </background_color>
             <width>100</width>
-            <x>150</x>
-            <y>103</y>
+            <x>186</x>
+            <y>126</y>
             <maximum>1.7976931348623157E308</maximum>
             <foreground_color>
               <color name="Green On" red="0" green="255" blue="0" />
@@ -2454,8 +2454,8 @@ $(pv_value)</tooltip>
               <color name="TextBackground" red="70" green="70" blue="70" />
             </background_color>
             <width>100</width>
-            <x>150</x>
-            <y>142</y>
+            <x>186</x>
+            <y>174</y>
             <maximum>1.7976931348623157E308</maximum>
             <foreground_color>
               <color name="Green On" red="0" green="255" blue="0" />
@@ -2474,7 +2474,7 @@ $(pv_value)</tooltip>
             <wuid>-16429ab9:1582e68df9a:-3c09</wuid>
             <transparent>true</transparent>
             <auto_size>false</auto_size>
-            <text>Pos</text>
+            <text>Position STEP in course ...</text>
             <scripts />
             <height>20</height>
             <border_width>2</border_width>
@@ -2493,342 +2493,68 @@ $(pv_value)</tooltip>
             <background_color>
               <color name="IO Background" red="255" green="255" blue="205" />
             </background_color>
-            <width>109</width>
-            <x>42</x>
+            <width>172</width>
+            <x>6</x>
             <name>Label Orientation_1</name>
-            <y>148</y>
-            <foreground_color>
-              <color name="IO Foreground" red="0" green="0" blue="0" />
-            </foreground_color>
-            <actions hook="false" hook_all="false" />
-            <font>
-              <fontdata fontName="Sans" height="10" style="1" />
-            </font>
-          </widget>
-          <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-            <border_style>0</border_style>
-            <tooltip></tooltip>
-            <horizontal_alignment>0</horizontal_alignment>
-            <rules />
-            <enabled>false</enabled>
-            <wuid>-16429ab9:158444d4181:-6d84</wuid>
-            <transparent>true</transparent>
-            <auto_size>true</auto_size>
-            <text>HOMELS: Sate of the home limit switch.</text>
-            <scripts />
-            <height>15</height>
-            <border_width>2</border_width>
-            <scale_options>
-              <width_scalable>true</width_scalable>
-              <height_scalable>true</height_scalable>
-              <keep_wh_ratio>false</keep_wh_ratio>
-            </scale_options>
-            <visible>true</visible>
-            <vertical_alignment>1</vertical_alignment>
-            <border_color>
-              <color name="IO Border" red="215" green="215" blue="215" />
-            </border_color>
-            <widget_type>Label</widget_type>
-            <wrap_words>true</wrap_words>
-            <background_color>
-              <color name="IO Background" red="255" green="255" blue="205" />
-            </background_color>
-            <width>235</width>
-            <x>366</x>
-            <name>Label Template_6</name>
-            <y>91</y>
-            <foreground_color>
-              <color name="IO Foreground" red="0" green="0" blue="0" />
-            </foreground_color>
-            <actions hook="false" hook_all="false" />
-            <show_scrollbar>false</show_scrollbar>
-            <font>
-              <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-            </font>
-          </widget>
-          <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-            <border_style>0</border_style>
-            <tooltip></tooltip>
-            <horizontal_alignment>0</horizontal_alignment>
-            <rules />
-            <enabled>false</enabled>
-            <wuid>-16429ab9:158444d4181:-6d80</wuid>
-            <transparent>true</transparent>
-            <auto_size>true</auto_size>
-            <text>HOME: If at home position.</text>
-            <scripts />
-            <height>15</height>
-            <border_width>2</border_width>
-            <scale_options>
-              <width_scalable>true</width_scalable>
-              <height_scalable>true</height_scalable>
-              <keep_wh_ratio>false</keep_wh_ratio>
-            </scale_options>
-            <visible>true</visible>
-            <vertical_alignment>1</vertical_alignment>
-            <border_color>
-              <color name="IO Border" red="215" green="215" blue="215" />
-            </border_color>
-            <widget_type>Label</widget_type>
-            <wrap_words>true</wrap_words>
-            <background_color>
-              <color name="IO Background" red="255" green="255" blue="205" />
-            </background_color>
-            <width>157</width>
-            <x>366</x>
-            <name>Label Template_10</name>
-            <y>175</y>
-            <foreground_color>
-              <color name="IO Foreground" red="0" green="0" blue="0" />
-            </foreground_color>
-            <actions hook="false" hook_all="false" />
-            <show_scrollbar>false</show_scrollbar>
-            <font>
-              <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-            </font>
-          </widget>
-          <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-            <border_style>0</border_style>
-            <tooltip></tooltip>
-            <horizontal_alignment>0</horizontal_alignment>
-            <rules />
-            <enabled>false</enabled>
-            <wuid>-16429ab9:158444d4181:-6d81</wuid>
-            <transparent>true</transparent>
-            <auto_size>true</auto_size>
-            <text>SLIP_STALL: Slip/Stall detected (eg. fatal following error).</text>
-            <scripts />
-            <height>15</height>
-            <border_width>2</border_width>
-            <scale_options>
-              <width_scalable>true</width_scalable>
-              <height_scalable>true</height_scalable>
-              <keep_wh_ratio>false</keep_wh_ratio>
-            </scale_options>
-            <visible>true</visible>
-            <vertical_alignment>1</vertical_alignment>
-            <border_color>
-              <color name="IO Border" red="215" green="215" blue="215" />
-            </border_color>
-            <widget_type>Label</widget_type>
-            <wrap_words>true</wrap_words>
-            <background_color>
-              <color name="IO Background" red="255" green="255" blue="205" />
-            </background_color>
-            <width>332</width>
-            <x>366</x>
-            <name>Label Template_9</name>
-            <y>154</y>
-            <foreground_color>
-              <color name="IO Foreground" red="0" green="0" blue="0" />
-            </foreground_color>
-            <actions hook="false" hook_all="false" />
-            <show_scrollbar>false</show_scrollbar>
-            <font>
-              <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-            </font>
-          </widget>
-          <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-            <border_style>0</border_style>
-            <tooltip></tooltip>
-            <horizontal_alignment>0</horizontal_alignment>
-            <rules />
-            <enabled>false</enabled>
-            <wuid>-16429ab9:158444d4181:-6d7f</wuid>
-            <transparent>true</transparent>
-            <auto_size>true</auto_size>
-            <text>PRESENT: Encoder is present.</text>
-            <scripts />
-            <height>15</height>
-            <border_width>2</border_width>
-            <scale_options>
-              <width_scalable>true</width_scalable>
-              <height_scalable>true</height_scalable>
-              <keep_wh_ratio>false</keep_wh_ratio>
-            </scale_options>
-            <visible>true</visible>
-            <vertical_alignment>1</vertical_alignment>
-            <border_color>
-              <color name="IO Border" red="215" green="215" blue="215" />
-            </border_color>
-            <widget_type>Label</widget_type>
-            <wrap_words>true</wrap_words>
-            <background_color>
-              <color name="IO Background" red="255" green="255" blue="205" />
-            </background_color>
-            <width>181</width>
-            <x>366</x>
-            <name>Label Template_22</name>
-            <y>196</y>
+            <y>180</y>
             <foreground_color>
               <color name="IO Foreground" red="0" green="0" blue="0" />
             </foreground_color>
             <actions hook="false" hook_all="false" />
-            <show_scrollbar>false</show_scrollbar>
             <font>
-              <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+              <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
             </font>
           </widget>
-          <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-            <border_style>0</border_style>
-            <tooltip></tooltip>
-            <horizontal_alignment>0</horizontal_alignment>
-            <rules />
-            <enabled>false</enabled>
-            <wuid>-16429ab9:158444d4181:-6d7e</wuid>
-            <transparent>true</transparent>
-            <auto_size>true</auto_size>
-            <text>PROBLEM: Driver stopped polling, or hardware problem.</text>
-            <scripts />
-            <height>15</height>
-            <border_width>2</border_width>
-            <scale_options>
-              <width_scalable>true</width_scalable>
-              <height_scalable>true</height_scalable>
-              <keep_wh_ratio>false</keep_wh_ratio>
-            </scale_options>
-            <visible>true</visible>
-            <vertical_alignment>1</vertical_alignment>
-            <border_color>
-              <color name="IO Border" red="215" green="215" blue="215" />
-            </border_color>
-            <widget_type>Label</widget_type>
-            <wrap_words>true</wrap_words>
-            <background_color>
-              <color name="IO Background" red="255" green="255" blue="205" />
-            </background_color>
-            <width>324</width>
-            <x>366</x>
-            <name>Label Template_23</name>
-            <y>217</y>
-            <foreground_color>
-              <color name="IO Foreground" red="0" green="0" blue="0" />
-            </foreground_color>
-            <actions hook="false" hook_all="false" />
-            <show_scrollbar>false</show_scrollbar>
-            <font>
-              <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-            </font>
-          </widget>
-          <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-            <border_style>0</border_style>
-            <tooltip></tooltip>
-            <horizontal_alignment>0</horizontal_alignment>
-            <rules />
-            <enabled>false</enabled>
-            <wuid>-16429ab9:158444d4181:-6d83</wuid>
-            <transparent>true</transparent>
-            <auto_size>true</auto_size>
-            <text>Unused.</text>
-            <scripts />
-            <height>15</height>
-            <border_width>2</border_width>
-            <scale_options>
-              <width_scalable>true</width_scalable>
-              <height_scalable>true</height_scalable>
-              <keep_wh_ratio>false</keep_wh_ratio>
-            </scale_options>
-            <visible>true</visible>
-            <vertical_alignment>1</vertical_alignment>
-            <border_color>
-              <color name="IO Border" red="215" green="215" blue="215" />
-            </border_color>
-            <widget_type>Label</widget_type>
-            <wrap_words>true</wrap_words>
-            <background_color>
-              <color name="IO Background" red="255" green="255" blue="205" />
-            </background_color>
-            <width>48</width>
-            <x>366</x>
-            <name>Label Template_7</name>
-            <y>112</y>
-            <foreground_color>
-              <color name="IO Foreground" red="0" green="0" blue="0" />
-            </foreground_color>
-            <actions hook="false" hook_all="false" />
-            <show_scrollbar>false</show_scrollbar>
-            <font>
-              <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-            </font>
-          </widget>
-          <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-            <border_style>0</border_style>
-            <tooltip></tooltip>
-            <horizontal_alignment>0</horizontal_alignment>
-            <rules />
-            <enabled>false</enabled>
-            <wuid>-16429ab9:158444d4181:-6d82</wuid>
-            <transparent>true</transparent>
-            <auto_size>true</auto_size>
-            <text>POSITION: Closed-loop position control is enabled.</text>
-            <scripts />
-            <height>15</height>
-            <border_width>2</border_width>
-            <scale_options>
-              <width_scalable>true</width_scalable>
-              <height_scalable>true</height_scalable>
-              <keep_wh_ratio>false</keep_wh_ratio>
-            </scale_options>
-            <visible>true</visible>
-            <vertical_alignment>1</vertical_alignment>
-            <border_color>
-              <color name="IO Border" red="215" green="215" blue="215" />
-            </border_color>
-            <widget_type>Label</widget_type>
-            <wrap_words>true</wrap_words>
-            <background_color>
-              <color name="IO Background" red="255" green="255" blue="205" />
-            </background_color>
-            <width>295</width>
-            <x>366</x>
-            <name>Label Template_8</name>
-            <y>133</y>
-            <foreground_color>
-              <color name="IO Foreground" red="0" green="0" blue="0" />
-            </foreground_color>
-            <actions hook="false" hook_all="false" />
-            <show_scrollbar>false</show_scrollbar>
-            <font>
-              <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-            </font>
-          </widget>
-          <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+          <widget typeId="org.csstudio.opibuilder.widgets.bytemonitor" version="1.0.0">
             <border_style>0</border_style>
-            <tooltip></tooltip>
-            <horizontal_alignment>0</horizontal_alignment>
+            <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+            <alarm_pulsing>false</alarm_pulsing>
+            <tooltip>$(pv_name)
+$(pv_value)</tooltip>
             <rules />
-            <enabled>false</enabled>
-            <wuid>-16429ab9:158444d4181:-6d7b</wuid>
-            <transparent>true</transparent>
-            <auto_size>true</auto_size>
-            <text>COMM_ERR: Controller communication error.</text>
+            <effect_3d>true</effect_3d>
+            <enabled>true</enabled>
+            <wuid>59fc39f9:158487e5950:-422a</wuid>
+            <on_color>
+              <color name="Major" red="255" green="0" blue="0" />
+            </on_color>
+            <horizontal>false</horizontal>
+            <pv_value />
+            <numBits>1</numBits>
             <scripts />
-            <height>15</height>
-            <border_width>2</border_width>
+            <border_alarm_sensitive>true</border_alarm_sensitive>
+            <height>28</height>
+            <border_width>0</border_width>
             <scale_options>
               <width_scalable>true</width_scalable>
               <height_scalable>true</height_scalable>
               <keep_wh_ratio>false</keep_wh_ratio>
             </scale_options>
             <visible>true</visible>
-            <vertical_alignment>1</vertical_alignment>
+            <pv_name>PMAC:MTR1.MSTA</pv_name>
             <border_color>
               <color name="IO Border" red="215" green="215" blue="215" />
             </border_color>
-            <widget_type>Label</widget_type>
-            <wrap_words>true</wrap_words>
+            <bitReverse>true</bitReverse>
+            <label />
+            <widget_type>Byte Monitor</widget_type>
+            <off_color>
+              <color name="IO Grid" red="215" green="215" blue="215" />
+            </off_color>
+            <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
             <background_color>
               <color name="IO Background" red="255" green="255" blue="205" />
             </background_color>
-            <width>263</width>
-            <x>366</x>
-            <name>Label Template_15</name>
-            <y>280</y>
+            <square_led>true</square_led>
+            <startBit>13</startBit>
+            <width>70</width>
+            <x>201</x>
+            <name>Byte Monitor Template</name>
+            <y>264</y>
             <foreground_color>
-              <color name="IO Foreground" red="0" green="0" blue="0" />
+              <color name="IO InputPV Fg" red="0" green="32" blue="92" />
             </foreground_color>
             <actions hook="false" hook_all="false" />
-            <show_scrollbar>false</show_scrollbar>
             <font>
               <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
             </font>
@@ -2836,16 +2562,16 @@ $(pv_value)</tooltip>
           <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
             <border_style>0</border_style>
             <tooltip></tooltip>
-            <horizontal_alignment>0</horizontal_alignment>
+            <horizontal_alignment>1</horizontal_alignment>
             <rules />
-            <enabled>false</enabled>
-            <wuid>-16429ab9:158444d4181:-6d85</wuid>
+            <enabled>true</enabled>
+            <wuid>59fc39f9:158487e5950:-3dc7</wuid>
             <transparent>true</transparent>
-            <auto_size>true</auto_size>
-            <text>PLUS_LS: Plus limit switch has been hit.</text>
+            <auto_size>false</auto_size>
+            <text>LOW Limit </text>
             <scripts />
-            <height>15</height>
-            <border_width>2</border_width>
+            <height>20</height>
+            <border_width>1</border_width>
             <scale_options>
               <width_scalable>true</width_scalable>
               <height_scalable>true</height_scalable>
@@ -2854,39 +2580,38 @@ $(pv_value)</tooltip>
             <visible>true</visible>
             <vertical_alignment>1</vertical_alignment>
             <border_color>
-              <color name="IO Border" red="215" green="215" blue="215" />
+              <color red="0" green="128" blue="255" />
             </border_color>
             <widget_type>Label</widget_type>
-            <wrap_words>true</wrap_words>
+            <wrap_words>false</wrap_words>
             <background_color>
-              <color name="IO Background" red="255" green="255" blue="205" />
+              <color red="255" green="255" blue="255" />
             </background_color>
-            <width>239</width>
-            <x>366</x>
-            <name>Label Template_5</name>
-            <y>70</y>
+            <width>83</width>
+            <x>52</x>
+            <name>Label_164</name>
+            <y>268</y>
             <foreground_color>
-              <color name="IO Foreground" red="0" green="0" blue="0" />
+              <color red="0" green="0" blue="0" />
             </foreground_color>
             <actions hook="false" hook_all="false" />
-            <show_scrollbar>false</show_scrollbar>
             <font>
-              <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+              <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
             </font>
           </widget>
           <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
             <border_style>0</border_style>
             <tooltip></tooltip>
-            <horizontal_alignment>0</horizontal_alignment>
+            <horizontal_alignment>1</horizontal_alignment>
             <rules />
-            <enabled>false</enabled>
-            <wuid>-16429ab9:158444d4181:-6d79</wuid>
+            <enabled>true</enabled>
+            <wuid>59fc39f9:158487e5950:-38d5</wuid>
             <transparent>true</transparent>
-            <auto_size>true</auto_size>
-            <text>HOMED: The motor has been homed.</text>
+            <auto_size>false</auto_size>
+            <text>HIGH Limit </text>
             <scripts />
-            <height>15</height>
-            <border_width>2</border_width>
+            <height>20</height>
+            <border_width>1</border_width>
             <scale_options>
               <width_scalable>true</width_scalable>
               <height_scalable>true</height_scalable>
@@ -2895,24 +2620,23 @@ $(pv_value)</tooltip>
             <visible>true</visible>
             <vertical_alignment>1</vertical_alignment>
             <border_color>
-              <color name="IO Border" red="215" green="215" blue="215" />
+              <color red="0" green="128" blue="255" />
             </border_color>
             <widget_type>Label</widget_type>
-            <wrap_words>true</wrap_words>
+            <wrap_words>false</wrap_words>
             <background_color>
-              <color name="IO Background" red="255" green="255" blue="205" />
+              <color red="255" green="255" blue="255" />
             </background_color>
-            <width>218</width>
-            <x>366</x>
-            <name>Label Template_17</name>
-            <y>322</y>
+            <width>83</width>
+            <x>52</x>
+            <name>Label_164</name>
+            <y>309</y>
             <foreground_color>
-              <color name="IO Foreground" red="0" green="0" blue="0" />
+              <color red="0" green="0" blue="0" />
             </foreground_color>
             <actions hook="false" hook_all="false" />
-            <show_scrollbar>false</show_scrollbar>
             <font>
-              <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+              <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
             </font>
           </widget>
           <widget typeId="org.csstudio.opibuilder.widgets.bytemonitor" version="1.0.0">
@@ -2924,16 +2648,16 @@ $(pv_value)</tooltip>
             <rules />
             <effect_3d>true</effect_3d>
             <enabled>true</enabled>
-            <wuid>-16429ab9:158444d4181:-6d87</wuid>
+            <wuid>59fc39f9:158487e5950:-38d6</wuid>
             <on_color>
-              <color name="IO OK" red="0" green="255" blue="0" />
+              <color name="Major" red="255" green="0" blue="0" />
             </on_color>
             <horizontal>false</horizontal>
             <pv_value />
-            <numBits>15</numBits>
+            <numBits>1</numBits>
             <scripts />
             <border_alarm_sensitive>true</border_alarm_sensitive>
-            <height>320</height>
+            <height>28</height>
             <border_width>0</border_width>
             <scale_options>
               <width_scalable>true</width_scalable>
@@ -2956,11 +2680,11 @@ $(pv_value)</tooltip>
               <color name="IO Background" red="255" green="255" blue="205" />
             </background_color>
             <square_led>true</square_led>
-            <startBit>0</startBit>
-            <width>25</width>
-            <x>330</x>
+            <startBit>2</startBit>
+            <width>70</width>
+            <x>201</x>
             <name>Byte Monitor Template</name>
-            <y>24</y>
+            <y>305</y>
             <foreground_color>
               <color name="IO InputPV Fg" red="0" green="32" blue="92" />
             </foreground_color>
@@ -2969,84 +2693,56 @@ $(pv_value)</tooltip>
               <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
             </font>
           </widget>
-          <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+          <widget typeId="org.csstudio.opibuilder.widgets.bytemonitor" version="1.0.0">
             <border_style>0</border_style>
-            <tooltip></tooltip>
-            <horizontal_alignment>0</horizontal_alignment>
+            <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+            <alarm_pulsing>false</alarm_pulsing>
+            <tooltip>$(pv_name)
+$(pv_value)</tooltip>
             <rules />
-            <enabled>false</enabled>
-            <wuid>-16429ab9:158444d4181:-6d7a</wuid>
-            <transparent>true</transparent>
-            <auto_size>true</auto_size>
-            <text>MINUS_LS: Minus limit switch has been hit.</text>
+            <effect_3d>true</effect_3d>
+            <enabled>true</enabled>
+            <wuid>59fc39f9:158487e5950:-38ce</wuid>
+            <on_color>
+              <color name="Major" red="255" green="0" blue="0" />
+            </on_color>
+            <horizontal>false</horizontal>
+            <pv_value />
+            <numBits>1</numBits>
             <scripts />
-            <height>15</height>
-            <border_width>2</border_width>
+            <border_alarm_sensitive>true</border_alarm_sensitive>
+            <height>28</height>
+            <border_width>0</border_width>
             <scale_options>
               <width_scalable>true</width_scalable>
               <height_scalable>true</height_scalable>
               <keep_wh_ratio>false</keep_wh_ratio>
             </scale_options>
             <visible>true</visible>
-            <vertical_alignment>1</vertical_alignment>
+            <pv_name>PMAC:MTR1.MOVN</pv_name>
             <border_color>
               <color name="IO Border" red="215" green="215" blue="215" />
             </border_color>
-            <widget_type>Label</widget_type>
-            <wrap_words>true</wrap_words>
+            <bitReverse>true</bitReverse>
+            <label />
+            <widget_type>Byte Monitor</widget_type>
+            <off_color>
+              <color name="IO Grid" red="215" green="215" blue="215" />
+            </off_color>
+            <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
             <background_color>
               <color name="IO Background" red="255" green="255" blue="205" />
             </background_color>
-            <width>255</width>
-            <x>366</x>
-            <name>Label Template_16</name>
-            <y>301</y>
-            <foreground_color>
-              <color name="IO Foreground" red="0" green="0" blue="0" />
-            </foreground_color>
-            <actions hook="false" hook_all="false" />
-            <show_scrollbar>false</show_scrollbar>
-            <font>
-              <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-            </font>
-          </widget>
-          <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-            <border_style>0</border_style>
-            <tooltip></tooltip>
-            <horizontal_alignment>0</horizontal_alignment>
-            <rules />
-            <enabled>false</enabled>
-            <wuid>-16429ab9:158444d4181:-6d78</wuid>
-            <transparent>false</transparent>
-            <auto_size>false</auto_size>
-            <text>DIRECTION: Last raw direction; (Grey: Neg., Green: Pos.)</text>
-            <scripts />
-            <height>20</height>
-            <border_width>2</border_width>
-            <scale_options>
-              <width_scalable>true</width_scalable>
-              <height_scalable>true</height_scalable>
-              <keep_wh_ratio>false</keep_wh_ratio>
-            </scale_options>
-            <visible>true</visible>
-            <vertical_alignment>1</vertical_alignment>
-            <border_color>
-              <color name="IO Border" red="215" green="215" blue="215" />
-            </border_color>
-            <widget_type>Label</widget_type>
-            <wrap_words>true</wrap_words>
-            <background_color>
-              <color name="IO Shape Fill" red="188" green="188" blue="188" />
-            </background_color>
-            <width>350</width>
-            <x>366</x>
-            <name>Label Template_45</name>
-            <y>28</y>
+            <square_led>true</square_led>
+            <startBit>0</startBit>
+            <width>70</width>
+            <x>201</x>
+            <name>Byte Monitor Template</name>
+            <y>347</y>
             <foreground_color>
-              <color red="0" green="0" blue="0" />
+              <color name="IO InputPV Fg" red="0" green="32" blue="92" />
             </foreground_color>
             <actions hook="false" hook_all="false" />
-            <show_scrollbar>false</show_scrollbar>
             <font>
               <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
             </font>
@@ -3054,16 +2750,16 @@ $(pv_value)</tooltip>
           <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
             <border_style>0</border_style>
             <tooltip></tooltip>
-            <horizontal_alignment>0</horizontal_alignment>
+            <horizontal_alignment>1</horizontal_alignment>
             <rules />
-            <enabled>false</enabled>
-            <wuid>-16429ab9:158444d4181:-6d7d</wuid>
+            <enabled>true</enabled>
+            <wuid>59fc39f9:158487e5950:-38cd</wuid>
             <transparent>true</transparent>
-            <auto_size>true</auto_size>
-            <text>MOVING: Non-zero velocity present.</text>
+            <auto_size>false</auto_size>
+            <text>Motor is moving ...</text>
             <scripts />
-            <height>15</height>
-            <border_width>2</border_width>
+            <height>20</height>
+            <border_width>1</border_width>
             <scale_options>
               <width_scalable>true</width_scalable>
               <height_scalable>true</height_scalable>
@@ -3072,79 +2768,94 @@ $(pv_value)</tooltip>
             <visible>true</visible>
             <vertical_alignment>1</vertical_alignment>
             <border_color>
-              <color name="IO Border" red="215" green="215" blue="215" />
+              <color red="0" green="128" blue="255" />
             </border_color>
             <widget_type>Label</widget_type>
-            <wrap_words>true</wrap_words>
+            <wrap_words>false</wrap_words>
             <background_color>
-              <color name="IO Background" red="255" green="255" blue="205" />
+              <color red="255" green="255" blue="255" />
             </background_color>
-            <width>210</width>
-            <x>366</x>
-            <name>Label Template_13</name>
-            <y>238</y>
+            <width>133</width>
+            <x>30</x>
+            <name>Label_164</name>
+            <y>351</y>
             <foreground_color>
-              <color name="IO Foreground" red="0" green="0" blue="0" />
+              <color red="0" green="0" blue="0" />
             </foreground_color>
             <actions hook="false" hook_all="false" />
-            <show_scrollbar>false</show_scrollbar>
             <font>
-              <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+              <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
             </font>
           </widget>
-          <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-            <border_style>0</border_style>
-            <tooltip></tooltip>
-            <horizontal_alignment>0</horizontal_alignment>
+          <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+            <alarm_pulsing>false</alarm_pulsing>
+            <precision>2</precision>
+            <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+            <horizontal_alignment>1</horizontal_alignment>
             <rules />
-            <enabled>false</enabled>
-            <wuid>-16429ab9:158444d4181:-6d86</wuid>
-            <transparent>true</transparent>
-            <auto_size>true</auto_size>
-            <text>DONE: Motion is complete.</text>
+            <pv_value />
+            <auto_size>false</auto_size>
+            <text></text>
+            <rotation_angle>0.0</rotation_angle>
+            <show_units>true</show_units>
+            <height>31</height>
+            <multiline_input>false</multiline_input>
+            <border_width>1</border_width>
+            <visible>true</visible>
+            <pv_name>PMAC:MTR1.RBV</pv_name>
+            <selector_type>0</selector_type>
+            <border_color>
+              <color red="0" green="128" blue="255" />
+            </border_color>
+            <precision_from_pv>false</precision_from_pv>
+            <widget_type>Text Input</widget_type>
+            <confirm_message></confirm_message>
+            <name>Text Input_3</name>
+            <style>0</style>
+            <actions hook="false" hook_all="false" />
+            <border_style>3</border_style>
+            <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+            <enabled>true</enabled>
+            <wuid>59fc39f9:158487e5950:-356b</wuid>
+            <transparent>false</transparent>
             <scripts />
-            <height>15</height>
-            <border_width>2</border_width>
+            <border_alarm_sensitive>false</border_alarm_sensitive>
             <scale_options>
               <width_scalable>true</width_scalable>
               <height_scalable>true</height_scalable>
               <keep_wh_ratio>false</keep_wh_ratio>
             </scale_options>
-            <visible>true</visible>
-            <vertical_alignment>1</vertical_alignment>
-            <border_color>
-              <color name="IO Border" red="215" green="215" blue="215" />
-            </border_color>
-            <widget_type>Label</widget_type>
-            <wrap_words>true</wrap_words>
+            <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+            <format_type>0</format_type>
+            <limits_from_pv>false</limits_from_pv>
             <background_color>
-              <color name="IO Background" red="255" green="255" blue="205" />
+              <color name="TextBackground" red="70" green="70" blue="70" />
             </background_color>
-            <width>159</width>
-            <x>366</x>
-            <name>Label Template_4</name>
-            <y>49</y>
+            <width>100</width>
+            <x>186</x>
+            <y>222</y>
+            <maximum>1.7976931348623157E308</maximum>
             <foreground_color>
-              <color name="IO Foreground" red="0" green="0" blue="0" />
+              <color name="Green On" red="0" green="255" blue="0" />
             </foreground_color>
-            <actions hook="false" hook_all="false" />
-            <show_scrollbar>false</show_scrollbar>
+            <minimum>-1.7976931348623157E308</minimum>
             <font>
-              <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+              <fontdata fontName="Sans" height="10" style="1" />
             </font>
           </widget>
           <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
             <border_style>0</border_style>
             <tooltip></tooltip>
-            <horizontal_alignment>0</horizontal_alignment>
+            <horizontal_alignment>1</horizontal_alignment>
             <rules />
             <enabled>false</enabled>
-            <wuid>-16429ab9:158444d4181:-6d7c</wuid>
+            <wuid>59fc39f9:158487e5950:-356a</wuid>
             <transparent>true</transparent>
-            <auto_size>true</auto_size>
-            <text>GAIN_SUPPORT: Motor supports closed-loop pos. control.</text>
+            <auto_size>false</auto_size>
+            <text>Position in course</text>
             <scripts />
-            <height>15</height>
+            <height>20</height>
             <border_width>2</border_width>
             <scale_options>
               <width_scalable>true</width_scalable>
@@ -3157,21 +2868,20 @@ $(pv_value)</tooltip>
               <color name="IO Border" red="215" green="215" blue="215" />
             </border_color>
             <widget_type>Label</widget_type>
-            <wrap_words>true</wrap_words>
+            <wrap_words>false</wrap_words>
             <background_color>
               <color name="IO Background" red="255" green="255" blue="205" />
             </background_color>
-            <width>340</width>
-            <x>366</x>
-            <name>Label Template_14</name>
-            <y>259</y>
+            <width>166</width>
+            <x>12</x>
+            <name>Label Orientation_1</name>
+            <y>228</y>
             <foreground_color>
               <color name="IO Foreground" red="0" green="0" blue="0" />
             </foreground_color>
             <actions hook="false" hook_all="false" />
-            <show_scrollbar>false</show_scrollbar>
             <font>
-              <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+              <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
             </font>
           </widget>
           <widget typeId="org.csstudio.opibuilder.widgets.bytemonitor" version="1.0.0">
@@ -3183,16 +2893,16 @@ $(pv_value)</tooltip>
             <rules />
             <effect_3d>true</effect_3d>
             <enabled>true</enabled>
-            <wuid>59fc39f9:158487e5950:-7990</wuid>
+            <wuid>59fc39f9:158487e5950:-33a7</wuid>
             <on_color>
-              <color name="IO OK" red="0" green="255" blue="0" />
+              <color name="Green On" red="0" green="255" blue="0" />
             </on_color>
             <horizontal>false</horizontal>
             <pv_value />
             <numBits>1</numBits>
             <scripts />
             <border_alarm_sensitive>true</border_alarm_sensitive>
-            <height>128</height>
+            <height>28</height>
             <border_width>0</border_width>
             <scale_options>
               <width_scalable>true</width_scalable>
@@ -3215,11 +2925,11 @@ $(pv_value)</tooltip>
               <color name="IO Background" red="255" green="255" blue="205" />
             </background_color>
             <square_led>true</square_led>
-            <startBit>8</startBit>
-            <width>25</width>
-            <x>389</x>
+            <startBit>1</startBit>
+            <width>70</width>
+            <x>201</x>
             <name>Byte Monitor Template</name>
-            <y>660</y>
+            <y>390</y>
             <foreground_color>
               <color name="IO InputPV Fg" red="0" green="32" blue="92" />
             </foreground_color>
@@ -3228,24 +2938,17 @@ $(pv_value)</tooltip>
               <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
             </font>
           </widget>
-          <widget typeId="org.csstudio.opibuilder.widgets.bytemonitor" version="1.0.0">
+          <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
             <border_style>0</border_style>
-            <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-            <alarm_pulsing>false</alarm_pulsing>
-            <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+            <tooltip></tooltip>
+            <horizontal_alignment>1</horizontal_alignment>
             <rules />
-            <effect_3d>true</effect_3d>
             <enabled>true</enabled>
-            <wuid>59fc39f9:158487e5950:-48dc</wuid>
-            <on_color>
-              <color red="0" green="255" blue="0" />
-            </on_color>
-            <horizontal>true</horizontal>
-            <pv_value />
-            <numBits>16</numBits>
+            <wuid>59fc39f9:158487e5950:-33a6</wuid>
+            <transparent>true</transparent>
+            <auto_size>false</auto_size>
+            <text>Motor placed</text>
             <scripts />
-            <border_alarm_sensitive>true</border_alarm_sensitive>
             <height>20</height>
             <border_width>1</border_width>
             <scale_options>
@@ -3254,32 +2957,25 @@ $(pv_value)</tooltip>
               <keep_wh_ratio>false</keep_wh_ratio>
             </scale_options>
             <visible>true</visible>
-            <pv_name>PMAC:MTR1.MSTA</pv_name>
+            <vertical_alignment>1</vertical_alignment>
             <border_color>
               <color red="0" green="128" blue="255" />
             </border_color>
-            <bitReverse>false</bitReverse>
-            <label />
-            <widget_type>Byte Monitor</widget_type>
-            <off_color>
-              <color red="0" green="100" blue="0" />
-            </off_color>
-            <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+            <widget_type>Label</widget_type>
+            <wrap_words>false</wrap_words>
             <background_color>
-              <color red="240" green="240" blue="240" />
+              <color red="255" green="255" blue="255" />
             </background_color>
-            <square_led>false</square_led>
-            <startBit>0</startBit>
-            <width>292</width>
-            <x>75</x>
-            <name>Byte Monitor</name>
-            <y>449</y>
+            <width>96</width>
+            <x>52</x>
+            <name>Label_164</name>
+            <y>394</y>
             <foreground_color>
-              <color red="192" green="192" blue="192" />
+              <color red="0" green="0" blue="0" />
             </foreground_color>
             <actions hook="false" hook_all="false" />
             <font>
-              <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+              <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
             </font>
           </widget>
         </widget>
@@ -3293,7 +2989,7 @@ $(pv_value)</tooltip>
         <wuid>-16429ab9:1582e68df9a:-3a7c</wuid>
         <transparent>false</transparent>
         <auto_size>false</auto_size>
-        <text>STATUT</text>
+        <text>STATUS</text>
         <scripts />
         <height>32</height>
         <border_width>1</border_width>
@@ -3312,8 +3008,8 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="SubPanel" red="176" green="218" blue="249" />
         </background_color>
-        <width>739</width>
-        <x>1716</x>
+        <width>319</width>
+        <x>2136</x>
         <name>Label_15</name>
         <y>39</y>
         <foreground_color>
@@ -3362,7 +3058,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -3516,7 +3212,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -3556,7 +3252,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -3710,7 +3406,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -3750,7 +3446,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -4102,7 +3798,7 @@ $(pv_value)</tooltip>
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
@@ -4286,7 +3982,7 @@ $(pv_value)</tooltip>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
+        <precision>2</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
@@ -4295,7 +3991,7 @@ $(pv_value)</tooltip>
         <auto_size>false</auto_size>
         <text></text>
         <rotation_angle>0.0</rotation_angle>
-        <show_units>true</show_units>
+        <show_units>false</show_units>
         <height>22</height>
         <multiline_input>false</multiline_input>
         <border_width>1</border_width>
@@ -4305,7 +4001,7 @@ $(pv_value)</tooltip>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <precision_from_pv>true</precision_from_pv>
+        <precision_from_pv>false</precision_from_pv>
         <widget_type>Text Input</widget_type>
         <confirm_message></confirm_message>
         <name>Text Input_9</name>
@@ -4330,7 +4026,7 @@ $(pv_value)</tooltip>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
         <width>100</width>
-        <x>912</x>
+        <x>1122</x>
         <y>1089</y>
         <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
@@ -4480,7 +4176,7 @@ $(pv_value)</tooltip>
           <color red="255" green="255" blue="255" />
         </background_color>
         <width>181</width>
-        <x>720</x>
+        <x>936</x>
         <name>Label</name>
         <y>1090</y>
         <foreground_color>
@@ -10517,192 +10213,4 @@ $(pv_value)</tooltip>
       <fontdata fontName="Cantarell" height="26" style="1" />
     </font>
   </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.LED" version="1.0.0">
-    <alarm_pulsing>false</alarm_pulsing>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-    <rules />
-    <effect_3d>true</effect_3d>
-    <bit>0</bit>
-    <pv_value />
-    <height>20</height>
-    <border_width>0</border_width>
-    <visible>true</visible>
-    <pv_name>$(PREFIX):$(MTR).MOVN</pv_name>
-    <border_color>
-      <color name="IO Border" red="215" green="215" blue="215" />
-    </border_color>
-    <widget_type>LED</widget_type>
-    <name>LED Template_3</name>
-    <actions hook="false" hook_all="false" />
-    <show_boolean_label>true</show_boolean_label>
-    <border_style>0</border_style>
-    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-    <enabled>true</enabled>
-    <wuid>59fc39f9:158487e5950:-4cbb</wuid>
-    <on_color>
-      <color name="IO OK" red="0" green="255" blue="0" />
-    </on_color>
-    <scripts />
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <on_label></on_label>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
-      <keep_wh_ratio>true</keep_wh_ratio>
-    </scale_options>
-    <off_color>
-      <color name="IO PV OFF" red="77" green="77" blue="77" />
-    </off_color>
-    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-    <background_color>
-      <color name="IO Background" red="255" green="255" blue="205" />
-    </background_color>
-    <square_led>true</square_led>
-    <width>20</width>
-    <x>1962</x>
-    <data_type>0</data_type>
-    <y>522</y>
-    <foreground_color>
-      <color name="IO InputPV Fg" red="0" green="32" blue="92" />
-    </foreground_color>
-    <font>
-      <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-    </font>
-    <off_label></off_label>
-  </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.LED" version="1.0.0">
-    <alarm_pulsing>false</alarm_pulsing>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-    <rules />
-    <effect_3d>true</effect_3d>
-    <bit>0</bit>
-    <pv_value />
-    <height>20</height>
-    <border_width>2</border_width>
-    <visible>true</visible>
-    <pv_name>$(PREFIX):$(MTR).DMOV</pv_name>
-    <border_color>
-      <color name="IO Border" red="215" green="215" blue="215" />
-    </border_color>
-    <widget_type>LED</widget_type>
-    <name>LED Template_2</name>
-    <actions hook="false" hook_all="false" />
-    <show_boolean_label>true</show_boolean_label>
-    <border_style>0</border_style>
-    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-    <enabled>true</enabled>
-    <wuid>59fc39f9:158487e5950:-4cba</wuid>
-    <on_color>
-      <color red="0" green="255" blue="0" />
-    </on_color>
-    <scripts />
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <on_label></on_label>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
-      <keep_wh_ratio>true</keep_wh_ratio>
-    </scale_options>
-    <off_color>
-      <color red="77" green="77" blue="77" />
-    </off_color>
-    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-    <background_color>
-      <color name="IO Background" red="255" green="255" blue="205" />
-    </background_color>
-    <square_led>true</square_led>
-    <width>20</width>
-    <x>1962</x>
-    <data_type>0</data_type>
-    <y>492</y>
-    <foreground_color>
-      <color name="IO InputPV Fg" red="0" green="32" blue="92" />
-    </foreground_color>
-    <font>
-      <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-    </font>
-    <off_label></off_label>
-  </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-    <border_style>0</border_style>
-    <tooltip></tooltip>
-    <horizontal_alignment>0</horizontal_alignment>
-    <rules />
-    <enabled>false</enabled>
-    <wuid>59fc39f9:158487e5950:-4cb9</wuid>
-    <transparent>true</transparent>
-    <auto_size>false</auto_size>
-    <text>Done moving</text>
-    <scripts />
-    <height>20</height>
-    <border_width>2</border_width>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <visible>true</visible>
-    <vertical_alignment>1</vertical_alignment>
-    <border_color>
-      <color name="IO Border" red="215" green="215" blue="215" />
-    </border_color>
-    <widget_type>Label</widget_type>
-    <wrap_words>false</wrap_words>
-    <background_color>
-      <color name="IO Background" red="255" green="255" blue="205" />
-    </background_color>
-    <width>80</width>
-    <x>1758</x>
-    <name>Label Orientation_1</name>
-    <y>492</y>
-    <foreground_color>
-      <color name="IO Foreground" red="0" green="0" blue="0" />
-    </foreground_color>
-    <actions hook="false" hook_all="false" />
-    <font>
-      <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-    </font>
-  </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-    <border_style>0</border_style>
-    <tooltip></tooltip>
-    <horizontal_alignment>0</horizontal_alignment>
-    <rules />
-    <enabled>false</enabled>
-    <wuid>59fc39f9:158487e5950:-4cb8</wuid>
-    <transparent>true</transparent>
-    <auto_size>false</auto_size>
-    <text>Moving</text>
-    <scripts />
-    <height>20</height>
-    <border_width>2</border_width>
-    <scale_options>
-      <width_scalable>true</width_scalable>
-      <height_scalable>true</height_scalable>
-      <keep_wh_ratio>false</keep_wh_ratio>
-    </scale_options>
-    <visible>true</visible>
-    <vertical_alignment>1</vertical_alignment>
-    <border_color>
-      <color name="IO Border" red="215" green="215" blue="215" />
-    </border_color>
-    <widget_type>Label</widget_type>
-    <wrap_words>false</wrap_words>
-    <background_color>
-      <color name="IO Background" red="255" green="255" blue="205" />
-    </background_color>
-    <width>80</width>
-    <x>1758</x>
-    <name>Label Orientation_16</name>
-    <y>522</y>
-    <foreground_color>
-      <color name="IO Foreground" red="0" green="0" blue="0" />
-    </foreground_color>
-    <actions hook="false" hook_all="false" />
-    <font>
-      <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-    </font>
-  </widget>
 </display>
\ No newline at end of file
diff --git a/startup/EMU.cmd b/startup/EMU.cmd
index 1e7ffca3e2e1e5fa491390e88ec976f3cd414303..0190c6a708e4a62367ce1574f652591886417ed0 100644
--- a/startup/EMU.cmd
+++ b/startup/EMU.cmd
@@ -137,6 +137,9 @@ iocInit
 
 seq motorHoming "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_NAME1)"
 
+#### Simulation of a current with ES4134 from Beckoff
+seq RampCurrent "PREFIX_PS=LNS-ISRC-010:PBI-EM,CONS_PS2=HVhor-SP,DEVICE=SCAN,SCAN_SLIT=$(SCAN_SLIT)"
+
 
 # SET INTERFACE FROM IFCDAQ TO Allison scanner
 # Forward link wf record to Detector guard
@@ -205,7 +208,3 @@ dbpf SCAN:PROC-AngleMin-SP -80
 dbpf $(SCANPREFIX):$(SCAN_EF).NPTS 11
 dbpf $(SCANPREFIX):$(SCAN_EF).PDLY 0.5
 
-
-
-seq RampCurrent "PREFIX_PS=LNS-ISRC-010:PBI-EM,CONS_PS2=HVhor-SP,DEVICE=SCAN,SCAN_SLIT=$(SCAN_SLIT)"
-