Index: TD_TreatmentStates/interface.ui
===================================================================
diff -u -r767c7999a57c41783d0269ec5ba296caf5278295 -re4825b7c7360ad8bb7e32713ea25c93ff9b08ada
--- TD_TreatmentStates/interface.ui	(.../interface.ui)	(revision 767c7999a57c41783d0269ec5ba296caf5278295)
+++ TD_TreatmentStates/interface.ui	(.../interface.ui)	(revision e4825b7c7360ad8bb7e32713ea25c93ff9b08ada)
@@ -6,64 +6,74 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>721</width>
-    <height>889</height>
+    <width>628</width>
+    <height>772</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>&amp;1 States/&amp;3 Treatment</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout">
+  <layout class="QHBoxLayout" name="horizontalLayout_2">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
      <item>
-      <widget class="QLabel" name="label_41">
-       <property name="font">
-        <font>
-         <pointsize>10</pointsize>
-        </font>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">color: rgb(238, 238, 236);
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QLabel" name="label_41">
+         <property name="font">
+          <font>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">color: rgb(238, 238, 236);
 background-color:rgb(55, 179, 119)</string>
-       </property>
-       <property name="text">
-        <string>Treatment Mode Data</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
+         </property>
+         <property name="text">
+          <string>0x3C: Treatment Mode Data</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="tbSend">
+         <property name="text">
+          <string>send</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="tbReset">
+         <property name="text">
+          <string>reset</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="QToolButton" name="tbSend">
-       <property name="text">
-        <string>send</string>
+      <widget class="QTableWidget" name="tblSubMode">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="tbReset">
-       <property name="text">
-        <string>reset</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="1" rowspan="2">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
-     <item>
-      <widget class="QTableWidget" name="tblRinsebackStates">
        <property name="minimumSize">
         <size>
-         <width>275</width>
-         <height>130</height>
+         <width>300</width>
+         <height>240</height>
         </size>
        </property>
        <property name="font">
         <font>
          <pointsize>8</pointsize>
+         <bold>false</bold>
         </font>
        </property>
        <property name="verticalScrollBarPolicy">
@@ -84,6 +94,9 @@
        <property name="selectionBehavior">
         <enum>QAbstractItemView::SelectRows</enum>
        </property>
+       <property name="showGrid">
+        <bool>true</bool>
+       </property>
        <property name="wordWrap">
         <bool>false</bool>
        </property>
@@ -93,6 +106,12 @@
        <attribute name="horizontalHeaderDefaultSectionSize">
         <number>260</number>
        </attribute>
+       <attribute name="horizontalHeaderHighlightSections">
+        <bool>true</bool>
+       </attribute>
+       <attribute name="verticalHeaderMinimumSectionSize">
+        <number>18</number>
+       </attribute>
        <attribute name="verticalHeaderDefaultSectionSize">
         <number>21</number>
        </attribute>
@@ -121,49 +140,108 @@
          <string>4</string>
         </property>
        </row>
+       <row>
+        <property name="text">
+         <string>5</string>
+        </property>
+       </row>
+       <row>
+        <property name="text">
+         <string>6</string>
+        </property>
+       </row>
+       <row>
+        <property name="text">
+         <string>7</string>
+        </property>
+       </row>
+       <row>
+        <property name="text">
+         <string>8</string>
+        </property>
+       </row>
+       <row>
+        <property name="text">
+         <string>9</string>
+        </property>
+       </row>
        <column>
         <property name="text">
-         <string>5 : Rinseback States</string>
+         <string>0 : Treatment States (subMode)</string>
         </property>
        </column>
        <item row="0" column="0">
         <property name="text">
-         <string>RINSEBACK_STOP_INIT_STATE</string>
+         <string>TREATMENT_START_STATE</string>
         </property>
-        <property name="flags">
-         <set>ItemIsSelectable|ItemIsEnabled</set>
-        </property>
        </item>
        <item row="1" column="0">
         <property name="text">
-         <string>RINSEBACK_RUN_STATE</string>
+         <string>TREATMENT_BLOOD_PRIME_STATE</string>
         </property>
        </item>
        <item row="2" column="0">
         <property name="text">
-         <string>RINSEBACK_PAUSED_STATE</string>
+         <string>TREATMENT_DIALYSIS_STATE</string>
         </property>
        </item>
        <item row="3" column="0">
         <property name="text">
