Index: TD_Pre_Treatment/interface.ui
===================================================================
diff -u -rf26787d0dbc6eafc75668a32c9a6e1d57afac65e -r07140fe219f4f6b24d08c70325fe98cb3568e628
--- TD_Pre_Treatment/interface.ui	(.../interface.ui)	(revision f26787d0dbc6eafc75668a32c9a6e1d57afac65e)
+++ TD_Pre_Treatment/interface.ui	(.../interface.ui)	(revision 07140fe219f4f6b24d08c70325fe98cb3568e628)
@@ -217,52 +217,34 @@
      </item>
      <item row="4" column="0">
       <layout class="QGridLayout" name="gridLayout">
-       <item row="3" 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>
+       <item row="7" column="1">
+        <widget class="QSpinBox" name="spnDryBicarbConcentrateRejectReason">
          <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="7" column="3">
-        <widget class="QLabel" name="lblDialysateTemp">
+       <item row="10" column="3">
+        <widget class="QLabel" name="lblAcidConcentrate_4">
          <property name="text">
-          <string>Dialysate Temp</string>
+          <string>UF Estimated Target Weight</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="4">
-        <widget class="QSpinBox" name="spnUFVolumeRejectReason">
+       <item row="12" column="4">
+        <widget class="QSpinBox" name="spnAcidConcentrateIndextRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -280,29 +262,27 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="3">
-        <widget class="QLabel" name="lblAcidConcentrate_4">
-         <property name="text">
-          <string>UF Estimated Target Weight</string>
+       <item row="4" column="4">
+        <widget class="QSpinBox" name="spnHeparinBolusVolumeRejectReason">
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
          </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="lblBloodFlowRate_3">
-         <property name="text">
-          <string>HDF Treatment Mode</string>
+         <property name="minimum">
+          <number>-2147483647</number>
          </property>
-        </widget>
-       </item>
-       <item row="6" column="3">
-        <widget class="QLabel" name="lblHeparinDispensingRate">
-         <property name="text">
-          <string>Heparin Dispensing Rate</string>
+         <property name="maximum">
+          <number>2147483647</number>
          </property>
+         <property name="decimals" stdset="0">
+          <number>3</number>
+         </property>
         </widget>
        </item>
-       <item row="6" column="5">
-        <widget class="QLabel" name="lbHeparinDispensingRateValue">
+       <item row="4" column="2">
+        <widget class="QLabel" name="lbTreatmentDurationValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -338,34 +318,29 @@
          </property>
         </widget>
        </item>
-       <item row="8" column="0">
-        <widget class="QLabel" name="lbDryBicarbConcentrate_2">
+       <item row="5" column="3">
+        <widget class="QLabel" name="lblHeparinDispensingRate">
          <property name="text">
-          <string>Sodium</string>
+          <string>Heparin Dispensing Rate</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="4">
-        <widget class="QSpinBox" name="spnSubstitutionFluidRejectReason">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
+       <item row="10" column="0">
+        <widget class="QLabel" name="lblDialyzerType">
+         <property name="text">
+          <string>Dialyzer Type</string>
          </property>
-         <property name="minimum">
-          <number>-2147483647</number>
+        </widget>
+       </item>
+       <item row="7" column="0">
+        <widget class="QLabel" name="lbDryBicarbConcentrate">
+         <property name="text">
+          <string>Dry Bicarbonate Cartridge Size</string>
          </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="3" column="1">
+        <widget class="QSpinBox" name="spnDialysateFlowRateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -383,8 +358,8 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="1">
-        <widget class="QSpinBox" name="spnDryBicarbConcentrateRejectReason">
+       <item row="1" column="4">
+        <widget class="QSpinBox" name="spnRinsebackVolumeRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -402,8 +377,8 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="5">
-        <widget class="QLabel" name="lbDialysateTempValue">
+       <item row="5" column="5">
+        <widget class="QLabel" name="lbHeparinDispensingRateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -439,45 +414,27 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="2">
-        <widget class="QLabel" name="lbDialysateFlowRateValue">
-         <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="12" column="1">
+        <widget class="QSpinBox" name="spnSalineBolusVolumeRejectReason">
          <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="9" column="5">
