Index: TD_Pre_Treatment/interface.ui
===================================================================
diff -u -r111dde456d779ca809a27a17f84a8ab2133abd60 -rf26787d0dbc6eafc75668a32c9a6e1d57afac65e
--- TD_Pre_Treatment/interface.ui	(.../interface.ui)	(revision 111dde456d779ca809a27a17f84a8ab2133abd60)
+++ TD_Pre_Treatment/interface.ui	(.../interface.ui)	(revision f26787d0dbc6eafc75668a32c9a6e1d57afac65e)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>754</width>
-    <height>621</height>
+    <height>653</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -217,34 +217,8 @@
      </item>
      <item row="4" column="0">
       <layout class="QGridLayout" name="gridLayout">
-       <item row="5" column="1">
-        <widget class="QSpinBox" name="spnHeparinStopTimeRejectReason">
-         <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="0">
-        <widget class="QLabel" name="lblDialyzerType">
-         <property name="text">
-          <string>Dialyzer Type</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="2">
-        <widget class="QLabel" name="lbBloodFlowRateValue">
+       <item row="3" column="5">
+        <widget class="QLabel" name="lbHepatitisBStatusValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -280,108 +254,55 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="2">
-        <widget class="QLabel" name="lbSalineBolusVolumeValue">
-         <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>
+       <item row="7" column="3">
+        <widget class="QLabel" name="lblDialysateTemp">
          <property name="text">
-          <string>-</string>
+          <string>Dialysate Temp</string>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
         </widget>
        </item>
-       <item row="6" column="2">
-        <widget class="QLabel" name="lbHeparinTypeValue">
-         <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="9" column="4">
+        <widget class="QSpinBox" name="spnUFVolumeRejectReason">
          <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>
+        </widget>
+       </item>
+       <item row="11" column="3">
+        <widget class="QLabel" name="lblAcidConcentrate_4">
          <property name="text">
-          <string>-</string>
+          <string>UF Estimated Target Weight</string>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
         </widget>
        </item>
-       <item row="6" column="0">
-        <widget class="QLabel" name="lblHeparinType">
+       <item row="1" column="0">
+        <widget class="QLabel" name="lblBloodFlowRate_3">
          <property name="text">
-          <string>Heparin Type</string>
+          <string>HDF Treatment Mode</string>
          </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="6" column="3">
+        <widget class="QLabel" name="lblHeparinDispensingRate">
+         <property name="text">
+          <string>Heparin Dispensing Rate</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="0" column="2">
-        <widget class="QLabel" name="lbTreatmentModalityValue">
+       <item row="6" column="5">
+        <widget class="QLabel" name="lbHeparinDispensingRateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -417,15 +338,15 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="0">
-        <widget class="QLabel" name="lbDryBicarbConcentrate">
+       <item row="8" column="0">
+        <widget class="QLabel" name="lbDryBicarbConcentrate_2">
          <property name="text">
-          <string>Dry Bicarbonate Cartridge Size</string>
+          <string>Sodium</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="1">
-        <widget class="QSpinBox" name="spnDialyzerTypeRejectReason">
+       <item row="4" column="4">
+        <widget class="QSpinBox" name="spnSubstitutionFluidRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -443,8 +364,8 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QSpinBox" name="spnDialysateFlowRateRejectReason">
+       <item row="6" column="4">
+        <widget class="QSpinBox" name="spnHeparinDispensingRateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -462,13 +383,6 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
-        <widget class="QLabel" name="lblTreatmentDuration">
-         <property name="text">
-          <string>Treatment Duration</string>
-         </property>
-        </widget>
-       </item>
        <item row="7" column="1">
         <widget class="QSpinBox" name="spnDryBicarbConcentrateRejectReason">
          <property name="maximumSize">
@@ -488,8 +402,8 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="2">
-        <widget class="QLabel" name="lbHDFTreatmentModeValue">
+       <item row="7" column="5">
+        <widget class="QLabel" name="lbDialysateTempValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -525,8 +439,8 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="2">
-        <widget class="QLabel" name="lbDryBicarbConcentrateValue">
+       <item row="3" column="2">
+        <widget class="QLabel" name="lbDialysateFlowRateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -562,15 +476,8 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="0">
-        <widget class="QLabel" name="lblSalineBolusVolume">
-         <property name="text">
-          <string>Fluid Bolus Volume</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="2">
-        <widget class="QLabel" name="lbTreatmentDurationValue">
+       <item row="9" column="5">
+        <widget class="QLabel" name="lbUFVolueValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -606,30 +513,48 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="1">
-        <widget class="QSpinBox" name="spnBicarbonateRejectReason">
+       <item row="10" column="0">
+        <widget class="QLabel" name="lblDialyzerType">
+         <property name="text">
+          <string>Dialyzer 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>
          <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>
