diff --git a/ecmcEL2808_v01.bob b/ecmcEL2808_v01.bob
new file mode 100644
index 0000000000000000000000000000000000000000..9d5c088012933e635c03bcd14afd2d2e07a877f2
--- /dev/null
+++ b/ecmcEL2808_v01.bob
@@ -0,0 +1,584 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>EL2808</name>
+  <width>230</width>
+  <height>410</height>
+  <background_color>
+    <color red="240" green="240" blue="240">
+    </color>
+  </background_color>
+  <actions>
+  </actions>
+  <widget type="group" version="2.0.0">
+    <name>MGGrey03</name>
+    <width>230</width>
+    <height>410</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>MGGrey03-background</name>
+      <width>230</width>
+      <height>410</height>
+      <line_width>2</line_width>
+      <line_color>
+        <color name="GROUP-BORDER" red="150" green="155" blue="151">
+        </color>
+      </line_color>
+      <background_color>
+        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+        </color>
+      </background_color>
+      <corner_width>10</corner_width>
+      <corner_height>10</corner_height>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>MGGrey03-title_1</name>
+      <text>$(TYPE)</text>
+      <width>230</width>
+      <height>40</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="GROUP-TEXT" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_1</name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO01-RB</pv_name>
+      <x>190</x>
+      <y>100</y>
+      <off_color>
+        <color red="0" green="100" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color red="0" green="255" blue="0">
+        </color>
+      </on_color>
+      <foreground_color>
+        <color red="192" green="192" blue="192">
+        </color>
+      </foreground_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_2</name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO02-RB</pv_name>
+      <x>190</x>
+      <y>130</y>
+      <off_color>
+        <color red="0" green="100" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color red="0" green="255" blue="0">
+        </color>
+      </on_color>
+      <foreground_color>
+        <color red="192" green="192" blue="192">
+        </color>
+      </foreground_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_3</name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO03-RB</pv_name>
+      <x>190</x>
+      <y>160</y>
+      <off_color>
+        <color red="0" green="100" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color red="0" green="255" blue="0">
+        </color>
+      </on_color>
+      <foreground_color>
+        <color red="192" green="192" blue="192">
+        </color>
+      </foreground_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_4</name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO04-RB</pv_name>
+      <x>190</x>
+      <y>190</y>
+      <off_color>
+        <color red="0" green="100" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color red="0" green="255" blue="0">
+        </color>
+      </on_color>
+      <foreground_color>
+        <color red="192" green="192" blue="192">
+        </color>
+      </foreground_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_5</name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO05-RB</pv_name>
+      <x>190</x>
+      <y>220</y>
+      <off_color>
+        <color red="0" green="100" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color red="0" green="255" blue="0">
+        </color>
+      </on_color>
+      <foreground_color>
+        <color red="192" green="192" blue="192">
+        </color>
+      </foreground_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_6</name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO06-RB</pv_name>
+      <x>190</x>
+      <y>250</y>
+      <off_color>
+        <color red="0" green="100" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color red="0" green="255" blue="0">
+        </color>
+      </on_color>
+      <foreground_color>
+        <color red="192" green="192" blue="192">
+        </color>
+      </foreground_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_7</name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO07-RB</pv_name>
+      <x>190</x>
+      <y>280</y>
+      <off_color>
+        <color red="0" green="100" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color red="0" green="255" blue="0">
+        </color>
+      </on_color>
+      <foreground_color>
+        <color red="192" green="192" blue="192">
+        </color>
+      </foreground_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="led" version="2.0.0">
+      <name>LED_8</name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO08-RB</pv_name>
+      <x>190</x>
+      <y>310</y>
+      <off_color>
+        <color red="0" green="100" blue="0">
+        </color>
+      </off_color>
+      <on_color>
+        <color red="0" green="255" blue="0">
+        </color>
+      </on_color>
+      <foreground_color>
+        <color red="192" green="192" blue="192">
+        </color>
+      </foreground_color>
+      <actions>
+      </actions>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Text Update_1</name>
+      <text>$(SLAVE_POS)</text>
+      <x>130</x>
+      <y>60</y>
+      <width>80</width>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+      <transparent>false</transparent>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_18</name>
+      <text>Slave Position:</text>
+      <x>20</x>
+      <y>60</y>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <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>Image Boolean Button_6</name>
+      <actions>
+        <action type="open_display">
+          <file>ecmcDiagEcSlave_v01.bob</file>
+          <target>tab</target>
+        </action>
+      </actions>
+      <text>Diagnostics</text>
+      <x>20</x>
+      <y>350</y>
+      <width>190</width>
+      <height>40</height>
+      <tooltip>$(pv_value)</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_19</name>
+      <text>Output 1:</text>
+      <x>10</x>
+      <y>100</y>
+      <width>80</width>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <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_20</name>
+      <text>Output 2:</text>
+      <x>10</x>
+      <y>130</y>
+      <width>80</width>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <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_21</name>
+      <text>Output 3:</text>
+      <x>10</x>
+      <y>160</y>
+      <width>80</width>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <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_22</name>
+      <text>Output 4:</text>
+      <x>10</x>
+      <y>190</y>
+      <width>80</width>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <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_23</name>
+      <text>Output 5:</text>
+      <x>10</x>
+      <y>220</y>
+      <width>80</width>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <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_24</name>
+      <text>Output 6:</text>
+      <x>10</x>
+      <y>250</y>
+      <width>80</width>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <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_25</name>
+      <text>Output 7:</text>
+      <x>10</x>
+      <y>280</y>
+      <width>80</width>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <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_26</name>
+      <text>Output 8:</text>
+      <x>10</x>
+      <y>310</y>
+      <width>80</width>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <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_16</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+        </action>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>0</value>
+        </action>
+      </actions>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO01</pv_name>
+      <text>Write</text>
+      <x>100</x>
+      <y>100</y>
+      <width>80</width>
+      <height>20</height>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_17</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+        </action>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>0</value>
+        </action>
+      </actions>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO02</pv_name>
+      <text>Write</text>
+      <x>100</x>
+      <y>130</y>
+      <width>80</width>
+      <height>20</height>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_18</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+        </action>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>0</value>
+        </action>
+      </actions>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO03</pv_name>
+      <text>Write</text>
+      <x>100</x>
+      <y>160</y>
+      <width>80</width>
+      <height>20</height>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_19</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+        </action>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>0</value>
+        </action>
+      </actions>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO04</pv_name>
+      <text>Write</text>
+      <x>100</x>
+      <y>190</y>
+      <width>80</width>
+      <height>20</height>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_20</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+        </action>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>0</value>
+        </action>
+      </actions>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO05</pv_name>
+      <text>Write</text>
+      <x>100</x>
+      <y>220</y>
+      <width>80</width>
+      <height>20</height>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_21</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+        </action>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>0</value>
+        </action>
+      </actions>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO06</pv_name>
+      <text>Write</text>
+      <x>100</x>
+      <y>250</y>
+      <width>80</width>
+      <height>20</height>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_22</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+        </action>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>0</value>
+        </action>
+      </actions>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO07</pv_name>
+      <text>Write</text>
+      <x>100</x>
+      <y>280</y>
+      <width>80</width>
+      <height>20</height>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button_23</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>1</value>
+        </action>
+        <action type="write_pv">
+          <pv_name>$(pv_name)</pv_name>
+          <value>0</value>
+        </action>
+      </actions>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-BO08</pv_name>
+      <text>Write</text>
+      <x>100</x>
+      <y>310</y>
+      <width>80</width>
+      <height>20</height>
+    </widget>
+  </widget>
+</display>
diff --git a/ecmcEL5101_v01.bob b/ecmcEL5101_v01.bob
index dee44bab8e236ac4dab169d28bd25d8967f573d7..3b512b4371370a351d87e6007407e875ad868146 100644
--- a/ecmcEL5101_v01.bob
+++ b/ecmcEL5101_v01.bob
@@ -113,7 +113,7 @@ $(pv_value)</tooltip>
     <widget type="label" version="2.0.0">
       <name>Label_18</name>
       <class>HEADER3</class>