-        <widget class="QLabel" name="lbUFVolueValue">
+       <item row="7" column="2">
+        <widget class="QLabel" name="lbDryBicarbConcentrateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -513,52 +470,27 @@
          </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="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="8" column="1">
+        <widget class="QSpinBox" name="spnSodiumRejectReason">
          <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="0" column="4">
-        <widget class="QSpinBox" name="spnBloodPressureMeasureIntervalRejectReason">
+       <item row="6" column="4">
+        <widget class="QSpinBox" name="spnDialysateTempRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -576,8 +508,8 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="2">
-        <widget class="QLabel" name="lbSalineBolusVolumeValue">
+       <item row="10" column="2">
+        <widget class="QLabel" name="lbDialyzerTypeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -613,8 +545,8 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="1">
-        <widget class="QSpinBox" name="spnHeparinTypeRejectReason">
+       <item row="7" column="4">
+        <widget class="QSpinBox" name="spnAcidConcentrateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -632,8 +564,8 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="4">
-        <widget class="QSpinBox" name="spnPreWeightRejectReason">
+       <item row="4" column="1">
+        <widget class="QSpinBox" name="spnTreatmentDurationRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -651,103 +583,34 @@
          </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>
-         </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="8" column="3">
+        <widget class="QLabel" name="lblAcidConcentrate_2">
          <property name="text">
-          <string>-</string>
+          <string>UF Volume</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>
+       <item row="10" column="1">
+        <widget class="QSpinBox" name="spnDialyzerTypeRejectReason">
          <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="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">
+       <item row="8" column="4">
+        <widget class="QSpinBox" name="spnUFVolumeRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -765,8 +628,8 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="4">
-        <widget class="QSpinBox" name="spnRinsebackVolumeRejectReason">
+       <item row="3" column="4">
+        <widget class="QSpinBox" name="spnSubstitutionFluidRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -784,8 +647,8 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="4">
-        <widget class="QSpinBox" name="spnDialysateTempRejectReason">
+       <item row="5" column="1">
+        <widget class="QSpinBox" name="spnHeparinStopTimeRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -803,8 +666,8 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="5">
-        <widget class="QLabel" name="lbRinsebackVolumeValue">
+       <item row="9" column="5">
+        <widget class="QLabel" name="lbPreWeightValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -840,15 +703,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="5" column="4">
-        <widget class="QSpinBox" name="spnHeparinBolusVolumeRejectReason">
+       <item row="2" column="4">
+        <widget class="QSpinBox" name="spnHepatitisBStatusRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -866,7 +722,7 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="5">
+       <item row="10" column="5">
         <widget class="QLabel" name="lbEstimatedTargetWeightValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
@@ -903,59 +759,22 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="5">
-        <widget class="QLabel" name="lbPrimeDiscardVolumeValue">
-         <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="6" 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="5" column="3">
-        <widget class="QLabel" name="lblHeparinBolusVolume">
+       <item row="8" column="0">
+        <widget class="QLabel" name="lbDryBicarbConcentrate_2">
          <property name="text">
-          <string>Heparin Bolus Volume</string>
+          <string>Sodium</string>
          </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="10" column="2">
-        <widget class="QLabel" name="lbDialyzerTypeValue">
+       <item row="7" column="5">
+        <widget class="QLabel" name="lbAcidConcentrateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -991,15 +810,22 @@
          </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="9" column="3">
-        <widget class="QLabel" name="lblAcidConcentrate_2">
+        <widget class="QLabel" name="lblAcidConcentrate_3">
          <property name="text">
-          <string>UF Volume</string>
+          <string>UF Pre-Weight</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
-        <widget class="QSpinBox" name="spnTreatmentDurationRejectReason">
+       <item row="2" column="1">
+        <widget class="QSpinBox" name="spnBloodFlowRateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1017,8 +843,8 @@
          </property>
         </widget>
        </item>
-       <item row="8" column="4">
-        <widget class="QSpinBox" name="spnAcidConcentrateRejectReason">
+       <item row="9" column="1">
+        <widget class="QSpinBox" name="spnBicarbonateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1036,8 +862,15 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="2">
-        <widget class="QLabel" name="lbDryBicarbConcentrateValue">
+       <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">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1073,27 +906,22 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="1">
-        <widget class="QSpinBox" name="spnDialyzerTypeRejectReason">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
+       <item row="0" column="3">
+        <widget class="QLabel" name="lblBloodPressureMeasureInterval">
+         <property name="text">
+          <string>Blood Pressure Measure Interval</string>
          </property>
