Index: TD_Pre_Treatment/interface.ui
===================================================================
diff -u -r07140fe219f4f6b24d08c70325fe98cb3568e628 -rc0894303c4aa8ed3bde7fba88b9579a6409f6019
--- TD_Pre_Treatment/interface.ui	(.../interface.ui)	(revision 07140fe219f4f6b24d08c70325fe98cb3568e628)
+++ TD_Pre_Treatment/interface.ui	(.../interface.ui)	(revision c0894303c4aa8ed3bde7fba88b9579a6409f6019)
@@ -217,72 +217,15 @@
      </item>
      <item row="4" column="0">
       <layout class="QGridLayout" name="gridLayout">
-       <item row="7" column="1">
-        <widget class="QSpinBox" name="spnDryBicarbConcentrateRejectReason">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="minimum">
-          <number>-2147483647</number>
-         </property>
-         <property name="maximum">
-          <number>2147483647</number>
-         </property>
-         <property name="decimals" stdset="0">
-          <number>3</number>
-         </property>
-        </widget>
-       </item>
-       <item row="10" column="3">
-        <widget class="QLabel" name="lblAcidConcentrate_4">
+       <item row="13" column="0">
+        <widget class="QLabel" name="lblSalineBolusVolume">
          <property name="text">
-          <string>UF Estimated Target Weight</string>
+          <string>Fluid Bolus Volume</string>
          </property>
         </widget>
        </item>
-       <item row="12" column="4">
-        <widget class="QSpinBox" name="spnAcidConcentrateIndextRejectReason">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="minimum">
-          <number>-2147483647</number>
-         </property>
-         <property name="maximum">
-          <number>2147483647</number>
-         </property>
-         <property name="decimals" stdset="0">
-          <number>3</number>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="4">
-        <widget class="QSpinBox" name="spnHeparinBolusVolumeRejectReason">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="minimum">
-          <number>-2147483647</number>
-         </property>
-         <property name="maximum">
-          <number>2147483647</number>
-         </property>
-         <property name="decimals" stdset="0">
-          <number>3</number>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="2">
-        <widget class="QLabel" name="lbTreatmentDurationValue">
+       <item row="13" column="2">
+        <widget class="QLabel" name="lbSalineBolusVolumeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -318,67 +261,52 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="3">
-        <widget class="QLabel" name="lblHeparinDispensingRate">
-         <property name="text">
-          <string>Heparin Dispensing Rate</string>
-         </property>
-        </widget>
-       </item>
-       <item row="10" column="0">
-        <widget class="QLabel" name="lblDialyzerType">
-         <property name="text">
-          <string>Dialyzer Type</string>
-         </property>
-        </widget>
-       </item>
        <item row="7" column="0">
-        <widget class="QLabel" name="lbDryBicarbConcentrate">
+        <widget class="QLabel" name="lblHeparinType">
          <property name="text">
-          <string>Dry Bicarbonate Cartridge Size</string>
+          <string>Heparin Type</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QSpinBox" name="spnDialysateFlowRateRejectReason">
-         <property name="maximumSize">
+       <item row="6" column="2">
+        <widget class="QLabel" name="lbHeparinStopTimeValue">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
           <size>
-           <width>50</width>
-           <height>16777215</height>
+           <width>75</width>
+           <height>0</height>
           </size>
          </property>
-         <property name="minimum">
-          <number>-2147483647</number>
-         </property>
-         <property name="maximum">
-          <number>2147483647</number>
-         </property>
-         <property name="decimals" stdset="0">
-          <number>3</number>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="4">
-        <widget class="QSpinBox" name="spnRinsebackVolumeRejectReason">
          <property name="maximumSize">
           <size>
-           <width>50</width>
+           <width>100</width>
            <height>16777215</height>
           </size>
          </property>
-         <property name="minimum">
-          <number>-2147483647</number>
+         <property name="autoFillBackground">
+          <bool>false</bool>
          </property>
