Index: TD_Pre_Treatment/interface.ui
===================================================================
diff -u -r273cc1629b141c03f409e2c7736d1a0f7fe41bbd -r5834e4d46013d721aef8d1c81167321824403d0c
--- TD_Pre_Treatment/interface.ui	(.../interface.ui)	(revision 273cc1629b141c03f409e2c7736d1a0f7fe41bbd)
+++ TD_Pre_Treatment/interface.ui	(.../interface.ui)	(revision 5834e4d46013d721aef8d1c81167321824403d0c)
@@ -243,15 +243,45 @@
      </item>
      <item row="6" column="0">
       <layout class="QGridLayout" name="gridLayout">
-       <item row="0" column="0">
-        <widget class="QLabel" name="lblBloodFlowRate_2">
+       <item row="13" 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>
          <property name="text">
-          <string>Treatment Modality</string>
+          <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="5" column="4">
+        <widget class="QSpinBox" name="spnSubstitutionFluidRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -269,15 +299,36 @@
          </property>
         </widget>
        </item>
-       <item row="13" column="3">
-        <widget class="QLabel" name="lblAcidConcentrate_2">
+       <item row="5" column="3">
+        <widget class="QLabel" name="lblRinsebackVolume_3">
          <property name="text">
-          <string>UF Volume</string>
+          <string>Substitution Fluid </string>
          </property>
         </widget>
        </item>
-       <item row="9" column="5">
-        <widget class="QLabel" name="lbAcidConcentrateValue">
+       <item row="10" column="3">
+        <widget class="QLabel" name="lblAcidConcentrate_3">
+         <property name="text">
+          <string>UF Pre-Weight</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="0">
+        <widget class="QLabel" name="lbDryBicarbConcentrate">
+         <property name="text">
+          <string>Dry Bicarbonate Cartridge Size</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="lblHeparinStopTime">
+         <property name="text">
+          <string>Heparin Delivery Duration</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" colspan="2">
+        <widget class="QLabel" name="lbFinalConfirmation">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -313,8 +364,8 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="5">
-        <widget class="QLabel" name="lbHeparinDispensingRateValue">
+       <item row="8" column="2">
+        <widget class="QLabel" name="lbDryBicarbConcentrateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -350,27 +401,15 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="4">
-        <widget class="QSpinBox" name="spnEstimatedTargetWeightRejectReason">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
+       <item row="3" 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="0" column="2">
-        <widget class="QLabel" name="lbTreatmentModalityValue">
+       <item row="2" column="2">
+        <widget class="QLabel" name="lbHDFTreatmentModeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -406,27 +445,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="6" column="2">
-        <widget class="QLabel" name="lbHeparinTypeValue">
+       <item row="6" column="5">
+        <widget class="QLabel" name="lbHeparinBolusVolumeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -462,8 +482,8 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
-        <widget class="QSpinBox" name="spnTreatmentModalityRejectReason">
+       <item row="10" column="4">
+        <widget class="QSpinBox" name="spnPreWeightRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -481,8 +501,8 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="4">
-        <widget class="QSpinBox" name="spnPreWeightRejectReason">
+       <item row="7" column="4">
+        <widget class="QSpinBox" name="spnHeparinDispensingRateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -500,8 +520,8 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="2">
-        <widget class="QLabel" name="lbBicarbonateValue">
+       <item row="7" column="2">
+        <widget class="QLabel" name="lbHeparinTypeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -537,41 +557,8 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="3">
-        <widget class="QLabel" name="lblAcidConcentrate_4">
-         <property name="text">
-          <string>UF Estimated Target Weight</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="4">
-        <widget class="QSpinBox" name="spnRinsebackVolumeRejectReason">
-         <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="2" column="3">
-        <widget class="QLabel" name="lblRinsebackVolume_2">
-         <property name="text">
-          <string>Hepatitis B Status</string>
-         </property>
-        </widget>
-       </item>
-       <item row="10" column="5">
-        <widget class="QLabel" name="lbPreWeightValue">
+       <item row="11" column="2">
+        <widget class="QLabel" name="lbDialyzerTypeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -607,8 +594,8 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="1">
-        <widget class="QSpinBox" name="spnHeparinTypeRejectReason">
+       <item row="13" column="1">
+        <widget class="QSpinBox" name="spnSalineBolusVolumeRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -626,8 +613,8 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="5">
-        <widget class="QLabel" name="lbEstimatedTargetWeightValue">
+       <item row="3" column="2">
+        <widget class="QLabel" name="lbBloodFlowRateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -663,27 +650,15 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QSpinBox" name="spnHDFTreatmentModeRejectReason">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
+       <item row="13" column="3">
+        <widget class="QLabel" name="lblAcidConcentrate_2">
+         <property name="text">
+          <string>UF Volume</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="1" column="2">
-        <widget class="QLabel" name="lbHDFTreatmentModeValue">
+       <item row="8" column="5">
+        <widget class="QLabel" name="lbDialysateTempValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -719,8 +694,8 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="1">
-        <widget class="QSpinBox" name="spnHeparinStopTimeRejectReason">
+       <item row="4" column="1">
+        <widget class="QSpinBox" name="spnDialysateFlowRateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -738,22 +713,15 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="0">
-        <widget class="QLabel" name="lblHeparinType">
+       <item row="1" column="0">
+        <widget class="QLabel" name="lblBloodFlowRate_2">
          <property name="text">