-        </widget>
-       </item>
-       <item row="8" column="0">
-        <widget class="QLabel" name="lbDryBicarbConcentrate_2">
          <property name="text">
-          <string>Sodium</string>
+          <string>-</string>
          </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
         </widget>
        </item>
        <item row="0" column="4">
@@ -651,8 +576,8 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="2">
-        <widget class="QLabel" name="lbBicarbonateValue">
+       <item row="11" column="2">
+        <widget class="QLabel" name="lbSalineBolusVolumeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -688,8 +613,46 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="2">
-        <widget class="QLabel" name="lbHeparinStopTimeValue">
+       <item row="6" column="1">
+        <widget class="QSpinBox" name="spnHeparinTypeRejectReason">
+         <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="spnPreWeightRejectReason">
+         <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="9" column="2">
+        <widget class="QLabel" name="lbBicarbonateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -725,8 +688,8 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="2">
-        <widget class="QLabel" name="lbDialyzerTypeValue">
+       <item row="5" column="2">
+        <widget class="QLabel" name="lbHeparinStopTimeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -762,8 +725,29 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QSpinBox" name="spnHDFTreatmentModeRejectReason">
+       <item row="4" column="3">
+        <widget class="QLabel" name="lblRinsebackVolume_3">
+         <property name="text">
+          <string>Substitution Fluid </string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="lblDialysateFlowRate">
+         <property name="text">
+          <string>Dialysate Flow Rate</string>
+         </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="11" column="1">
+        <widget class="QSpinBox" name="spnSalineBolusVolumeRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -781,8 +765,8 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QSpinBox" name="spnBloodFlowRateRejectReason">
+       <item row="2" column="4">
+        <widget class="QSpinBox" name="spnRinsebackVolumeRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -800,22 +784,8 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="lblBloodFlowRate_2">
-         <property name="text">
-          <string>Treatment Modality</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="lblDialysateFlowRate">
-         <property name="text">
-          <string>Dialysate Flow Rate</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="1">
-        <widget class="QSpinBox" name="spnHeparinTypeRejectReason">
+       <item row="7" column="4">
+        <widget class="QSpinBox" name="spnDialysateTempRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -833,34 +803,52 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="1">
-        <widget class="QSpinBox" name="spnSalineBolusVolumeRejectReason">
+       <item row="2" 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="1" column="0">
-        <widget class="QLabel" name="lblBloodFlowRate_3">
+       <item row="0" column="0">
+        <widget class="QLabel" name="lblBloodFlowRate_2">
          <property name="text">
-          <string>HDF Treatment Mode</string>
+          <string>Treatment Modality</string>
          </property>
         </widget>
        </item>
-       <item row="8" column="1">
-        <widget class="QSpinBox" name="spnSodiumRejectReason">
+       <item row="5" column="4">
+        <widget class="QSpinBox" name="spnHeparinBolusVolumeRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -878,15 +866,8 @@
          </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="8" column="2">
-        <widget class="QLabel" name="lbSodiumValue">
+       <item row="11" column="5">
+        <widget class="QLabel" name="lbEstimatedTargetWeightValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -922,15 +903,8 @@
          </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="2">
-        <widget class="QLabel" name="lbDialysateFlowRateValue">
+       <item row="1" column="5">
+        <widget class="QLabel" name="lbPrimeDiscardVolumeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -966,41 +940,22 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="0">
-        <widget class="QLabel" name="lbDryBicarbConcentrate_3">
+       <item row="5" column="3">
+        <widget class="QLabel" name="lblHeparinBolusVolume">
          <property name="text">
-          <string>Bicarbonate</string>
+          <string>Heparin Bolus Volume</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="lblHeparinStopTime">
+       <item row="4" column="0">
+        <widget class="QLabel" name="lblTreatmentDuration">
          <property name="text">
-          <string>Heparin Delivery Duration</string>
+          <string>Treatment Duration</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
-        <widget class="QSpinBox" name="spnTreatmentModalityRejectReason">
-         <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="5">
-        <widget class="QLabel" name="lbBloodPressureMeasureIntervalValue">
+       <item row="10" column="2">
+        <widget class="QLabel" name="lbDialyzerTypeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1036,15 +991,15 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="3">
-        <widget class="QLabel" name="lblBloodPressureMeasureInterval_2">
+       <item row="9" column="3">
+        <widget class="QLabel" name="lblAcidConcentrate_2">
          <property name="text">