-      <text use_class="true">&lt;header-3&gt;</text>
+      <text>Encoder</text>
       <x>20</x>
       <y>110</y>
       <width>460</width>
@@ -129,26 +129,25 @@ $(pv_value)</tooltip>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
-    <widget type="bool_button" version="2.0.0">
+    <widget type="action_button" version="3.0.0">
       <name>Image Boolean Button_5</name>
-      <bit>-1</bit>
-      <x>20</x>
-      <y>690</y>
-      <width>460</width>
-      <height>40</height>
-      <off_label>Diagnostics</off_label>
-      <on_label>Diagnostics</on_label>
-      <show_led>false</show_led>
       <actions>
         <action type="open_display">
           <file>ecmcDiagEcSlave_v01.bob</file>
           <target>tab</target>
         </action>
       </actions>
+      <text>Diagnostics</text>
+      <x>20</x>
+      <y>690</y>
+      <width>460</width>
+      <height>40</height>
+      <tooltip>$(pv_name)
+$(pv_value)</tooltip>
     </widget>
     <widget type="byte_monitor" version="2.0.0">
       <name>Byte Monitor</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Enc-Cmd</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Enc01-Cmd</pv_name>
       <x>50</x>
       <y>160</y>
       <width>172</width>
@@ -163,12 +162,18 @@ $(pv_value)</tooltip>
         <color red="0" green="255" blue="0">
         </color>
       </on_color>