-          <string>Heparin Type</string>
+          <string>Treatment Modality</string>
          </property>
         </widget>
        </item>
-       <item row="8" column="0">
-        <widget class="QLabel" name="lbDryBicarbConcentrate_2">
-         <property name="text">
-          <string>Sodium</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="2">
-        <widget class="QLabel" name="lbBloodFlowRateValue">
+       <item row="9" column="5">
+        <widget class="QLabel" name="lbAcidConcentrateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -789,8 +757,8 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="2">
-        <widget class="QLabel" name="lbSalineBolusVolumeValue">
+       <item row="10" column="5">
+        <widget class="QLabel" name="lbPreWeightValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -826,73 +794,22 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="3">
-        <widget class="QLabel" name="lblBloodPressureMeasureInterval_3">
+       <item row="0" column="0">
+        <widget class="QLabel" name="lblBloodPressureMeasureInterval_4">
          <property name="text">
-          <string>Acid Concentrate Index</string>
+          <string>Final Confirmation</string>
          </property>
         </widget>
        </item>
-       <item row="5" 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>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="5" column="0">
+        <widget class="QLabel" name="lblTreatmentDuration">
          <property name="text">
-          <string>-</string>
+          <string>Treatment Duration</string>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
         </widget>
        </item>
-       <item row="7" column="0">
-        <widget class="QLabel" name="lbDryBicarbConcentrate">
-         <property name="text">
-          <string>Dry Bicarbonate Cartridge Size</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="11" column="0">
-        <widget class="QLabel" name="lblSalineBolusVolume">
-         <property name="text">
-          <string>Fluid Bolus Volume</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QSpinBox" name="spnBloodFlowRateRejectReason">
+       <item row="11" column="4">
+        <widget class="QSpinBox" name="spnEstimatedTargetWeightRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -910,8 +827,8 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="4">
-        <widget class="QSpinBox" name="spnSubstitutionFluidRejectReason">
+       <item row="9" column="4">
+        <widget class="QSpinBox" name="spnAcidConcentrateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -929,8 +846,15 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="5">
-        <widget class="QLabel" name="lbRinsebackVolumeValue">
+       <item row="2" column="3">
+        <widget class="QLabel" name="lblRinsebackVolume">
+         <property name="text">
+          <string>Rinseback Volume</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="2">
+        <widget class="QLabel" name="lbSodiumValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -966,15 +890,15 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="lblBloodFlowRate">
+       <item row="10" column="0">
+        <widget class="QLabel" name="lbDryBicarbConcentrate_3">
          <property name="text">
-          <string>Blood Flow Rate</string>
+          <string>Bicarbonate</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="4">
-        <widget class="QSpinBox" name="spnAcidConcentrateIndextRejectReason">
+       <item row="2" column="4">
+        <widget class="QSpinBox" name="spnRinsebackVolumeRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -992,22 +916,53 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="3">
-        <widget class="QLabel" name="lblRinsebackVolume_3">
+       <item row="13" column="0">
+        <widget class="QLabel" name="lblSalineBolusVolume">
          <property name="text">
-          <string>Substitution Fluid </string>
+          <string>Fluid Bolus Volume</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="3">
-        <widget class="QLabel" name="lblAcidConcentrate">
-         <property name="text">
-          <string>Acid Concentrate Conversion Factor</string>
+       <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="10" column="2">
-        <widget class="QLabel" name="lbDialyzerTypeValue">
+       <item row="6" 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="5" column="2">
+        <widget class="QLabel" name="lbTreatmentDurationValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1043,15 +998,8 @@
          </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="5" column="2">