-         <string>RINSEBACK_STOP_STATE</string>
+         <string>TREATMENT_PAUSED_STATE</string>
         </property>
        </item>
        <item row="4" column="0">
         <property name="text">
-         <string>RINSEBACK_RUN_ADDITIONAL_STATE</string>
+         <string>TREATMENT_RINSEBACK_STATE</string>
         </property>
        </item>
+       <item row="5" column="0">
+        <property name="text">
+         <string>TREATMENT_RECIRC_STATE</string>
+        </property>
+       </item>
+       <item row="6" column="0">
+        <property name="text">
+         <string>TREATMENT_END_STATE</string>
+        </property>
+       </item>
+       <item row="7" column="0">
+        <property name="text">
+         <string>TREATMENT_ISO_UF_STATE</string>
+        </property>
+       </item>
+       <item row="8" column="0">
+        <property name="text">
+         <string>TREATMENT_SALINE_STATE</string>
+        </property>
+       </item>
+       <item row="9" column="0">
+        <property name="text">
+         <string>TREATMENT_DIALYSIS_PAUSED_STATE</string>
+        </property>
+       </item>
       </widget>
      </item>
      <item>
-      <widget class="QTableWidget" name="tblRecirculateStates">
+      <widget class="QTableWidget" name="tblBloodPrimeStates">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="minimumSize">
         <size>
-         <width>300</width>
+         <width>250</width>
          <height>110</height>
         </size>
        </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>16777215</height>
+        </size>
+       </property>
        <property name="font">
         <font>
          <pointsize>8</pointsize>
@@ -194,7 +272,7 @@
         <bool>true</bool>
        </attribute>
        <attribute name="horizontalHeaderDefaultSectionSize">
-        <number>275</number>
+        <number>210</number>
        </attribute>
        <attribute name="verticalHeaderDefaultSectionSize">
         <number>21</number>
@@ -221,46 +299,52 @@
        </row>
        <column>
         <property name="text">
-         <string>6 : Recirculate States</string>
+         <string>1 : Blood Prime States</string>
         </property>
        </column>
        <item row="0" column="0">
         <property name="text">
-         <string>TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE</string>
+         <string>BLOOD_PRIME_RAMP_STATE</string>
         </property>
+        <property name="flags">
+         <set>ItemIsSelectable|ItemIsEnabled</set>
+        </property>
        </item>
        <item row="1" column="0">
         <property name="text">
-         <string>TREATMENT_RECIRC_RECIRC_STATE</string>
+         <string>BLOOD_PRIME_RUNNING_STATE</string>
         </property>
-        <property name="flags">
-         <set>ItemIsSelectable|ItemIsEnabled</set>
-        </property>
        </item>
        <item row="2" column="0">
         <property name="text">
-         <string>TREATMENT_RECIRC_STOPPED_STATE</string>
+         <string>BLOOD_PRIME_PAUSED_STATE</string>
         </property>
        </item>
        <item row="3" column="0">
         <property name="text">
-         <string>TREATMENT_RECIRC_RECONNECT_PATIENT_STATE</string>
+         <string>BLOOD_PRIME_FLUID_BOLUS_STATE</string>
         </property>
        </item>
       </widget>
      </item>
      <item>
-      <widget class="QTableWidget" name="tblTreatmentEndStates">
+      <widget class="QTableWidget" name="tblDialysisStates">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="minimumSize">
         <size>
-         <width>0</width>
-         <height>71</height>
+         <width>250</width>
+         <height>90</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>16777215</width>
-         <height>71</height>
+         <height>16777215</height>
         </size>
        </property>
        <property name="font">
@@ -293,7 +377,7 @@
         <bool>true</bool>
        </attribute>
        <attribute name="horizontalHeaderDefaultSectionSize">
-        <number>260</number>
+        <number>210</number>
        </attribute>
        <attribute name="verticalHeaderDefaultSectionSize">
         <number>21</number>
@@ -308,32 +392,48 @@
          <string>1</string>
         </property>
        </row>
+       <row>
+        <property name="text">
+         <string>2</string>
+        </property>
+       </row>
        <column>
         <property name="text">
-         <string>7 : Treatment End States</string>
+         <string>2: Dialysis States</string>
         </property>
        </column>
        <item row="0" column="0">
         <property name="text">