-         <property name="maximum">
-          <number>2147483647</number>
+         <property name="frameShape">
+          <enum>QFrame::WinPanel</enum>
          </property>
-         <property name="decimals" stdset="0">
-          <number>3</number>
+         <property name="frameShadow">
+          <enum>QFrame::Sunken</enum>
          </property>
+         <property name="text">
+          <string>-</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
         </widget>
        </item>
-       <item row="5" column="5">
-        <widget class="QLabel" name="lbHeparinDispensingRateValue">
+       <item row="2" column="2">
+        <widget class="QLabel" name="lbBloodFlowRateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -414,7 +342,7 @@
          </property>
         </widget>
        </item>
-       <item row="12" column="1">
+       <item row="13" column="1">
         <widget class="QSpinBox" name="spnSalineBolusVolumeRejectReason">
          <property name="maximumSize">
           <size>
@@ -433,8 +361,15 @@
          </property>
         </widget>
        </item>
+       <item row="9" column="0">
+        <widget class="QLabel" name="lbDryBicarbConcentrate_2">
+         <property name="text">
+          <string>Sodium</string>
+         </property>
+        </widget>
+       </item>
        <item row="7" column="2">
-        <widget class="QLabel" name="lbDryBicarbConcentrateValue">
+        <widget class="QLabel" name="lbHeparinTypeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -471,7 +406,7 @@
         </widget>
        </item>
        <item row="8" column="1">
-        <widget class="QSpinBox" name="spnSodiumRejectReason">
+        <widget class="QSpinBox" name="spnDryBicarbConcentrateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -489,27 +424,45 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="4">
-        <widget class="QSpinBox" name="spnDialysateTempRejectReason">
+       <item row="2" column="5">
+        <widget class="QLabel" name="lbHepatitisBStatusValue">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>75</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="maximumSize">
           <size>
-           <width>50</width>
+           <width>100</width>
            <height>16777215</height>
           </size>
          </property>
-         <property name="minimum">
-          <number>-2147483647</number>
+         <property name="autoFillBackground">
+          <bool>false</bool>
          </property>
-         <property name="maximum">
-          <number>2147483647</number>
+         <property name="frameShape">
+          <enum>QFrame::WinPanel</enum>
          </property>
-         <property name="decimals" stdset="0">
-          <number>3</number>
+         <property name="frameShadow">
+          <enum>QFrame::Sunken</enum>
          </property>
+         <property name="text">
+          <string>-</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
         </widget>
        </item>
-       <item row="10" column="2">
-        <widget class="QLabel" name="lbDialyzerTypeValue">
+       <item row="0" column="5">
+        <widget class="QLabel" name="lbBloodPressureMeasureIntervalValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -545,72 +498,80 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="4">
-        <widget class="QSpinBox" name="spnAcidConcentrateRejectReason">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
+       <item row="11" column="3">
+        <widget class="QLabel" name="lblAcidConcentrate_4">
+         <property name="text">
+          <string>UF Estimated Target Weight</string>
          </property>
-         <property name="minimum">
-          <number>-2147483647</number>
+        </widget>
+       </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="lblHeparinStopTime">
+         <property name="text">
+          <string>Heparin Delivery Duration</string>
          </property>
-         <property name="maximum">
-          <number>2147483647</number>
+        </widget>
+       </item>
+       <item row="5" column="0">
+        <widget class="QLabel" name="lblTreatmentDuration">
+         <property name="text">
+          <string>Treatment Duration</string>
          </property>
-         <property name="decimals" stdset="0">
-          <number>3</number>
-         </property>
         </widget>
        </item>
-       <item row="4" column="1">
-        <widget class="QSpinBox" name="spnTreatmentDurationRejectReason">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
+       <item row="2" column="3">
+        <widget class="QLabel" name="lblRinsebackVolume_2">
+         <property name="text">
+          <string>Hepatitis B Status</string>
          </property>