-          <string>Prime Discard Volume</string>
+          <string>UF Volume</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="4">
-        <widget class="QSpinBox" name="spnPrimeDiscardVolumeRejectReason">
+       <item row="4" column="1">
+        <widget class="QSpinBox" name="spnTreatmentDurationRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1062,8 +1017,27 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="5">
-        <widget class="QLabel" name="lbPrimeDiscardVolumeValue">
+       <item row="8" 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="7" column="2">
+        <widget class="QLabel" name="lbDryBicarbConcentrateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1099,15 +1073,8 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="3">
-        <widget class="QLabel" name="lblRinsebackVolume">
-         <property name="text">
-          <string>Rinseback Volume</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="4">
-        <widget class="QSpinBox" name="spnRinsebackVolumeRejectReason">
+       <item row="10" column="1">
+        <widget class="QSpinBox" name="spnDialyzerTypeRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1125,8 +1092,8 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="5">
-        <widget class="QLabel" name="lbRinsebackVolumeValue">
+       <item row="8" column="5">
+        <widget class="QLabel" name="lbAcidConcentrateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1162,15 +1129,8 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="3">
-        <widget class="QLabel" name="lblRinsebackVolume_2">
-         <property name="text">
-          <string>Hepatitis B Status</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="4">
-        <widget class="QSpinBox" name="spnHepatitisBStatusRejectReason">
+       <item row="3" column="1">
+        <widget class="QSpinBox" name="spnDialysateFlowRateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1188,8 +1148,15 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="5">
-        <widget class="QLabel" name="lbHepatitisBStatusValue">
+       <item row="2" column="0">
+        <widget class="QLabel" name="lblBloodFlowRate">
+         <property name="text">
+          <string>Blood Flow Rate</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="5">
+        <widget class="QLabel" name="lbHeparinBolusVolumeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1225,34 +1192,66 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="3">
-        <widget class="QLabel" name="lblRinsebackVolume_3">
+       <item row="2" column="3">
+        <widget class="QLabel" name="lblRinsebackVolume">
          <property name="text">
-          <string>Substitution Fluid </string>
+          <string>Rinseback Volume</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="4">
-        <widget class="QSpinBox" name="spnSubstitutionFluidRejectReason">
+       <item row="6" column="2">
+        <widget class="QLabel" name="lbHeparinTypeValue">
+         <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="4" column="5">
-        <widget class="QLabel" name="lbSubstitutionFluidValue">
+       <item row="0" column="3">
+        <widget class="QLabel" name="lblBloodPressureMeasureInterval">
+         <property name="text">
+          <string>Blood Pressure Measure Interval</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="3">
+        <widget class="QLabel" name="lblBloodPressureMeasureInterval_2">
+         <property name="text">
+          <string>Prime Discard Volume</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="2">
+        <widget class="QLabel" name="lbTreatmentModalityValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1288,15 +1287,8 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="3">
-        <widget class="QLabel" name="lblHeparinBolusVolume">
-         <property name="text">
-          <string>Heparin Bolus Volume</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="4">
-        <widget class="QSpinBox" name="spnHeparinBolusVolumeRejectReason">
+       <item row="0" column="1">
+        <widget class="QSpinBox" name="spnTreatmentModalityRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1314,8 +1306,8 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="5">
-        <widget class="QLabel" name="lbHeparinBolusVolumeValue">
+       <item row="4" column="2">
+        <widget class="QLabel" name="lbTreatmentDurationValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1351,15 +1343,27 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="3">
-        <widget class="QLabel" name="lblHeparinDispensingRate">
-         <property name="text">
-          <string>Heparin Dispensing Rate</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="6" column="4">
-        <widget class="QSpinBox" name="spnHeparinDispensingRateRejectReason">
+       <item row="2" column="1">
+        <widget class="QSpinBox" name="spnBloodFlowRateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1377,8 +1381,8 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="5">
-        <widget class="QLabel" name="lbHeparinDispensingRateValue">
+       <item row="10" column="5">
+        <widget class="QLabel" name="lbPreWeightValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1414,34 +1418,8 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="3">
-        <widget class="QLabel" name="lblDialysateTemp">
-         <property name="text">
-          <string>Dialysate Temp</string>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="4">
-        <widget class="QSpinBox" name="spnDialysateTempRejectReason">
-         <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="7" column="5">
-        <widget class="QLabel" name="lbDialysateTempValue">
+       <item row="2" column="2">
+        <widget class="QLabel" name="lbBloodFlowRateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1477,15 +1455,15 @@
          </property>
         </widget>
        </item>