-         <string>TREATMENT_END_WAIT_FOR_RINSEBACK_STATE</string>
+         <string>DIALYSIS_UF_STATE </string>
         </property>
         <property name="flags">
          <set>ItemIsSelectable|ItemIsEnabled</set>
         </property>
        </item>
        <item row="1" column="0">
         <property name="text">
-         <string>TREATMENT_END_PAUSED_STATE</string>
+         <string>DIALYSIS_UF_PAUSED_STATE</string>
         </property>
        </item>
+       <item row="2" column="0">
+        <property name="text">
+         <string>DIALYSIS_UF_FLUID_BOLUS_STATE</string>
+        </property>
+       </item>
       </widget>
      </item>
      <item>
-      <widget class="QTableWidget" name="tblSalineStates">
+      <widget class="QTableWidget" name="tblUFStates">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="minimumSize">
         <size>
-         <width>275</width>
-         <height>100</height>
+         <width>250</width>
+         <height>90</height>
         </size>
        </property>
        <property name="font">
@@ -366,7 +466,7 @@
         <bool>true</bool>
        </attribute>
        <attribute name="horizontalHeaderDefaultSectionSize">
-        <number>260</number>
+        <number>210</number>
        </attribute>
        <attribute name="verticalHeaderDefaultSectionSize">
         <number>21</number>
@@ -386,49 +486,48 @@
          <string>2</string>
         </property>
        </row>
-       <row>
-        <property name="text">
-         <string>3</string>
-        </property>
-       </row>
        <column>
         <property name="text">
-         <string>8 : Saline States</string>
+         <string>3 : Isolated UF States</string>
         </property>
        </column>
        <item row="0" column="0">
         <property name="text">
-         <string>SALINE_BOLUS_STATE_IDLE</string>
+         <string>UF_START_STATE</string>
         </property>
-        <property name="flags">
-         <set>ItemIsSelectable|ItemIsEnabled</set>
-        </property>
        </item>
        <item row="1" column="0">
         <property name="text">
-         <string>SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP</string>
+         <string>UF_PAUSED_STATE</string>
         </property>
        </item>
        <item row="2" column="0">
         <property name="text">
-         <string>SALINE_BOLUS_STATE_IN_PROGRESS</string>
+         <string>UF_RUNNING_STATE</string>
         </property>
        </item>
-       <item row="3" column="0">
-        <property name="text">
-         <string>SALINE_BOLUS_STATE_MAX_DELIVERED</string>
-        </property>
-       </item>
       </widget>
      </item>
      <item>
-      <widget class="QTableWidget" name="tblHeparinStates">
+      <widget class="QTableWidget" name="tblTreatmentStopStates">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="minimumSize">
         <size>
-         <width>225</width>
-         <height>175</height>
+         <width>250</width>
+         <height>150</height>
         </size>
        </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>16777215</height>
+        </size>
+       </property>
        <property name="font">
         <font>
          <pointsize>8</pointsize>
@@ -459,7 +558,7 @@
         <bool>true</bool>
        </attribute>
        <attribute name="horizontalHeaderDefaultSectionSize">
-        <number>210</number>
+        <number>275</number>
        </attribute>
        <attribute name="verticalHeaderDefaultSectionSize">
         <number>21</number>
@@ -494,73 +593,80 @@
          <string>5</string>
         </property>
        </row>
-       <row>
-        <property name="text">
-         <string>6</string>
-        </property>
-       </row>
        <column>
         <property name="text">
-         <string>9 : Heparin States</string>
+         <string>4 : Treatment Paused States</string>
         </property>
        </column>
        <item row="0" column="0">
         <property name="text">
-         <string>HEPARIN_STATE_OFF</string>
+         <string>TREATMENT_PAUSED_RECIRC_STATE</string>
         </property>
         <property name="flags">
          <set>ItemIsSelectable|ItemIsEnabled</set>
         </property>
        </item>
        <item row="1" column="0">
         <property name="text">
-         <string>HEPARIN_STATE_STOPPED</string>
+         <string>TREATMENT_PAUSED_RECIRC_DIALYSATE_ONLY_STATE</string>
         </property>
        </item>
        <item row="2" column="0">
         <property name="text">
-         <string>HEPARIN_STATE_PAUSED</string>
+         <string>TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE</string>
         </property>
        </item>
        <item row="3" column="0">
         <property name="text">