-        <widget class="QLabel" name="lbHeparinStopTimeValue">
+       <item row="4" column="2">
+        <widget class="QLabel" name="lbDialysateFlowRateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1087,8 +1035,8 @@
          </property>
         </widget>
        </item>
-       <item row="8" column="5">
-        <widget class="QLabel" name="lbDialysateTempValue">
+       <item row="5" column="5">
+        <widget class="QLabel" name="lbSubstitutionFluidValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1124,8 +1072,27 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="5">
-        <widget class="QLabel" name="lbAcidConcentrateIndex">
+       <item row="3" 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="1" column="5">
+        <widget class="QLabel" name="lbBloodPressureMeasureIntervalValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1161,8 +1128,8 @@
          </property>
         </widget>
        </item>
-       <item row="13" column="4">
-        <widget class="QSpinBox" name="spnUFVolumeRejectReason">
+       <item row="4" column="4">
+        <widget class="QSpinBox" name="spnAcidConcentrateIndextRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1180,8 +1147,22 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QSpinBox" name="spnDialysateFlowRateRejectReason">
+       <item row="1" column="3">
+        <widget class="QLabel" name="lblBloodPressureMeasureInterval">
+         <property name="text">
+          <string>Blood Pressure Measure Interval</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="lblBloodFlowRate_3">
+         <property name="text">
+          <string>HDF Treatment Mode</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="4">
+        <widget class="QSpinBox" name="spnBloodPressureMeasureIntervalRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1199,29 +1180,65 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="3">
-        <widget class="QLabel" name="lblHeparinBolusVolume">
-         <property name="text">
-          <string>Heparin Bolus Volume</string>
+       <item row="6" 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="0">
-        <widget class="QLabel" name="lblTreatmentDuration">
-         <property name="text">
-          <string>Treatment Duration</string>
+       <item row="2" 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="9" column="0">
-        <widget class="QLabel" name="lbDryBicarbConcentrate_3">
-         <property name="text">
-          <string>Bicarbonate</string>
+       <item row="5" column="1">
+        <widget class="QSpinBox" name="spnTreatmentDurationRejectReason">
+         <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="11" column="5">
+        <widget class="QLabel" name="lbEstimatedTargetWeightValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1257,15 +1274,27 @@
          </property>
         </widget>
        </item>
-       <item row="8" column="3">
-        <widget class="QLabel" name="lblDialysateTemp">
-         <property name="text">
-          <string>Dialysate Temp</string>
+       <item row="10" column="1">
+        <widget class="QSpinBox" name="spnBicarbonateRejectReason">
+         <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="5">
-        <widget class="QLabel" name="lbHeparinBolusVolumeValue">
+       <item row="2" column="5">
+        <widget class="QLabel" name="lbRinsebackVolumeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1301,8 +1330,8 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="4">
-        <widget class="QSpinBox" name="spnHeparinDispensingRateRejectReason">
+       <item row="8" column="1">
+        <widget class="QSpinBox" name="spnDryBicarbConcentrateRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1320,52 +1349,28 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="4">
-        <widget class="QSpinBox" name="spnAcidConcentrateRejectReason">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
+       <item row="7" column="0">
+        <widget class="QLabel" name="lblHeparinType">
+         <property name="text">
+          <string>Heparin Type</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="7" column="3">
-        <widget class="QLabel" name="lblHeparinDispensingRate">
+       <item row="6" column="3">
+        <widget class="QLabel" name="lblHeparinBolusVolume">
          <property name="text">
-          <string>Heparin Dispensing Rate</string>
+          <string>Heparin Bolus Volume</string>
          </property>
         </widget>
        </item>
-       <item row="11" column="1">
-        <widget class="QSpinBox" name="spnSalineBolusVolumeRejectReason">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
+       <item row="11" column="0">
+        <widget class="QLabel" name="lblDialyzerType">
+         <property name="text">
+          <string>Dialyzer Type</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="2" column="4">
+       <item row="3" column="4">
         <widget class="QSpinBox" name="spnHepatitisBStatusRejectReason">
          <property name="maximumSize">
           <size>