-         <property name="minimum">
-          <number>-2147483647</number>
-         </property>
-         <property name="maximum">
-          <number>2147483647</number>
-         </property>
-         <property name="decimals" stdset="0">
-          <number>3</number>
-         </property>
         </widget>
        </item>
-       <item row="8" column="3">
-        <widget class="QLabel" name="lblAcidConcentrate_2">
+       <item row="8" column="0">
+        <widget class="QLabel" name="lbDryBicarbConcentrate">
          <property name="text">
-          <string>UF Volume</string>
+          <string>Dry Bicarbonate Cartridge Size</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="1">
-        <widget class="QSpinBox" name="spnDialyzerTypeRejectReason">
+       <item row="9" column="2">
+        <widget class="QLabel" name="lbSodiumValue">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>75</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="maximumSize">
           <size>
-           <width>50</width>
+           <width>100</width>
            <height>16777215</height>
           </size>
          </property>
-         <property name="minimum">
-          <number>-2147483647</number>
+         <property name="autoFillBackground">
+          <bool>false</bool>
          </property>
-         <property name="maximum">
-          <number>2147483647</number>
+         <property name="frameShape">
+          <enum>QFrame::WinPanel</enum>
          </property>
-         <property name="decimals" stdset="0">
-          <number>3</number>
+         <property name="frameShadow">
+          <enum>QFrame::Sunken</enum>
          </property>
+         <property name="text">
+          <string>-</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
         </widget>
        </item>
-       <item row="8" column="4">
-        <widget class="QSpinBox" name="spnUFVolumeRejectReason">
+       <item row="2" column="4">
+        <widget class="QSpinBox" name="spnHepatitisBStatusRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -628,26 +589,51 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="4">
-        <widget class="QSpinBox" name="spnSubstitutionFluidRejectReason">
+       <item row="2" column="0">
+        <widget class="QLabel" name="lblBloodFlowRate">
+         <property name="text">
+          <string>Blood Flow Rate</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="5">
+        <widget class="QLabel" name="lbRinsebackVolumeValue">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>75</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="maximumSize">
           <size>
-           <width>50</width>
+           <width>100</width>
            <height>16777215</height>
           </size>
          </property>
-         <property name="minimum">
-          <number>-2147483647</number>
+         <property name="autoFillBackground">
+          <bool>false</bool>
          </property>
-         <property name="maximum">
-          <number>2147483647</number>
+         <property name="frameShape">
+          <enum>QFrame::WinPanel</enum>
          </property>
-         <property name="decimals" stdset="0">
-          <number>3</number>
+         <property name="frameShadow">
+          <enum>QFrame::Sunken</enum>
          </property>
+         <property name="text">
+          <string>-</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
         </widget>
        </item>
-       <item row="5" column="1">
+       <item row="6" column="1">
         <widget class="QSpinBox" name="spnHeparinStopTimeRejectReason">
          <property name="maximumSize">
           <size>
@@ -666,8 +652,8 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="5">
-        <widget class="QLabel" name="lbPreWeightValue">
+       <item row="4" column="2">
+        <widget class="QLabel" name="lbDialysateFlowRateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -703,27 +689,8 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="4">
-        <widget class="QSpinBox" name="spnHepatitisBStatusRejectReason">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="minimum">
-          <number>-2147483647</number>
-         </property>
-         <property name="maximum">
-          <number>2147483647</number>
-         </property>
-         <property name="decimals" stdset="0">
-          <number>3</number>
-         </property>
-        </widget>
-       </item>
-       <item row="10" column="5">
-        <widget class="QLabel" name="lbEstimatedTargetWeightValue">
+       <item row="1" column="2">
+        <widget class="QLabel" name="lbHDFTreatmentModeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -759,22 +726,72 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="3">
-        <widget class="QLabel" name="lblDialysateTemp">
-         <property name="text">
-          <string>Dialysate Temp</string>
+       <item row="1" column="1">
+        <widget class="QSpinBox" name="spnHDFTreatmentModeRejectReason">
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
          </property>
