Index: simulator/plugins/treatmentstates/interface.ui
===================================================================
diff -u -r8bfab5e4d1dd4e3bc638f28e77b4811218b84c39 -rae63fbc76b4638ffdcdaad7b69648beeee3340c3
--- simulator/plugins/treatmentstates/interface.ui	(.../interface.ui)	(revision 8bfab5e4d1dd4e3bc638f28e77b4811218b84c39)
+++ simulator/plugins/treatmentstates/interface.ui	(.../interface.ui)	(revision ae63fbc76b4638ffdcdaad7b69648beeee3340c3)
@@ -7,40 +7,27 @@
     <x>0</x>
     <y>0</y>
     <width>526</width>
-    <height>618</height>
+    <height>638</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>&amp;Treatment/&amp;Treatment States</string>
+   <string>&amp;1 States/&amp;3 Treatment States</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-      </font>
+   <item row="2" column="1">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
      </property>
-     <property name="styleSheet">
-      <string notr="true">background-color: rgb(245, 121, 0);
-color: rgb(238, 238, 236);</string>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>3</height>
+      </size>
      </property>
-     <property name="text">
-      <string>Treatment States</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
+    </spacer>
    </item>
-   <item row="0" column="1">
-    <widget class="QToolButton" name="tbReset">
-     <property name="text">
-      <string>reset</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2">
+   <item row="1" column="0" colspan="6">
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0" rowspan="2">
       <widget class="QTableWidget" name="tblSubMode">
@@ -133,7 +120,7 @@
        </row>
        <column>
         <property name="text">
-         <string>Treatment States (subMode)</string>
+         <string>0 : Treatment States (subMode)</string>
         </property>
        </column>
        <item row="0" column="0">
@@ -229,7 +216,7 @@
        </row>
        <column>
         <property name="text">
-         <string>Blood Prime States</string>
+         <string>7 : Blood Prime States</string>
         </property>
        </column>
        <item row="0" column="0">
@@ -300,19 +287,9 @@
          <string>2</string>
         </property>
        </row>
-       <row>
-        <property name="text">
-         <string>3</string>
-        </property>
-       </row>
-       <row>
-        <property name="text">
-         <string>4</string>
-        </property>
-       </row>
        <column>
         <property name="text">
-         <string>UF States</string>
+         <string>1 : UF States</string>
         </property>
        </column>
        <item row="0" column="0">
@@ -330,16 +307,6 @@
          <string>UF_RUNNING_STATE</string>
         </property>
        </item>
-       <item row="3" column="0">
-        <property name="text">
-         <string>UF_OFF_STATE</string>
-        </property>
-       </item>
-       <item row="4" column="0">
-        <property name="text">
-         <string>UF_COMPLETED_STATE</string>
-        </property>
-       </item>
       </widget>
      </item>
      <item row="2" column="0">
@@ -407,7 +374,7 @@
        </row>
        <column>
         <property name="text">
-         <string>Saline States</string>
+         <string>2 : Saline States</string>
         </property>
        </column>
        <item row="0" column="0">
@@ -440,7 +407,7 @@
        <property name="minimumSize">
         <size>
          <width>225</width>
-         <height>155</height>
+         <height>175</height>
         </size>
        </property>
        <property name="font">
@@ -508,9 +475,14 @@
          <string>5</string>
         </property>
        </row>
+       <row>
+        <property name="text">
+         <string>6</string>
+        </property>
+       </row>
        <column>
         <property name="text">
-         <string>Heparin States</string>
+         <string>3 : Heparin States</string>
         </property>
        </column>
        <item row="0" column="0">
@@ -523,26 +495,31 @@
        </item>
        <item row="1" column="0">
         <property name="text">
-         <string>HEPARIN_STATE_PAUSED</string>
+         <string>HEPARIN_STATE_STOPPED</string>
         </property>
        </item>
        <item row="2" column="0">
         <property name="text">
-         <string>HEPARIN_STATE_INITIAL_BOLUS</string>
+         <string>HEPARIN_STATE_PAUSED</string>
         </property>
        </item>
        <item row="3" column="0">
         <property name="text">
-         <string>HEPARIN_STATE_DISPENSING</string>
+         <string>HEPARIN_STATE_INITIAL_BOLUS</string>
         </property>
        </item>
        <item row="4" column="0">
         <property name="text">
-         <string>HEPARIN_STATE_COMPLETED</string>
+         <string>HEPARIN_STATE_DISPENSING</string>
         </property>
        </item>
        <item row="5" column="0">
         <property name="text">
+         <string>HEPARIN_STATE_COMPLETED</string>
+        </property>
+       </item>
+       <item row="6" column="0">
+        <property name="text">
          <string>HEPARIN_STATE_EMPTY</string>
         </property>
        </item>
@@ -618,7 +595,7 @@
        </row>
        <column>
         <property name="text">
-         <string>Rinseback States</string>
+         <string>4 : Rinseback States</string>
         </property>
        </column>
        <item row="0" column="0">
@@ -706,7 +683,7 @@
        </row>
        <column>
         <property name="text">
-         <string>Recirculate States</string>
+         <string>5 : Recirculate States</string>
         </property>
        </column>
        <item row="0" column="0">
@@ -785,7 +762,7 @@
        </row>
        <column>
         <property name="text">
-         <string>Treatment End States</string>
+         <string>8 : Treatment End States</string>
         </property>
        </column>
        <item row="0" column="0">
@@ -864,7 +841,7 @@
        </row>
        <column>
         <property name="text">
-         <string>Treatment Stop States</string>
+         <string>9 : Treatment Stop States</string>
         </property>
        </column>
        <item row="0" column="0">
@@ -884,21 +861,54 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+   <item row="0" column="5">
+    <widget class="QToolButton" name="tbReset">
+     <property name="text">
+      <string>reset</string>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>3</height>
-      </size>
+    </widget>
+   </item>
+   <item row="0" column="4">
+    <widget class="QToolButton" name="tbSend">
+     <property name="text">
+      <string>send</string>
      </property>
-    </spacer>
+    </widget>
    </item>
+   <item row="0" column="0" colspan="4">
+    <widget class="QLabel" name="label">
+     <property name="font">
+      <font>
+       <pointsize>10</pointsize>
+      </font>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background-color: rgb(245, 121, 0);
+color: rgb(238, 238, 236);</string>
+     </property>
+     <property name="text">
+      <string>15 : [0x0F00] : Treatment States</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>tbSend</tabstop>
+  <tabstop>tbReset</tabstop>
+  <tabstop>tblSubMode</tabstop>
+  <tabstop>tblBloodPrimeStates</tabstop>
+  <tabstop>tblUFStates</tabstop>
+  <tabstop>tblSalineStates</tabstop>
+  <tabstop>tblHeparinStates</tabstop>
+  <tabstop>tblRinsebackStates</tabstop>
+  <tabstop>tblRecirculateStates</tabstop>
+  <tabstop>tblTreatmentEndStates</tabstop>
+  <tabstop>tblTreatmentStopStates</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>