@@ -1384,46 +1389,8 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
-        <widget class="QSpinBox" name="spnTreatmentDurationRejectReason">
-         <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="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="8" column="2">
-        <widget class="QLabel" name="lbSodiumValue">
+       <item row="7" column="5">
+        <widget class="QLabel" name="lbHeparinDispensingRateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1459,15 +1426,29 @@
          </property>
         </widget>
        </item>
+       <item row="8" column="3">
+        <widget class="QLabel" name="lblDialysateTemp">
+         <property name="text">
+          <string>Dialysate Temp</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="3">
+        <widget class="QLabel" name="lblBloodPressureMeasureInterval_3">
+         <property name="text">
+          <string>Acid Concentrate Index</string>
+         </property>
+        </widget>
+       </item>
        <item row="3" column="0">
-        <widget class="QLabel" name="lblDialysateFlowRate">
+        <widget class="QLabel" name="lblBloodFlowRate">
          <property name="text">
-          <string>Dialysate Flow Rate</string>
+          <string>Blood Flow Rate</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="1">
-        <widget class="QSpinBox" name="spnDialyzerTypeRejectReason">
+       <item row="7" column="1">
+        <widget class="QSpinBox" name="spnHeparinTypeRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1485,8 +1466,8 @@
          </property>
         </widget>
        </item>
-       <item row="13" column="5">
-        <widget class="QLabel" name="lbUFVolueValue">
+       <item row="10" column="2">
+        <widget class="QLabel" name="lbBicarbonateValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1522,20 +1503,13 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="0">
-        <widget class="QLabel" name="lblDialyzerType">
+       <item row="9" column="3">
+        <widget class="QLabel" name="lblAcidConcentrate">
          <property name="text">
-          <string>Dialyzer Type</string>
+          <string>Acid Concentrate Conversion Factor</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="3">
-        <widget class="QLabel" name="lblAcidConcentrate_3">
-         <property name="text">
-          <string>UF Pre-Weight</string>
-         </property>
-        </widget>
-       </item>
        <item row="8" column="4">
         <widget class="QSpinBox" name="spnDialysateTempRejectReason">
          <property name="maximumSize">
@@ -1555,15 +1529,27 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="3">
-        <widget class="QLabel" name="lblRinsebackVolume">
-         <property name="text">
-          <string>Rinseback Volume</string>
+       <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="4" column="2">
-        <widget class="QLabel" name="lbTreatmentDurationValue">
+       <item row="6" column="2">
+        <widget class="QLabel" name="lbHeparinStopTimeValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1599,8 +1585,34 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="2">
-        <widget class="QLabel" name="lbDryBicarbConcentrateValue">
+       <item row="9" column="0">
+        <widget class="QLabel" name="lbDryBicarbConcentrate_2">
+         <property name="text">
+          <string>Sodium</string>
+         </property>
+        </widget>
+       </item>
+       <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="3" column="5">
+        <widget class="QLabel" name="lbHepatitisBStatusValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1636,27 +1648,15 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="1">
-        <widget class="QSpinBox" name="spnBicarbonateRejectReason">
-         <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>
-         </property>
-         <property name="maximum">
-          <number>2147483647</number>
-         </property>
-         <property name="decimals" stdset="0">
-          <number>3</number>
-         </property>
         </widget>
        </item>
-       <item row="3" column="2">
-        <widget class="QLabel" name="lbDialysateFlowRateValue">
+       <item row="1" column="2">
+        <widget class="QLabel" name="lbTreatmentModalityValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1692,27 +1692,8 @@
          </property>
         </widget>
        </item>
-       <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="2" column="5">
-        <widget class="QLabel" name="lbHepatitisBStatusValue">
+       <item row="4" column="5">
+        <widget class="QLabel" name="lbAcidConcentrateIndex">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -1748,15 +1729,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="4">
-        <widget class="QSpinBox" name="spnFinalConfirmationRejectReason">
+       <item row="1" column="1">
+        <widget class="QSpinBox" name="spnTreatmentModalityRejectReason">
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -1774,15 +1748,22 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="3">
-        <widget class="QLabel" name="lblBloodPressureMeasureInterval_4">
+       <item row="4" column="0">
+        <widget class="QLabel" name="lblDialysateFlowRate">
          <property name="text">
