Index: MainTreatmentData/interface.ui
===================================================================
diff -u -r45e91bf76f061c2f9cffd9c96ca338437a27b8e5 -r297ab9b42e421f80cbc5148cc7c03c0d0758822d
--- MainTreatmentData/interface.ui	(.../interface.ui)	(revision 45e91bf76f061c2f9cffd9c96ca338437a27b8e5)
+++ MainTreatmentData/interface.ui	(.../interface.ui)	(revision 297ab9b42e421f80cbc5148cc7c03c0d0758822d)
@@ -20,52 +20,10 @@
    <string>&amp;3 Treatment/&amp;1 Main treatment </string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="4">
-    <layout class="QVBoxLayout" name="verticalLayout_5">
+   <item row="3" column="0" colspan="4">
+    <layout class="QHBoxLayout" name="horizontalLayout_7">
      <item>
-      <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(92, 53, 102);
-</string>
-         </property>
-         <property name="text">
-          <string>Main Treatment 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>
-    </layout>
-   </item>
-   <item row="5" column="0" colspan="4">
-    <layout class="QHBoxLayout" name="horizontalLayout_5">
-     <item>
-      <widget class="QLabel" name="label_5">
+      <widget class="QLabel" name="label_7">
        <property name="minimumSize">
         <size>
          <width>180</width>
@@ -74,69 +32,17 @@
        </property>
        <property name="maximumSize">
         <size>
-         <width>50</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>State</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignJustify|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="SalineStatespinBox">
-       <property name="maximumSize">
-        <size>
-         <width>50</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="maximum">
-        <number>1000</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item row="4" column="0" colspan="4">
-    <layout class="QHBoxLayout" name="horizontalLayout_6">
-     <item>
-      <widget class="QLabel" name="SalineCurrDelVolume">
-       <property name="minimumSize">
-        <size>
          <width>180</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>180</width>
          <height>16777215</height>
         </size>
        </property>
        <property name="text">
-        <string>Current Delivered Volume</string>
+        <string>Cumulative Volume</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QSlider" name="SalineCurrDeliveredVolumeSlider">
+      <widget class="QSlider" name="CumulativeVolumeSlider">
        <property name="maximum">
         <number>10000</number>
        </property>
@@ -146,7 +52,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="label_10">
+      <widget class="QLabel" name="label_9">
        <property name="minimumSize">
         <size>
          <width>50</width>
@@ -160,13 +66,6 @@
      </item>
     </layout>
    </item>
-   <item row="6" column="0" colspan="2">
-    <widget class="QLabel" name="label_16">
-     <property name="text">
-      <string>Saline Bolus Req[0x5E00]</string>
-     </property>
-    </widget>
-   </item>
    <item row="2" column="0" colspan="4">
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
@@ -207,6 +106,19 @@
      </item>
     </layout>
    </item>
+   <item row="6" column="1">
+    <spacer name="verticalSpacer_4">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item row="1" column="0" colspan="4">
     <widget class="QLabel" name="label">
      <property name="sizePolicy">
@@ -241,23 +153,30 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="1">
-    <spacer name="verticalSpacer_4">
+   <item row="8" column="0">
+    <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>0</height>
+       <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="8" column="0" colspan="4">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item row="5" column="0" colspan="2">
+    <widget class="QLabel" name="label_16">
+     <property name="text">
+      <string>Saline Bolus Req[0x5E00]</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="4" rowspan="5">
+    <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <widget class="QLabel" name="label_2">
+      <widget class="QLabel" name="label_3">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -270,50 +189,60 @@
          <height>0</height>
         </size>
        </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>16777215</height>
+        </size>
+       </property>
        <property name="font">
         <font>
          <pointsize>10</pointsize>
         </font>
        </property>
        <property name="styleSheet">
         <string notr="true">color: rgb(238, 238, 236);
-background-color: rgb(92, 53, 102);</string>
+background-color: rgb(92, 53, 102);
+</string>
        </property>
        <property name="text">
-        <string>62 : [0x3E00] : Ultrafiltration</string>
+        <string>59 : [0x3B00] : Treament Time</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_9">
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
        <item>
-        <widget class="QLabel" name="label_11">
+        <widget class="QLabel" name="tx_duration_label">
          <property name="minimumSize">
           <size>
            <width>180</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Set Volume L</string>