+      <labels>
+        <text>0: Enable Latch C</text>
+        <text>1: Enable latch extern pos</text>
+        <text>2: Set Counter</text>
+        <text>3: Enable latch extern neg</text>
+      </labels>
       <actions>
       </actions>
     </widget>
     <widget type="byte_monitor" version="2.0.0">
       <name>Byte Monitor</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Enc-Stat</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Enc01-Stat</pv_name>
       <x>270</x>
       <y>160</y>
       <width>187</width>
@@ -184,6 +189,22 @@ $(pv_value)</tooltip>
         <color red="0" green="255" blue="0">
         </color>
       </on_color>
+      <labels>
+        <text>0: Latch C valid</text>
+        <text>1: Latch extern valid</text>
+        <text>2: Set counter done</text>
+        <text>3: Counter underflow</text>
+        <text>4: Counter overflow</text>
+        <text>5: Status of input status</text>
+        <text>6: Open circuit</text>
+        <text>7: Extrapolation stall</text>
+        <text>8: Status input A</text>
+        <text>9: Status input B</text>
+        <text>A: Status input C</text>
+        <text>B: Status input gate</text>
+        <text>C: Status input latch</text>
+        <text>D: Sync error</text>
+      </labels>
       <actions>
       </actions>
     </widget>
@@ -212,7 +233,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text_3</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Enc-Cmd-RB</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Enc01-Cmd-RB</pv_name>
       <x>310</x>
       <y>510</y>
       <width>140</width>
@@ -231,7 +252,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text_3</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Enc-Cmd</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Enc01-Cmd</pv_name>
       <x>160</x>
       <y>510</y>
       <width>140</width>
@@ -273,7 +294,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text_3</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Enc-Stat</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Enc01-Stat</pv_name>
       <x>310</x>
       <y>538</y>
       <width>140</width>
@@ -315,7 +336,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text_3</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Enc-PosCmd</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Enc01-PosCmd</pv_name>
       <x>160</x>
       <y>566</y>
       <width>140</width>
@@ -334,7 +355,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text_3</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Enc-PosCmd-RB</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Enc01-PosCmd-RB</pv_name>
       <x>310</x>
       <y>566</y>
       <width>140</width>
@@ -376,7 +397,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text_3</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Enc-PosAct</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Enc01-PosAct</pv_name>
       <x>310</x>
       <y>594</y>
       <width>140</width>
@@ -418,7 +439,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text_3</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Enc-Latch-PosAct</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Enc01-LtchPosAct</pv_name>
       <x>310</x>
       <y>622</y>
       <width>140</width>
diff --git a/ecmcEL7037_v01.bob b/ecmcEL7037_v01.bob
index 263c1c6fc22831d128e692103c6e6c1ca437e0c4..131150da3071d528bd4078a4b9928898afc08a17 100644
--- a/ecmcEL7037_v01.bob
+++ b/ecmcEL7037_v01.bob
@@ -131,7 +131,7 @@ $(pv_value)</tooltip>
     <widget type="label" version="2.0.0">
       <name>Label_18</name>
       <class>HEADER3</class>
-      <text use_class="true">&lt;header-3&gt;</text>
+      <text>Stepper</text>
       <x>20</x>
       <y>110</y>
       <width>460</width>
@@ -173,7 +173,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text_4</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Drv-Cmd-RB</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Drv01-Cmd-RB</pv_name>
       <x>310</x>
       <y>510</y>
       <width>140</width>
@@ -192,7 +192,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text_5</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Drv-Cmd</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Drv01-Cmd</pv_name>
       <x>160</x>
       <y>510</y>
       <width>140</width>
@@ -235,7 +235,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text_6</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Drv-Stat</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Drv01-Stat</pv_name>
       <x>310</x>
       <y>538</y>
       <width>140</width>
@@ -276,26 +276,25 @@ $(pv_value)</tooltip>
         </color>
       </border_color>
     </widget>
-    <widget type="bool_button" version="2.0.0">
+    <widget type="action_button" version="3.0.0">
       <name>Image Boolean Button_5</name>
-      <bit>-1</bit>
-      <x>20</x>
-      <y>630</y>
-      <width>770</width>
-      <height>40</height>
-      <off_label>Diagnostics</off_label>
-      <on_label>Diagnostics</on_label>
-      <show_led>false</show_led>
       <actions>
         <action type="open_display">
           <file>ecmcDiagEcSlave_v01.bob</file>
           <target>tab</target>
         </action>
       </actions>