+         <property name="minimum">
+          <number>-2147483647</number>
+         </property>
+         <property name="maximum">
+          <number>2147483647</number>
+         </property>
+         <property name="decimals" stdset="0">
+          <number>3</number>
+         </property>
         </widget>
        </item>
-       <item row="8" column="0">
-        <widget class="QLabel" name="lbDryBicarbConcentrate_2">
+       <item row="4" column="1">
+        <widget class="QSpinBox" name="spnDialysateFlowRateRejectReason">
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="minimum">
+          <number>-2147483647</number>
+         </property>
+         <property name="maximum">
+          <number>2147483647</number>
+         </property>
+         <property name="decimals" stdset="0">
+          <number>3</number>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="lblBloodFlowRate_2">
          <property name="text">
-          <string>Sodium</string>
+          <string>Treatment Modality</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="5">
-        <widget class="QLabel" name="lbAcidConcentrateValue">
+       <item row="11" column="1">
+        <widget class="QSpinBox" name="spnDialyzerTypeRejectReason">
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="minimum">
+          <number>-2147483647</number>
+         </property>
+         <property name="maximum">
+          <number>2147483647</number>
+         </property>
+         <property name="decimals" stdset="0">
+          <number>3</number>
+         </property>
+        </widget>
+       </item>
+       <item row="11" column="5">
+        <widget class="QLabel" name="lbEstimatedTargetWeightValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -810,22 +827,22 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
-        <widget class="QLabel" name="lblTreatmentDuration">
+       <item row="1" column="0">
+        <widget class="QLabel" name="lblBloodFlowRate_3">
          <property name="text">
-          <string>Treatment Duration</string>
+          <string>HDF Treatment Mode</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="3">
+       <item row="10" column="3">
         <widget class="QLabel" name="lblAcidConcentrate_3">
          <property name="text">
           <string>UF Pre-Weight</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QSpinBox" name="spnBloodFlowRateRejectReason">
+       <item row="0" column="4">
+        <widget class="QSpinBox" name="spnBloodPressureMeasureIntervalRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -843,8 +860,8 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="1">
-        <widget class="QSpinBox" name="spnBicarbonateRejectReason">
+       <item row="10" column="4">
+        <widget class="QSpinBox" name="spnPreWeightRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -862,15 +879,8 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="3">
-        <widget class="QLabel" name="lblAcidConcentrate">
-         <property name="text">
-          <string>Acid Concentrate Conversion Factor</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="5">
-        <widget class="QLabel" name="lbHepatitisBStatusValue">
+       <item row="0" column="2">
+        <widget class="QLabel" name="lbTreatmentModalityValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -906,22 +916,48 @@
          </property>
         </widget>
        </item>
+       <item row="2" column="1">
+        <widget class="QSpinBox" name="spnBloodFlowRateRejectReason">
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="minimum">
+          <number>-2147483647</number>
+         </property>
+         <property name="maximum">
+          <number>2147483647</number>
+         </property>
+         <property name="decimals" stdset="0">
+          <number>3</number>
+         </property>
+        </widget>
+       </item>
+       <item row="11" column="0">
+        <widget class="QLabel" name="lblDialyzerType">
+         <property name="text">
+          <string>Dialyzer Type</string>
+         </property>
+        </widget>
+       </item>
        <item row="0" column="3">
         <widget class="QLabel" name="lblBloodPressureMeasureInterval">
          <property name="text">
           <string>Blood Pressure Measure Interval</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
+       <item row="4" column="0">
         <widget class="QLabel" name="lblDialysateFlowRate">
          <property name="text">
           <string>Dialysate Flow Rate</string>
          </property>
         </widget>
        </item>
        <item row="8" column="2">