-         <property name="minimum">
-          <number>-2147483647</number>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="lblDialysateFlowRate">
+         <property name="text">
+          <string>Dialysate Flow Rate</string>
          </property>
-         <property name="maximum">
-          <number>2147483647</number>
-         </property>
-         <property name="decimals" stdset="0">
-          <number>3</number>
-         </property>
         </widget>
        </item>
-       <item row="8" column="5">
-        <widget class="QLabel" name="lbAcidConcentrateValue">
+       <item row="8" column="2">
+        <widget class="QLabel" name="lbSodiumValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1129,8 +957,15 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QSpinBox" name="spnDialysateFlowRateRejectReason">
+       <item row="4" column="3">
+        <widget class="QLabel" name="lblHeparinBolusVolume">
+         <property name="text">
+          <string>Heparin Bolus Volume</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="4">
+        <widget class="QSpinBox" name="spnBloodPressureMeasureIntervalRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1148,15 +983,15 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="lblBloodFlowRate">
+       <item row="2" column="3">
+        <widget class="QLabel" name="lblRinsebackVolume_2">
          <property name="text">
-          <string>Blood Flow Rate</string>
+          <string>Hepatitis B Status</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="5">
-        <widget class="QLabel" name="lbHeparinBolusVolumeValue">
+       <item row="0" column="5">
+        <widget class="QLabel" name="lbBloodPressureMeasureIntervalValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1192,15 +1027,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="6" column="2">
-        <widget class="QLabel" name="lbHeparinTypeValue">
+       <item row="8" column="5">
+        <widget class="QLabel" name="lbUFVolueValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1236,18 +1064,23 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="3">
-        <widget class="QLabel" name="lblBloodPressureMeasureInterval">
-         <property name="text">
-          <string>Blood Pressure Measure Interval</string>
+       <item row="6" column="1">
+        <widget class="QSpinBox" name="spnHeparinTypeRejectReason">
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
          </property>
-        </widget>
-       </item>
-       <item row="1" column="3">
-        <widget class="QLabel" name="lblBloodPressureMeasureInterval_2">
-         <property name="text">
-          <string>Prime Discard Volume</string>
+         <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">
@@ -1306,8 +1139,8 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="2">
-        <widget class="QLabel" name="lbTreatmentDurationValue">
+       <item row="1" column="5">
+        <widget class="QLabel" name="lbRinsebackVolumeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1343,8 +1176,8 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="4">
-        <widget class="QSpinBox" name="spnEstimatedTargetWeightRejectReason">
+       <item row="9" column="4">
+        <widget class="QSpinBox" name="spnPreWeightRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1362,27 +1195,45 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QSpinBox" name="spnBloodFlowRateRejectReason">
+       <item row="3" column="5">
+        <widget class="QLabel" name="lbSubstitutionFluidValue">
+         <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="5">
-        <widget class="QLabel" name="lbPreWeightValue">
+       <item row="3" column="2">
+        <widget class="QLabel" name="lbDialysateFlowRateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1418,8 +1269,15 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="2">
-        <widget class="QLabel" name="lbBloodFlowRateValue">
+       <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">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1455,15 +1313,15 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="0">
-        <widget class="QLabel" name="lblHeparinType">
+       <item row="0" column="0">
+        <widget class="QLabel" name="lblBloodFlowRate_2">
          <property name="text">
-          <string>Heparin Type</string>
+          <string>Treatment Modality</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="4">
-        <widget class="QSpinBox" name="spnHepatitisBStatusRejectReason">
+       <item row="10" column="4">
+        <widget class="QSpinBox" name="spnEstimatedTargetWeightRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1481,27 +1339,8 @@
          </property>
         </widget>
        </item>
-       <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">
+       <item row="12" column="2">
+        <widget class="QLabel" name="lbSalineBolusVolumeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1537,29 +1376,59 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="0">
-        <widget class="QLabel" name="lblSalineBolusVolume">
+       <item row="3" column="3">
+        <widget class="QLabel" name="lblRinsebackVolume_3">
          <property name="text">