-         <string>HEPARIN_STATE_INITIAL_BOLUS</string>
+         <string>TREATMENT_PAUSED_NO_RECIRC_STATE</string>
         </property>
        </item>
        <item row="4" column="0">
         <property name="text">
-         <string>HEPARIN_STATE_DISPENSING</string>
+         <string>TREATMENT_PAUSED_RECOVER_BLOOD_DETECT_STATE</string>
         </property>
        </item>
        <item row="5" column="0">
         <property name="text">
-         <string>HEPARIN_STATE_COMPLETED</string>
+         <string>TREATMENT_PAUSED_FLUID_BOLUS_STATE</string>
         </property>
        </item>
-       <item row="6" column="0">
-        <property name="text">
-         <string>HEPARIN_STATE_EMPTY</string>
-        </property>
-       </item>
       </widget>
      </item>
+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
     </layout>
    </item>
-   <item row="1" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
-      <widget class="QTableWidget" name="tblSubMode">
+      <widget class="QTableWidget" name="tblRinsebackStates">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="minimumSize">
         <size>
-         <width>275</width>
-         <height>231</height>
+         <width>300</width>
+         <height>130</height>
         </size>
        </property>
        <property name="font">
         <font>
          <pointsize>8</pointsize>
-         <weight>50</weight>
-         <bold>false</bold>
         </font>
        </property>
        <property name="verticalScrollBarPolicy">
@@ -581,9 +687,6 @@
        <property name="selectionBehavior">
         <enum>QAbstractItemView::SelectRows</enum>
        </property>
-       <property name="showGrid">
-        <bool>true</bool>
-       </property>
        <property name="wordWrap">
         <bool>false</bool>
        </property>
@@ -593,12 +696,6 @@
        <attribute name="horizontalHeaderDefaultSectionSize">
         <number>260</number>
        </attribute>
-       <attribute name="horizontalHeaderHighlightSections">
-        <bool>true</bool>
-       </attribute>
-       <attribute name="verticalHeaderMinimumSectionSize">
-        <number>18</number>
-       </attribute>
        <attribute name="verticalHeaderDefaultSectionSize">
         <number>21</number>
        </attribute>
@@ -627,102 +724,55 @@
          <string>4</string>
         </property>
        </row>
-       <row>
-        <property name="text">
-         <string>5</string>
-        </property>
-       </row>
-       <row>
-        <property name="text">
-         <string>6</string>
-        </property>
-       </row>
-       <row>
-        <property name="text">
-         <string>7</string>
-        </property>
-       </row>
-       <row>
-        <property name="text">
-         <string>8</string>
-        </property>
-       </row>
-       <row>
-        <property name="text">
-         <string>9</string>
-        </property>
-       </row>
        <column>
         <property name="text">
-         <string>0 : Treatment States (subMode)</string>
+         <string>5 : Rinseback States</string>
         </property>
        </column>
        <item row="0" column="0">
         <property name="text">
-         <string>TREATMENT_START_STATE</string>
+         <string>RINSEBACK_STOP_INIT_STATE</string>
         </property>
+        <property name="flags">
+         <set>ItemIsSelectable|ItemIsEnabled</set>
+        </property>
        </item>
        <item row="1" column="0">
         <property name="text">
-         <string>TREATMENT_BLOOD_PRIME_STATE</string>
+         <string>RINSEBACK_RUN_STATE</string>
         </property>
        </item>
        <item row="2" column="0">
         <property name="text">
-         <string>TREATMENT_DIALYSIS_STATE</string>
+         <string>RINSEBACK_PAUSED_STATE</string>
         </property>
        </item>
        <item row="3" column="0">
         <property name="text">
-         <string>TREATMENT_PAUSED_STATE</string>
+         <string>RINSEBACK_STOP_STATE</string>
         </property>
        </item>
        <item row="4" column="0">
         <property name="text">
-         <string>TREATMENT_RINSEBACK_STATE</string>
+         <string>RINSEBACK_RUN_ADDITIONAL_STATE</string>
         </property>
        </item>