-        <widget class="QLabel" name="lbSodiumValue">
+        <widget class="QLabel" name="lbDryBicarbConcentrateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -957,15 +993,27 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="3">
-        <widget class="QLabel" name="lblHeparinBolusVolume">
-         <property name="text">
-          <string>Heparin Bolus Volume</string>
+       <item row="11" column="4">
+        <widget class="QSpinBox" name="spnEstimatedTargetWeightRejectReason">
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
          </property>
+         <property name="minimum">
+          <number>-2147483647</number>
+         </property>
+         <property name="maximum">
+          <number>2147483647</number>
+         </property>
+         <property name="decimals" stdset="0">
+          <number>3</number>
+         </property>
         </widget>
        </item>
-       <item row="0" column="4">
-        <widget class="QSpinBox" name="spnBloodPressureMeasureIntervalRejectReason">
+       <item row="1" column="4">
+        <widget class="QSpinBox" name="spnRinsebackVolumeRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -983,52 +1031,34 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="3">
-        <widget class="QLabel" name="lblRinsebackVolume_2">
+       <item row="10" column="0">
+        <widget class="QLabel" name="lbDryBicarbConcentrate_3">
          <property name="text">
-          <string>Hepatitis B Status</string>
+          <string>Bicarbonate</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="5">
-        <widget class="QLabel" name="lbBloodPressureMeasureIntervalValue">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>75</width>
-           <height>0</height>
-          </size>
-         </property>
+       <item row="5" column="1">
+        <widget class="QSpinBox" name="spnTreatmentDurationRejectReason">
          <property name="maximumSize">
           <size>
-           <width>100</width>
+           <width>50</width>
            <height>16777215</height>
           </size>
          </property>
-         <property name="autoFillBackground">
-          <bool>false</bool>
+         <property name="minimum">
+          <number>-2147483647</number>
          </property>
-         <property name="frameShape">
-          <enum>QFrame::WinPanel</enum>
+         <property name="maximum">
+          <number>2147483647</number>
          </property>
-         <property name="frameShadow">
-          <enum>QFrame::Sunken</enum>
+         <property name="decimals" stdset="0">
+          <number>3</number>
          </property>
-         <property name="text">
-          <string>-</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
         </widget>
        </item>
-       <item row="8" column="5">
-        <widget class="QLabel" name="lbUFVolueValue">
+       <item row="11" column="2">
+        <widget class="QLabel" name="lbDialyzerTypeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1064,7 +1094,7 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="1">
+       <item row="7" column="1">
         <widget class="QSpinBox" name="spnHeparinTypeRejectReason">
          <property name="maximumSize">
           <size>
@@ -1083,8 +1113,8 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="2">
-        <widget class="QLabel" name="lbTreatmentModalityValue">
+       <item row="10" column="2">
+        <widget class="QLabel" name="lbBicarbonateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1139,8 +1169,15 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="5">
-        <widget class="QLabel" name="lbRinsebackVolumeValue">
+       <item row="1" column="3">
+        <widget class="QLabel" name="lblRinsebackVolume">
+         <property name="text">
+          <string>Rinseback Volume</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="2">
+        <widget class="QLabel" name="lbTreatmentDurationValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1176,8 +1213,8 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="4">
-        <widget class="QSpinBox" name="spnPreWeightRejectReason">
+       <item row="10" column="1">
+        <widget class="QSpinBox" name="spnBicarbonateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1195,8 +1232,8 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="5">
-        <widget class="QLabel" name="lbSubstitutionFluidValue">
+       <item row="10" column="5">
+        <widget class="QLabel" name="lbPreWeightValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1232,8 +1269,53 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="2">
-        <widget class="QLabel" name="lbDialysateFlowRateValue">
+       <item row="9" column="1">
+        <widget class="QSpinBox" name="spnSodiumRejectReason">
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="minimum">
+          <number>-2147483647</number>
+         </property>
+         <property name="maximum">
+          <number>2147483647</number>
+         </property>
+         <property name="decimals" stdset="0">
+          <number>3</number>
+         </property>
+        </widget>
+       </item>
+       <item row="13" column="3">
+        <widget class="QLabel" name="lblAcidConcentrate_2">
+         <property name="text">
+          <string>UF Volume</string>
+         </property>
+        </widget>
+       </item>
+       <item row="13" column="4">
+        <widget class="QSpinBox" name="spnUFVolumeRejectReason">
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="minimum">
+          <number>-2147483647</number>
+         </property>
+         <property name="maximum">
+          <number>2147483647</number>
+         </property>
+         <property name="decimals" stdset="0">
+          <number>3</number>
+         </property>
+        </widget>
+       </item>
+       <item row="13" column="5">
+        <widget class="QLabel" name="lbUFVolueValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1269,15 +1351,8 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="lblBloodFlowRate_3">
-         <property name="text">
-          <string>HDF Treatment Mode</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="5">
-        <widget class="QLabel" name="lbHeparinBolusVolumeValue">
+       <item row="9" column="5">
+        <widget class="QLabel" name="lbAcidConcentrateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1313,15 +1388,27 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="lblBloodFlowRate_2">
-         <property name="text">
-          <string>Treatment Modality</string>
+       <item row="9" column="4">
+        <widget class="QSpinBox" name="spnAcidConcentrateRejectReason">
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
          </property>