+          <string>TX Duration</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QSlider" name="UFSetVolSlider">
+        <widget class="QSlider" name="DurationSlider">
          <property name="maximum">
-          <number>1000</number>
+          <number>480</number>
          </property>
+         <property name="singleStep">
+          <number>15</number>
+         </property>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="setufvolumeLabel">
+        <widget class="QLabel" name="label_14">
          <property name="minimumSize">
           <size>
            <width>50</width>
@@ -328,32 +257,32 @@
       </layout>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_10">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
        <item>
-        <widget class="QLabel" name="label_12">
+        <widget class="QLabel" name="elapsed_time_label">
          <property name="minimumSize">
           <size>
            <width>180</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Target Rate L/Hr</string>
+          <string>Elapsed Time</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QSlider" name="UFRateSlider">
+        <widget class="QSlider" name="ElapsedSlider">
          <property name="maximum">
-          <number>1000</number>
+          <number>480</number>
          </property>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="targetufLabel">
+        <widget class="QLabel" name="label_15">
          <property name="minimumSize">
           <size>
            <width>50</width>
@@ -368,134 +297,109 @@
       </layout>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_11">
+      <spacer name="verticalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>60</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="0" colspan="4">
+    <layout class="QVBoxLayout" name="verticalLayout_5">
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout">
        <item>
-        <widget class="QLabel" name="label_13">
-         <property name="minimumSize">
-          <size>
-           <width>180</width>
-           <height>0</height>
-          </size>
+        <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(92, 53, 102);
+</string>
+         </property>
          <property name="text">
-          <string>Volume Delivered L</string>
+          <string>Main Treatment Data</string>
          </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QSlider" name="UFVolDelSlider">
-         <property name="maximum">
-          <number>200</number>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
          </property>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="ufvolumeDeliveredlabel">
-         <property name="minimumSize">
-          <size>
-           <width>50</width>
-           <height>0</height>
-          </size>
-         </property>
+        <widget class="QToolButton" name="tbSend">
          <property name="text">
-          <string>0</string>
+          <string>send</string>
          </property>
         </widget>
        </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_8">
        <item>
-        <widget class="QLabel" name="label_6">
-         <property name="minimumSize">
-          <size>
-           <width>180</width>
-           <height>0</height>
-          </size>
-         </property>
+        <widget class="QToolButton" name="tbReset">
          <property name="text">
-          <string>State</string>
+          <string>reset</string>
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QSpinBox" name="UFStatespinBox"/>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </item>
+    </layout>
+   </item>
+   <item row="4" column="0" colspan="4">
+    <layout class="QHBoxLayout" name="horizontalLayout_6">
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_15">
-       <item>
-        <widget class="QLabel" name="label_23">
-         <property name="minimumSize">
-          <size>
-           <width>180</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Max Delivery</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QDoubleSpinBox" name="UFMaxDoubleSpinBox">
-         <property name="maximum">
-          <double>20.000000000000000</double>
-         </property>
-         <property name="value">
-          <double>2.000000000000000</double>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
+      <widget class="QLabel" name="SalineCurrDelVolume">
+       <property name="minimumSize">
+        <size>
+         <width>180</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>180</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Current Delivered Volume</string>
+       </property>
+      </widget>
      </item>
      <item>
-      <spacer name="verticalSpacer_5">
+      <widget class="QSlider" name="SalineCurrDeliveredVolumeSlider">
+       <property name="maximum">
+        <number>10000</number>
+       </property>
        <property name="orientation">
-        <enum>Qt::Vertical</enum>
+        <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0">
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_10">
+       <property name="minimumSize">
         <size>
-         <width>20</width>
-         <height>40</height>
+         <width>50</width>
+         <height>0</height>
         </size>
        </property>
-      </spacer>
+       <property name="text">
+        <string>0</string>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
-   <item row="8" column="4">
+   <item row="7" column="4">
     <layout class="QVBoxLayout" name="verticalLayout_4">
      <item>
       <widget class="QLabel" name="label_19">
@@ -622,10 +526,10 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="4" rowspan="6">
-    <layout class="QVBoxLayout" name="verticalLayout">
+   <item row="7" column="0" colspan="4">
+    <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
-      <widget class="QLabel" name="label_3">
+      <widget class="QLabel" name="label_2">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -638,60 +542,90 @@
          <height>0</height>
         </size>
        </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>16777215</height>