-       <item row="5" column="0">
-        <property name="text">
-         <string>TREATMENT_RECIRC_STATE</string>
-        </property>
-       </item>
-       <item row="6" column="0">
-        <property name="text">
-         <string>TREATMENT_END_STATE</string>
-        </property>
-       </item>
-       <item row="7" column="0">
-        <property name="text">
-         <string>TREATMENT_ISO_UF_STATE</string>
-        </property>
-       </item>
-       <item row="8" column="0">
-        <property name="text">
-         <string>TREATMENT_SALINE_STATE</string>
-        </property>
-       </item>
-       <item row="9" column="0">
-        <property name="text">
-         <string>TREATMENT_DIALYSIS_PAUSED_STATE</string>
-        </property>
-       </item>
       </widget>
      </item>
      <item>
-      <widget class="QTableWidget" name="tblBloodPrimeStates">
+      <widget class="QTableWidget" name="tblRecirculateStates">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="minimumSize">
         <size>
-         <width>0</width>
-         <height>51</height>
+         <width>250</width>
+         <height>110</height>
         </size>
        </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>51</height>
-        </size>
-       </property>
        <property name="font">
         <font>
          <pointsize>8</pointsize>
@@ -753,7 +803,7 @@
         <bool>true</bool>
        </attribute>
        <attribute name="horizontalHeaderDefaultSectionSize">
-        <number>210</number>
+        <number>275</number>
        </attribute>
        <attribute name="verticalHeaderDefaultSectionSize">
         <number>21</number>
@@ -763,33 +813,69 @@
          <string>0</string>
         </property>
        </row>
+       <row>
+        <property name="text">
+         <string>1</string>
+        </property>
+       </row>
+       <row>
+        <property name="text">
+         <string>2</string>
+        </property>
+       </row>
+       <row>
+        <property name="text">
+         <string>3</string>
+        </property>
+       </row>
        <column>
         <property name="text">
-         <string>1 : Blood Prime States</string>
+         <string>6 : Recirculate States</string>
         </property>
        </column>
        <item row="0" column="0">
         <property name="text">
-         <string>BLOOD_PRIME_RAMP_STATE</string>
+         <string>TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE</string>
         </property>
+       </item>
+       <item row="1" column="0">
+        <property name="text">
+         <string>TREATMENT_RECIRC_RECIRC_STATE</string>
+        </property>
         <property name="flags">
          <set>ItemIsSelectable|ItemIsEnabled</set>
         </property>
        </item>
+       <item row="2" column="0">
+        <property name="text">
+         <string>TREATMENT_RECIRC_STOPPED_STATE</string>
+        </property>
+       </item>
+       <item row="3" column="0">
+        <property name="text">
+         <string>TREATMENT_RECIRC_RECONNECT_PATIENT_STATE</string>
+        </property>
+       </item>
       </widget>
      </item>
      <item>
-      <widget class="QTableWidget" name="tblDialysisStates">
+      <widget class="QTableWidget" name="tblTreatmentEndStates">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="minimumSize">
         <size>
-         <width>0</width>
-         <height>70</height>
+         <width>250</width>
+         <height>71</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>16777215</width>
-         <height>70</height>
+         <height>16777215</height>
         </size>
        </property>
        <property name="font">
@@ -822,7 +908,7 @@
         <bool>true</bool>
        </attribute>
        <attribute name="horizontalHeaderDefaultSectionSize">
-        <number>210</number>
+        <number>260</number>
        </attribute>
        <attribute name="verticalHeaderDefaultSectionSize">
         <number>21</number>
@@ -837,32 +923,48 @@
          <string>1</string>
         </property>
        </row>
+       <row>
+        <property name="text">
+         <string>2</string>
+        </property>
+       </row>
        <column>
         <property name="text">
-         <string>2: Dialysis States</string>
+         <string>7 : Treatment End States</string>
         </property>
        </column>
        <item row="0" column="0">
         <property name="text">
-         <string>DIALYSIS_UF_STATE </string>
+         <string>TREATMENT_END_WAIT_FOR_RINSEBACK_STATE</string>
         </property>
         <property name="flags">
          <set>ItemIsSelectable|ItemIsEnabled</set>
         </property>
        </item>
        <item row="1" column="0">
         <property name="text">
-         <string>DIALYSIS_UF_PAUSED_STATE</string>
+         <string>TREATMENT_END_PAUSED_STATE</string>
         </property>
        </item>
+       <item row="2" column="0">
+        <property name="text">
+         <string>TREATMENT_END_FLUID_BOLUS_STATE</string>
+        </property>
+       </item>
       </widget>
      </item>
      <item>