-          <string>Fluid Bolus Volume</string>
+          <string>Substitution Fluid </string>
          </property>
         </widget>
        </item>
-       <item row="8" column="3">
-        <widget class="QLabel" name="lblAcidConcentrate">
+       <item row="12" column="0">
+        <widget class="QLabel" name="lblSalineBolusVolume">
          <property name="text">
-          <string>Acid Concentrate Conversion Factor</string>
+          <string>Fluid Bolus Volume</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="3">
-        <widget class="QLabel" name="lblAcidConcentrate_3">
+       <item row="2" column="2">
+        <widget class="QLabel" name="lbBloodFlowRateValue">
+         <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>UF Pre-Weight</string>
+          <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="6" column="5">
+        <widget class="QLabel" name="lbDialysateTempValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1595,60 +1464,96 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="lblHeparinStopTime">
+       <item row="9" column="0">
+        <widget class="QLabel" name="lbDryBicarbConcentrate_3">
          <property name="text">
-          <string>Heparin Delivery Duration</string>
+          <string>Bicarbonate</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="0">
-        <widget class="QLabel" name="lbDryBicarbConcentrate">
+       <item row="2" column="0">
+        <widget class="QLabel" name="lblBloodFlowRate">
          <property name="text">
-          <string>Dry Bicarbonate Cartridge Size</string>
+          <string>Blood Flow Rate</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="1">
-        <widget class="QSpinBox" name="spnBicarbonateRejectReason">
+       <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="1" column="1">
-        <widget class="QSpinBox" name="spnHDFTreatmentModeRejectReason">
+       <item row="12" column="5">
+        <widget class="QLabel" name="lbAcidConcentrateIndex">
+         <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">
-        <widget class="QSpinBox" name="spnHeparinStopTimeRejectReason">
+       <item row="1" column="1">
+        <widget class="QSpinBox" name="spnHDFTreatmentModeRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1666,15 +1571,29 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="3">
-        <widget class="QLabel" name="lblRinsebackVolume_2">
+       <item row="1" column="3">
+        <widget class="QLabel" name="lblRinsebackVolume">
          <property name="text">
-          <string>Hepatitis B Status</string>
+          <string>Rinseback Volume</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="5">
-        <widget class="QLabel" name="lbBloodPressureMeasureIntervalValue">
+       <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>
@@ -1710,34 +1629,45 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="4">
-        <widget class="QSpinBox" name="spnPrimeDiscardVolumeRejectReason">
+       <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>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="12" column="3">
-        <widget class="QLabel" name="lblBloodPressureMeasureInterval_3">
          <property name="text">
-          <string>Acid Concentrate Index</string>
+          <string>-</string>
          </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
         </widget>
        </item>
-       <item row="12" column="4">
-        <widget class="QSpinBox" name="spnAcidConcentrateIndextRejectReason">
+       <item row="5" column="4">
+        <widget class="QSpinBox" name="spnHeparinDispensingRateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1755,8 +1685,8 @@
          </property>
         </widget>
        </item>
-       <item row="12" column="5">
-        <widget class="QLabel" name="lbAcidConcentrateIndex">
+       <item row="9" column="2">
+        <widget class="QLabel" name="lbBicarbonateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1792,6 +1722,13 @@
          </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>
       </layout>
      </item>
      <item row="5" column="0">
Index: TD_Pre_Treatment/loader.py
===================================================================
diff -u -r9567d422b5fd3ce640b2af9672db7bb91b17398e -r07140fe219f4f6b24d08c70325fe98cb3568e628
--- TD_Pre_Treatment/loader.py	(.../loader.py)	(revision 9567d422b5fd3ce640b2af9672db7bb91b17398e)
+++ TD_Pre_Treatment/loader.py	(.../loader.py)	(revision 07140fe219f4f6b24d08c70325fe98cb3568e628)
@@ -88,7 +88,6 @@
         self.spnDialyzerTypeRejectReason                    = self.find_widget(QtWidgets.QSpinBox , 'spnDialyzerTypeRejectReason'                   )
         self.spnSalineBolusVolumeRejectReason               = self.find_widget(QtWidgets.QSpinBox , 'spnSalineBolusVolumeRejectReason'              )
         self.spnBloodPressureMeasureIntervalRejectReason    = self.find_widget(QtWidgets.QSpinBox , 'spnBloodPressureMeasureIntervalRejectReason'   )