+         <property name="minimum">
+          <number>-2147483647</number>
+         </property>
+         <property name="maximum">
+          <number>2147483647</number>
+         </property>
+         <property name="decimals" stdset="0">
+          <number>3</number>
+         </property>
         </widget>
        </item>
-       <item row="10" column="4">
-        <widget class="QSpinBox" name="spnEstimatedTargetWeightRejectReason">
+       <item row="8" column="4">
+        <widget class="QSpinBox" name="spnDialysateTempRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1339,8 +1426,8 @@
          </property>
         </widget>
        </item>
-       <item row="12" column="2">
-        <widget class="QLabel" name="lbSalineBolusVolumeValue">
+       <item row="8" column="5">
+        <widget class="QLabel" name="lbDialysateTempValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1376,22 +1463,8 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="3">
-        <widget class="QLabel" name="lblRinsebackVolume_3">
-         <property name="text">
-          <string>Substitution Fluid </string>
-         </property>
-        </widget>
-       </item>
-       <item row="12" column="0">
-        <widget class="QLabel" name="lblSalineBolusVolume">
-         <property name="text">
-          <string>Fluid Bolus Volume</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="2">
-        <widget class="QLabel" name="lbBloodFlowRateValue">
+       <item row="7" column="5">
+        <widget class="QLabel" name="lbHeparinDispensingRateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1428,7 +1501,7 @@
         </widget>
        </item>
        <item row="6" column="5">
-        <widget class="QLabel" name="lbDialysateTempValue">
+        <widget class="QLabel" name="lbHeparinBolusVolumeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1464,22 +1537,8 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="0">
-        <widget class="QLabel" name="lbDryBicarbConcentrate_3">
-         <property name="text">
-          <string>Bicarbonate</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="lblBloodFlowRate">
-         <property name="text">
-          <string>Blood Flow Rate</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="2">
-        <widget class="QLabel" name="lbHeparinTypeValue">
+       <item row="5" column="5">
+        <widget class="QLabel" name="lbSubstitutionFluidValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1515,7 +1574,7 @@
          </property>
         </widget>
        </item>
-       <item row="12" column="5">
+       <item row="4" column="5">
         <widget class="QLabel" name="lbAcidConcentrateIndex">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
@@ -1552,8 +1611,8 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QSpinBox" name="spnHDFTreatmentModeRejectReason">
+       <item row="7" column="4">
+        <widget class="QSpinBox" name="spnHeparinDispensingRateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1571,103 +1630,34 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="3">
-        <widget class="QLabel" name="lblRinsebackVolume">
+       <item row="9" column="3">
+        <widget class="QLabel" name="lblAcidConcentrate">
          <property name="text">