-      <widget class="QTableWidget" name="tblUFStates">
+      <widget class="QTableWidget" name="tblSalineStates">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="minimumSize">
         <size>
-         <width>0</width>
-         <height>131</height>
+         <width>250</width>
+         <height>90</height>
         </size>
        </property>
        <property name="font">
@@ -895,7 +997,7 @@
         <bool>true</bool>
        </attribute>
        <attribute name="horizontalHeaderDefaultSectionSize">
-        <number>210</number>
+        <number>260</number>
        </attribute>
        <attribute name="verticalHeaderDefaultSectionSize">
         <number>21</number>
@@ -915,42 +1017,55 @@
          <string>2</string>
         </property>
        </row>
+       <row>
+        <property name="text">
+         <string>3</string>
+        </property>
+       </row>
        <column>
         <property name="text">
-         <string>3 : Isolated UF States</string>
+         <string>8 : Fluid Bolus States</string>
         </property>
        </column>
        <item row="0" column="0">
         <property name="text">
-         <string>UF_START_STATE</string>
+         <string>FLUID_BOLUS_IDLE_STATE</string>
         </property>
+        <property name="flags">
+         <set>ItemIsSelectable|ItemIsEnabled</set>
+        </property>
        </item>
        <item row="1" column="0">
         <property name="text">
-         <string>UF_PAUSED_STATE</string>
+         <string>FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE</string>
         </property>
        </item>
        <item row="2" column="0">
         <property name="text">
-         <string>UF_RUNNING_STATE</string>
+         <string>FLUID_BOLUS_SALINE_IN_PROGRESS_STATE</string>
         </property>
        </item>
+       <item row="3" column="0">
+        <property name="text">
+         <string>FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE</string>
+        </property>
+       </item>
       </widget>
      </item>
      <item>
-      <widget class="QTableWidget" name="tblTreatmentStopStates">
+      <widget class="QTableWidget" name="tblHeparinStates">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="minimumSize">
         <size>
-         <width>0</width>
-         <height>110</height>
+         <width>250</width>
+         <height>175</height>
         </size>
        </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>16777215</height>
-        </size>
-       </property>
        <property name="font">
         <font>
          <pointsize>8</pointsize>
@@ -981,7 +1096,7 @@
         <bool>true</bool>
        </attribute>
        <attribute name="horizontalHeaderDefaultSectionSize">
-        <number>275</number>
+        <number>210</number>
        </attribute>
        <attribute name="verticalHeaderDefaultSectionSize">
         <number>21</number>
@@ -1006,44 +1121,85 @@
          <string>3</string>
         </property>
        </row>
+       <row>
+        <property name="text">
+         <string>4</string>
+        </property>
+       </row>
+       <row>
+        <property name="text">
+         <string>5</string>
+        </property>
+       </row>
+       <row>
+        <property name="text">
+         <string>6</string>
+        </property>
+       </row>
        <column>
         <property name="text">
-         <string>4 : Treatment Stop States</string>
+         <string>9 : Heparin States</string>
         </property>
        </column>
        <item row="0" column="0">
         <property name="text">
-         <string>TREATMENT_STOP_RECIRC_STATE</string>
+         <string>HEPARIN_STATE_OFF</string>
         </property>
         <property name="flags">
          <set>ItemIsSelectable|ItemIsEnabled</set>
         </property>
        </item>
        <item row="1" column="0">
         <property name="text">
-         <string>TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE</string>
+         <string>HEPARIN_STATE_STOPPED</string>
         </property>
        </item>
        <item row="2" column="0">
         <property name="text">
-         <string>TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE</string>
+         <string>HEPARIN_STATE_PAUSED</string>
         </property>
        </item>
        <item row="3" column="0">
         <property name="text">
-         <string>TREATMENT_STOP_NO_RECIRC_STATE</string>
+         <string>HEPARIN_STATE_INITIAL_BOLUS</string>
         </property>
        </item>
+       <item row="4" column="0">
+        <property name="text">
+         <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>
       </widget>
      </item>
+     <item>
+      <spacer name="verticalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
     </layout>
    </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>tblSubMode</tabstop>
-  <tabstop>tblBloodPrimeStates</tabstop>
-  <tabstop>tblDialysisStates</tabstop>
   <tabstop>tblUFStates</tabstop>
   <tabstop>tblTreatmentStopStates</tabstop>
   <tabstop>tblRinsebackStates</tabstop>