-        </size>
-       </property>
        <property name="font">
         <font>
          <pointsize>10</pointsize>
         </font>
        </property>
        <property name="styleSheet">
         <string notr="true">color: rgb(238, 238, 236);
-background-color: rgb(92, 53, 102);
-</string>
+background-color: rgb(92, 53, 102);</string>
        </property>
        <property name="text">
-        <string>59 : [0x3B00] : Treament Time</string>
+        <string>62 : [0x3E00] : Ultrafiltration</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <layout class="QHBoxLayout" name="horizontalLayout_9">
        <item>
-        <widget class="QLabel" name="tx_duration_label">
+        <widget class="QLabel" name="label_11">
          <property name="minimumSize">
           <size>
            <width>180</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>TX Duration</string>
+          <string>Set Volume L</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QSlider" name="DurationSlider">
+        <widget class="QSlider" name="UFSetVolSlider">
          <property name="maximum">
-          <number>480</number>
+          <number>1000</number>
          </property>
-         <property name="singleStep">
-          <number>15</number>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
          </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="setufvolumeLabel">
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>0</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_10">
+       <item>
+        <widget class="QLabel" name="label_12">
+         <property name="minimumSize">
+          <size>
+           <width>180</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Target Rate L/Hr</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSlider" name="UFRateSlider">
+         <property name="maximum">
+          <number>1000</number>
+         </property>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="label_14">
+        <widget class="QLabel" name="targetufLabel">
          <property name="minimumSize">
           <size>
            <width>50</width>
@@ -706,32 +640,32 @@
       </layout>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <layout class="QHBoxLayout" name="horizontalLayout_11">
        <item>
-        <widget class="QLabel" name="elapsed_time_label">
+        <widget class="QLabel" name="label_13">
          <property name="minimumSize">
           <size>
            <width>180</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Elapsed Time</string>
+          <string>Volume Delivered L</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QSlider" name="ElapsedSlider">
+        <widget class="QSlider" name="UFVolDelSlider">
          <property name="maximum">
-          <number>480</number>
+          <number>200</number>
          </property>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="label_15">
+        <widget class="QLabel" name="ufvolumeDeliveredlabel">
          <property name="minimumSize">
           <size>
            <width>50</width>
@@ -746,80 +680,94 @@
       </layout>
      </item>
      <item>
-      <spacer name="verticalSpacer_2">
+      <layout class="QHBoxLayout" name="horizontalLayout_8">
+       <item>
+        <widget class="QLabel" name="label_6">
+         <property name="minimumSize">
+          <size>
+           <width>180</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>State</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="UFStatespinBox"/>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_15">
+       <item>
+        <widget class="QLabel" name="label_23">
+         <property name="minimumSize">
+          <size>
+           <width>180</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Max Delivery</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDoubleSpinBox" name="UFMaxDoubleSpinBox">
+         <property name="maximum">
+          <double>20.000000000000000</double>
+         </property>
+         <property name="value">
+          <double>2.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="verticalSpacer_5">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
-         <height>60</height>
+         <height>40</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
-   <item row="3" column="0" colspan="4">
-    <layout class="QHBoxLayout" name="horizontalLayout_7">
-     <item>
-      <widget class="QLabel" name="label_7">
-       <property name="minimumSize">
-        <size>
-         <width>180</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>180</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Cumulative Volume</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSlider" name="CumulativeVolumeSlider">
-       <property name="maximum">
-        <number>10000</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_9">
-       <property name="minimumSize">
-        <size>
-         <width>50</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>0</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="9" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="6" column="2">
+   <item row="5" column="2">
     <widget class="QLabel" name="lbBolusStart">
      <property name="autoFillBackground">
       <bool>false</bool>
@@ -844,7 +792,6 @@
   <tabstop>TargetVolumeSlider</tabstop>
   <tabstop>CumulativeVolumeSlider</tabstop>
   <tabstop>SalineCurrDeliveredVolumeSlider</tabstop>
-  <tabstop>SalineStatespinBox</tabstop>
   <tabstop>UFSetVolSlider</tabstop>
   <tabstop>UFRateSlider</tabstop>
   <tabstop>UFVolDelSlider</tabstop>