-          <string>Rinseback Volume</string>
+          <string>Acid Concentrate Conversion Factor</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="lblHeparinStopTime">
-         <property name="text">
-          <string>Heparin Delivery Duration</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0">
-        <widget class="QLabel" name="lblHeparinType">
-         <property name="text">
-          <string>Heparin Type</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="2">
-        <widget class="QLabel" name="lbHDFTreatmentModeValue">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>75</width>
-           <height>0</height>
-          </size>
-         </property>
+       <item row="6" column="4">
+        <widget class="QSpinBox" name="spnHeparinBolusVolumeRejectReason">
          <property name="maximumSize">
           <size>
-           <width>100</width>
+           <width>50</width>
            <height>16777215</height>
           </size>
          </property>
-         <property name="autoFillBackground">
-          <bool>false</bool>
+         <property name="minimum">
+          <number>-2147483647</number>
          </property>
-         <property name="frameShape">
-          <enum>QFrame::WinPanel</enum>
+         <property name="maximum">
+          <number>2147483647</number>
          </property>
-         <property name="frameShadow">
-          <enum>QFrame::Sunken</enum>
+         <property name="decimals" stdset="0">
+          <number>3</number>
          </property>
-         <property name="text">
-          <string>-</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
         </widget>
        </item>
-       <item row="5" column="2">
-        <widget class="QLabel" name="lbHeparinStopTimeValue">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>75</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>100</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="autoFillBackground">
-          <bool>false</bool>
-         </property>
-         <property name="frameShape">
-          <enum>QFrame::WinPanel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Sunken</enum>
-         </property>
-         <property name="text">
-          <string>-</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
        <item row="5" column="4">
-        <widget class="QSpinBox" name="spnHeparinDispensingRateRejectReason">
+        <widget class="QSpinBox" name="spnSubstitutionFluidRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1685,50 +1675,60 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="2">
-        <widget class="QLabel" name="lbBicarbonateValue">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+       <item row="8" column="3">
+        <widget class="QLabel" name="lblDialysateTemp">
+         <property name="text">
+          <string>Dialysate Temp</string>
          </property>
-         <property name="minimumSize">
-          <size>
-           <width>75</width>
-           <height>0</height>
-          </size>
+        </widget>
+       </item>
+       <item row="7" column="3">
+        <widget class="QLabel" name="lblHeparinDispensingRate">
+         <property name="text">
+          <string>Heparin Dispensing Rate</string>
          </property>
-         <property name="maximumSize">
-          <size>
-           <width>100</width>
-           <height>16777215</height>
-          </size>
+        </widget>
+       </item>
+       <item row="6" column="3">
+        <widget class="QLabel" name="lblHeparinBolusVolume">
+         <property name="text">
+          <string>Heparin Bolus Volume</string>
          </property>
-         <property name="autoFillBackground">
-          <bool>false</bool>
-         </property>
-         <property name="frameShape">
-          <enum>QFrame::WinPanel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Sunken</enum>
-         </property>
+        </widget>
+       </item>
+       <item row="5" column="3">
+        <widget class="QLabel" name="lblRinsebackVolume_3">
          <property name="text">
-          <string>-</string>
+          <string>Substitution Fluid </string>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
         </widget>
        </item>
-       <item row="12" column="3">
+       <item row="4" column="3">
         <widget class="QLabel" name="lblBloodPressureMeasureInterval_3">
          <property name="text">
           <string>Acid Concentrate Index</string>
          </property>
         </widget>
        </item>
+       <item row="4" column="4">
+        <widget class="QSpinBox" name="spnAcidConcentrateIndextRejectReason">
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="minimum">
+          <number>-2147483647</number>
+         </property>
+         <property name="maximum">
+          <number>2147483647</number>
+         </property>
+         <property name="decimals" stdset="0">
+          <number>3</number>
+         </property>
+        </widget>
+       </item>
       </layout>
      </item>
      <item row="5" column="0">