+      <text>Diagnostics</text>
+      <x>20</x>
+      <y>630</y>
+      <width>770</width>
+      <height>40</height>
+      <tooltip>$(pv_name)
+$(pv_value)</tooltip>
     </widget>
     <widget type="byte_monitor" version="2.0.0">
       <name>Byte Monitor</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Enc-Stat</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Enc01-Stat</pv_name>
       <x>550</x>
       <y>160</y>
       <width>180</width>
@@ -311,12 +310,30 @@ $(pv_value)</tooltip>
         <color red="0" green="255" blue="0">
         </color>
       </on_color>
+      <labels>
+        <text>0: Latch C valid</text>
+        <text>1: Latch extern valid</text>
+        <text>2: Set counter done</text>
+        <text>3: Counter underflow</text>
+        <text>4: Counter overflow</text>
+        <text></text>
+        <text></text>
+        <text>7: Extrapolation stall</text>
+        <text>8: Status input A</text>
+        <text>9: Status input B</text>
+        <text>A: Status input C</text>
+        <text></text>
+        <text>C: Status input latch</text>
+        <text>D: Sync error</text>
+        <text></text>
+        <text></text>
+      </labels>
       <actions>
       </actions>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text_13</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Enc-Stat</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Enc01-Stat</pv_name>
       <x>630</x>
       <y>510</y>
       <width>140</width>
@@ -335,7 +352,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text_16</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Enc-PosAct</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Enc01-PosAct</pv_name>
       <x>630</x>
       <y>540</y>
       <width>140</width>
@@ -354,7 +371,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text_17</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Enc-Latch-PosAct</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Enc01-LtchPosAct</pv_name>
       <x>630</x>
       <y>570</y>
       <width>140</width>
@@ -443,7 +460,7 @@ $(pv_value)</tooltip>
     <widget type="label" version="2.0.0">
       <name>Label_24</name>
       <class>HEADER3</class>
-      <text use_class="true">&lt;header-3&gt;</text>
+      <text>Encoder</text>
       <x>500</x>
       <y>110</y>
       <width>290</width>
@@ -461,7 +478,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text_23</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Drv-Spd</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Drv01-Spd</pv_name>
       <x>160</x>
       <y>566</y>
       <width>140</width>
@@ -480,7 +497,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text_24</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Drv-Spd-RB</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Drv01-Spd-RB</pv_name>
       <x>310</x>
       <y>566</y>
       <width>140</width>
@@ -499,7 +516,7 @@ $(pv_value)</tooltip>
     </widget>
     <widget type="byte_monitor" version="2.0.0">
       <name>Byte Monitor</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Drv-Cmd-RB</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Drv01-Cmd-RB</pv_name>
       <x>60</x>
       <y>160</y>
       <width>138</width>
@@ -515,12 +532,30 @@ $(pv_value)</tooltip>
         <color red="0" green="255" blue="0">
         </color>
       </on_color>
+      <labels>
+        <text>0: Enable</text>
+        <text>1: Reset</text>
+        <text>2: Reduce torque</text>
+        <text></text>
+        <text></text>
+        <text></text>
+        <text></text>
+        <text></text>
+        <text></text>
+        <text></text>
+        <text></text>
+        <text></text>
+        <text>C: Output 1</text>
+        <text></text>
+        <text></text>
+        <text></text>
+      </labels>
       <actions>
       </actions>
     </widget>
     <widget type="byte_monitor" version="2.0.0">
       <name>Byte Monitor</name>
-      <pv_name>$(P)ec$(MASTER_ID)-s$(SLAVE_POS)-$(TYPE)-Drv-Stat</pv_name>
+      <pv_name>$(P)m$(MASTER_ID)s$(SLAVE_POS)-Drv01-Stat</pv_name>
       <x>280</x>
       <y>160</y>
       <width>157</width>
@@ -536,6 +571,24 @@ $(pv_value)</tooltip>
         <color red="0" green="255" blue="0">
         </color>
       </on_color>
+      <labels>
+        <text>0: Ready to enable</text>
+        <text>1: Ready</text>
+        <text>2: Warning</text>
+        <text>3: Error</text>
+        <text>4: Moving positive</text>
+        <text>5: Moving Negative</text>
+        <text>6: Torque reduced</text>
+        <text>7: Motor stall</text>
+        <text></text>
+        <text></text>
+        <text></text>
+        <text>B: Digital input 1</text>
+        <text>C: Digital input 2</text>
+        <text>D: Sync error</text>
+        <text>E: TxPDO toggle</text>
+        <text></text>
+      </labels>
       <actions>
       </actions>
     </widget>