-          <string>Final Confirmation</string>
+          <string>Dialysate Flow Rate</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="5">
-        <widget class="QLabel" name="lbFinalConfirmation">
+       <item row="7" column="3">
+        <widget class="QLabel" name="lblHeparinDispensingRate">
+         <property name="text">
+          <string>Heparin Dispensing Rate</string>
+         </property>
+        </widget>
+       </item>
+       <item row="13" column="5">
+        <widget class="QLabel" name="lbUFVolueValue">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
Index: TD_Pre_Treatment/loader.py
===================================================================
diff -u -r273cc1629b141c03f409e2c7736d1a0f7fe41bbd -r5834e4d46013d721aef8d1c81167321824403d0c
--- TD_Pre_Treatment/loader.py	(.../loader.py)	(revision 273cc1629b141c03f409e2c7736d1a0f7fe41bbd)
+++ TD_Pre_Treatment/loader.py	(.../loader.py)	(revision 5834e4d46013d721aef8d1c81167321824403d0c)
@@ -99,7 +99,6 @@
         self.spnPreWeightRejectReason                       = self.find_widget(QtWidgets.QSpinBox , 'spnPreWeightRejectReason'                      )
         self.spnEstimatedTargetWeightRejectReason           = self.find_widget(QtWidgets.QSpinBox , 'spnEstimatedTargetWeightRejectReason'          )
         self.spnAcidConcentrateIndextRejectReason           = self.find_widget(QtWidgets.QSpinBox , 'spnAcidConcentrateIndextRejectReason'          )
-        self.spnFinalConfirmationRejectReason               = self.find_widget(QtWidgets.QSpinBox , 'spnFinalConfirmationRejectReason'              )
 
         self.lbTreatmentModality                            = self.find_widget(QtWidgets.QLabel , 'lbTreatmentModalityValue'                        )
         self.lbHDFTreatmentMode                             = self.find_widget(QtWidgets.QLabel , 'lbHDFTreatmentModeValue'                         )
@@ -202,7 +201,6 @@
             self.spnRinsebackVolumeRejectReason                 .value() +
             self.spnHepatitisBStatusRejectReason                .value() +
             self.spnAcidConcentrateIndextRejectReason           .value() +
-            self.spnFinalConfirmationRejectReason               .value() +
             self.spnSubstitutionFluidRejectReason               .value() +
             self.spnHeparinBolusVolumeRejectReason              .value() +
             self.spnHeparinDispensingRateRejectReason           .value() +
@@ -231,7 +229,6 @@
             self.spnRinsebackVolumeRejectReason                 .value(),
             self.spnHepatitisBStatusRejectReason                .value(),
             self.spnAcidConcentrateIndextRejectReason           .value(),
-            self.spnFinalConfirmationRejectReason               .value(),
             self.spnSubstitutionFluidRejectReason               .value(),
             self.spnHeparinBolusVolumeRejectReason              .value(),
             self.spnHeparinDispensingRateRejectReason           .value(),
@@ -260,7 +257,6 @@
         self.spnRinsebackVolumeRejectReason                 .setValue(0)
         self.spnHepatitisBStatusRejectReason                .setValue(0)
         self.spnAcidConcentrateIndextRejectReason           .setValue(0)
-        self.spnFinalConfirmationRejectReason               .setValue(0)
         self.spnSubstitutionFluidRejectReason               .setValue(0)
         self.spnHeparinBolusVolumeRejectReason              .setValue(0)
         self.spnHeparinDispensingRateRejectReason           .setValue(0)
@@ -303,6 +299,7 @@
         """
         message = message['message']
         self.index = MsgFieldPositions.START_POS_FIELD_1
+        self.lbFinalConfirmation                .setText(str(self.getIntValue(message)))
         self.lbTreatmentModality                .setText(str(self.getIntValue(message)))
         self.lbHDFTreatmentMode                 .setText(str(self.getIntValue(message)))
         self.lbBloodFlowRate                    .setText(str(self.getIntValue(message)))
@@ -319,7 +316,6 @@
         self.lbRinsebackVolume                  .setText(str(self.getIntValue(message)))
         self.lbHepatitisBStatus                 .setText(str(self.getIntValue(message)))
         self.lbAcidConcentrateIndex             .setText(str(self.getIntValue(message)))
-        self.lbFinalConfirmation                .setText(str(self.getIntValue(message)))
         self.lbSubstitutionFluid                .setText(f"{self.getFloatValue(message):.1f}")
         self.lbHeparinBolusVolume               .setText(f"{self.getFloatValue(message):.1f}")
         self.lbHeparinDispensingRate            .setText(f"{self.getFloatValue(message):.1f}")