-       <item row="8" column="3">
-        <widget class="QLabel" name="lblAcidConcentrate">
+       <item row="6" column="0">
+        <widget class="QLabel" name="lblHeparinType">
          <property name="text">
-          <string>Acid Concentrate Conversion Factor</string>
+          <string>Heparin Type</string>
          </property>
         </widget>
        </item>
-       <item row="8" column="4">
-        <widget class="QSpinBox" name="spnAcidConcentrateRejectReason">
+       <item row="3" column="4">
+        <widget class="QSpinBox" name="spnHepatitisBStatusRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1503,8 +1481,27 @@
          </property>
         </widget>
        </item>
-       <item row="8" column="5">
-        <widget class="QLabel" name="lbAcidConcentrateValue">
+       <item row="8" 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="8" column="2">
+        <widget class="QLabel" name="lbSodiumValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1540,34 +1537,29 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="3">
-        <widget class="QLabel" name="lblAcidConcentrate_2">
+       <item row="11" column="0">
+        <widget class="QLabel" name="lblSalineBolusVolume">
          <property name="text">
-          <string>UF Volume</string>
+          <string>Fluid Bolus Volume</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="4">
-        <widget class="QSpinBox" name="spnUFVolumeRejectReason">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
+       <item row="8" column="3">
+        <widget class="QLabel" name="lblAcidConcentrate">
+         <property name="text">
+          <string>Acid Concentrate Conversion Factor</string>
          </property>
-         <property name="minimum">
-          <number>-2147483647</number>
+        </widget>
+       </item>
+       <item row="10" column="3">
+        <widget class="QLabel" name="lblAcidConcentrate_3">
+         <property name="text">
+          <string>UF Pre-Weight</string>
          </property>
-         <property name="maximum">
-          <number>2147483647</number>
-         </property>
-         <property name="decimals" stdset="0">
-          <number>3</number>
-         </property>
         </widget>
        </item>
-       <item row="9" column="5">
-        <widget class="QLabel" name="lbUFVolueValue">
+       <item row="4" column="5">
+        <widget class="QLabel" name="lbSubstitutionFluidValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1603,22 +1595,22 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="3">
-        <widget class="QLabel" name="lblAcidConcentrate_3">
+       <item row="5" column="0">
+        <widget class="QLabel" name="lblHeparinStopTime">
          <property name="text">
-          <string>UF Pre-Weight</string>
+          <string>Heparin Delivery Duration</string>
          </property>
         </widget>
        </item>
-       <item row="11" column="3">
-        <widget class="QLabel" name="lblAcidConcentrate_4">
+       <item row="7" column="0">
+        <widget class="QLabel" name="lbDryBicarbConcentrate">
          <property name="text">
-          <string>UF Estimated Target Weight</string>
+          <string>Dry Bicarbonate Cartridge Size</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="4">
-        <widget class="QSpinBox" name="spnPreWeightRejectReason">
+       <item row="9" column="1">
+        <widget class="QSpinBox" name="spnBicarbonateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1636,8 +1628,8 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="4">
-        <widget class="QSpinBox" name="spnEstimatedTargetWeightRejectReason">
+       <item row="1" column="1">
+        <widget class="QSpinBox" name="spnHDFTreatmentModeRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1655,8 +1647,34 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="5">
-        <widget class="QLabel" name="lbPreWeightValue">
+       <item row="5" column="1">
+        <widget class="QSpinBox" name="spnHeparinStopTimeRejectReason">
+         <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="3" column="3">
+        <widget class="QLabel" name="lblRinsebackVolume_2">
+         <property name="text">
+          <string>Hepatitis B Status</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>
@@ -1692,8 +1710,53 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="5">
-        <widget class="QLabel" name="lbEstimatedTargetWeightValue">
+       <item row="1" column="4">
+        <widget class="QSpinBox" name="spnPrimeDiscardVolumeRejectReason">
+         <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="12" column="3">
+        <widget class="QLabel" name="lblBloodPressureMeasureInterval_3">
+         <property name="text">
+          <string>Acid Concentrate Index</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="12" column="5">
+        <widget class="QLabel" name="lbAcidConcentrateIndex">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>