-        self.spnPrimeDiscardVolumeRejectReason              = self.find_widget(QtWidgets.QSpinBox , 'spnPrimeDiscardVolumeRejectReason'             )
         self.spnRinsebackVolumeRejectReason                 = self.find_widget(QtWidgets.QSpinBox , 'spnRinsebackVolumeRejectReason'                )
         self.spnHepatitisBStatusRejectReason                = self.find_widget(QtWidgets.QSpinBox , 'spnHepatitisBStatusRejectReason'               )
         self.spnSubstitutionFluidRejectReason               = self.find_widget(QtWidgets.QSpinBox , 'spnSubstitutionFluidRejectReason'              )
@@ -114,7 +113,6 @@
         self.lbDialyzerType                                 = self.find_widget(QtWidgets.QLabel , 'lbDialyzerTypeValue'                             )
         self.lbSalineBolusVolume                            = self.find_widget(QtWidgets.QLabel , 'lbSalineBolusVolumeValue'                        )
         self.lbBloodPressureMeasureInterval                 = self.find_widget(QtWidgets.QLabel , 'lbBloodPressureMeasureIntervalValue'             )
-        self.lbPrimeDiscardVolume                           = self.find_widget(QtWidgets.QLabel , 'lbPrimeDiscardVolumeValue'                       )
         self.lbRinsebackVolume                              = self.find_widget(QtWidgets.QLabel , 'lbRinsebackVolumeValue'                          )
         self.lbHepatitisBStatus                             = self.find_widget(QtWidgets.QLabel , 'lbHepatitisBStatusValue'                         )
         self.lbSubstitutionFluid                            = self.find_widget(QtWidgets.QLabel , 'lbSubstitutionFluidValue'                        )
@@ -199,7 +197,6 @@
             self.spnDialyzerTypeRejectReason                    .value() +
             self.spnSalineBolusVolumeRejectReason               .value() +
             self.spnBloodPressureMeasureIntervalRejectReason    .value() +
-            self.spnPrimeDiscardVolumeRejectReason              .value() +
             self.spnRinsebackVolumeRejectReason                 .value() +
             self.spnHepatitisBStatusRejectReason                .value() +
             self.spnSubstitutionFluidRejectReason               .value() +
@@ -228,7 +225,6 @@
             self.spnDialyzerTypeRejectReason                    .value(),
             self.spnSalineBolusVolumeRejectReason               .value(),
             self.spnBloodPressureMeasureIntervalRejectReason    .value(),
-            self.spnPrimeDiscardVolumeRejectReason              .value(),
             self.spnRinsebackVolumeRejectReason                 .value(),
             self.spnHepatitisBStatusRejectReason                .value(),
             self.spnSubstitutionFluidRejectReason               .value(),
@@ -257,7 +253,6 @@
         self.spnDialyzerTypeRejectReason                    .setValue(0)
         self.spnSalineBolusVolumeRejectReason               .setValue(0)
         self.spnBloodPressureMeasureIntervalRejectReason    .setValue(0)
-        self.spnPrimeDiscardVolumeRejectReason              .setValue(0)
         self.spnRinsebackVolumeRejectReason                 .setValue(0)
         self.spnHepatitisBStatusRejectReason                .setValue(0)
         self.spnSubstitutionFluidRejectReason               .setValue(0)
@@ -315,7 +310,6 @@
         self.lbDialyzerType                     .setText(str(self.getIntValue(message)))
         self.lbSalineBolusVolume                .setText(str(self.getIntValue(message)))
         self.lbBloodPressureMeasureInterval     .setText(str(self.getIntValue(message)))
-        self.lbPrimeDiscardVolume               .setText(str(self.getIntValue(message)))
         self.lbRinsebackVolume                  .setText(str(self.getIntValue(message)))
         self.lbHepatitisBStatus                 .setText(str(self.getIntValue(message)))
         self.lbSubstitutionFluid                .setText(f"{self.getFloatValue(message):.1f}")
@@ -336,4 +330,4 @@
                 
     def getFloatValue (self, message):
         val,self.index = conversions.bytearray_to_float( message, self.index)
-        return val
\ No newline at end of file
+        return val