diff --git a/qt/ecmc_plugin_safety_main.ui b/qt/ecmc_plugin_safety_main.ui
index eaf5199..94e3009 100644
--- a/qt/ecmc_plugin_safety_main.ui
+++ b/qt/ecmc_plugin_safety_main.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>315</width>
+    <height>123</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,53 +16,130 @@
   <widget class="caLed" name="caled">
    <property name="geometry">
     <rect>
-     <x>100</x>
-     <y>80</y>
+     <x>20</x>
+     <y>20</y>
      <width>30</width>
      <height>30</height>
     </rect>
    </property>
    <property name="channel" stdset="0">
-    <string notr="true">$(IOC):SS1$(SAFETY_GROUP)-AxsStndStllAct</string>
+    <string notr="true">$(IOC):SS1-$(SAFETY_GRP)-AxsStndStllAct</string>
+   </property>
+   <property name="falseColor">
+    <color>
+     <red>255</red>
+     <green>0</green>
+     <blue>0</blue>
+    </color>
+   </property>
+   <property name="trueColor">
+    <color>
+     <red>0</red>
+     <green>85</green>
+     <blue>0</blue>
+    </color>
    </property>
   </widget>
   <widget class="caLabel" name="calabel_4">
    <property name="geometry">
     <rect>
-     <x>140</x>
-     <y>80</y>
-     <width>116</width>
-     <height>28</height>
+     <x>55</x>
+     <y>22</y>
+     <width>251</width>
+     <height>26</height>
     </rect>
    </property>
    <property name="text">
     <string>Axis at rest</string>
    </property>
+   <property name="alignment">
+    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+   </property>
   </widget>
   <widget class="caLabel" name="calabel_5">
    <property name="geometry">
     <rect>
-     <x>140</x>
-     <y>115</y>
-     <width>206</width>
+     <x>55</x>
+     <y>50</y>
+     <width>246</width>
      <height>28</height>
     </rect>
    </property>
    <property name="text">
-    <string>Rampdown cmd active</string>
+    <string>Rampdown cmd active (E-STOP)</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
    </property>
   </widget>
   <widget class="caLed" name="caled_2">
    <property name="geometry">
     <rect>
-     <x>100</x>
-     <y>115</y>
+     <x>20</x>
+     <y>45</y>
      <width>30</width>
      <height>30</height>
     </rect>
    </property>
    <property name="channel" stdset="0">
-    <string notr="true">$(IOC):SS1$(SAFETY_GROUP)-RmpDwnCmdAct</string>
+    <string notr="true">$(IOC):SS1-$(SAFETY_GRP)-RmpDwnCmdAct</string>
+   </property>
+   <property name="falseColor">
+    <color>
+     <red>0</red>
+     <green>85</green>
+     <blue>0</blue>
+    </color>
+   </property>
+   <property name="trueColor">
+    <color>
+     <red>255</red>
+     <green>0</green>
+     <blue>0</blue>
+    </color>
+   </property>
+  </widget>
+  <widget class="caLabel" name="calabel_6">
+   <property name="geometry">
+    <rect>
+     <x>55</x>
+     <y>80</y>
+     <width>206</width>
+     <height>28</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Reduced velo cmd active</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+   </property>
+  </widget>
+  <widget class="caLed" name="caled_3">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>75</y>
+     <width>30</width>
+     <height>30</height>
+    </rect>
+   </property>
+   <property name="channel" stdset="0">
+    <string notr="true">$(IOC):SS1-$(SAFETY_GRP)-RedVeloCmdAct</string>
+   </property>
+   <property name="falseColor">
+    <color>
+     <red>0</red>
+     <green>85</green>
+     <blue>0</blue>
+    </color>
+   </property>
+   <property name="trueColor">
+    <color>
+     <red>255</red>
+     <green>0</green>
+     <blue>0</blue>
+    </color>
    </property>
   </widget>
  </widget>
diff --git a/qt/test_plugin.ui b/qt/sim_motion_safety_box.ui
similarity index 78%
rename from qt/test_plugin.ui
rename to qt/sim_motion_safety_box.ui
index 33f6578..9a551fb 100644
--- a/qt/test_plugin.ui
+++ b/qt/sim_motion_safety_box.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>525</width>
+    <width>364</width>
     <height>312</height>
    </rect>
   </property>
@@ -16,8 +16,8 @@
   <widget class="caByteController" name="cabytecontroller">
    <property name="geometry">
     <rect>
-     <x>120</x>
-     <y>70</y>
+     <x>55</x>
+     <y>40</y>
      <width>41</width>
      <height>151</height>
     </rect>
@@ -32,10 +32,10 @@
   <widget class="caByte" name="cabyte">
    <property name="geometry">
     <rect>
-     <x>120</x>
-     <y>235</y>
-     <width>56</width>
-     <height>51</height>
+     <x>55</x>
+     <y>205</y>
+     <width>41</width>
+     <height>71</height>
     </rect>
    </property>
    <property name="channel" stdset="0">
@@ -48,47 +48,56 @@
   <widget class="caLabel" name="calabel">
    <property name="geometry">
     <rect>
-     <x>160</x>
-     <y>100</y>
-     <width>90</width>
+     <x>125</x>
+     <y>70</y>
+     <width>171</width>
      <height>28</height>
     </rect>
    </property>
    <property name="text">
-    <string>E-Stop</string>
+    <string>E-Stop command</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
    </property>
   </widget>
   <widget class="caLabel" name="calabel_2">
    <property name="geometry">
     <rect>
-     <x>170</x>
-     <y>170</y>
-     <width>121</width>
+     <x>125</x>
+     <y>140</y>
+     <width>186</width>
      <height>28</height>
     </rect>
    </property>
    <property name="text">
-    <string>Reduce velo</string>
+    <string>Reduce velo command</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
    </property>
   </widget>
   <widget class="caLabel" name="calabel_3">
    <property name="geometry">
     <rect>
-     <x>170</x>
-     <y>245</y>
-     <width>116</width>
+     <x>125</x>
+     <y>225</y>
+     <width>161</width>
      <height>28</height>
     </rect>
    </property>
    <property name="text">
-    <string>Axis at rest</string>
+    <string>Axis at rest status</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
    </property>
   </widget>
   <widget class="caTextEntry" name="catextentry">
    <property name="geometry">
     <rect>
-     <x>405</x>
-     <y>255</y>
+     <x>170</x>
+     <y>280</y>
      <width>100</width>
      <height>22</height>
     </rect>
@@ -100,9 +109,9 @@
   <widget class="caLabel" name="calabel_4">
    <property name="geometry">
     <rect>
-     <x>20</x>
-     <y>30</y>
-     <width>426</width>
+     <x>30</x>
+     <y>10</y>
+     <width>301</width>
      <height>28</height>
     </rect>
    </property>