Index: TD_TreatmentAdjustmentsSetPoints/interface.ui
===================================================================
diff -u -r5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd -r6f56b7d7d671e97678391e16a6a1fb08ab329b9e
--- TD_TreatmentAdjustmentsSetPoints/interface.ui	(.../interface.ui)	(revision 5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd)
+++ TD_TreatmentAdjustmentsSetPoints/interface.ui	(.../interface.ui)	(revision 6f56b7d7d671e97678391e16a6a1fb08ab329b9e)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>743</width>
-    <height>297</height>
+    <width>752</width>
+    <height>359</height>
    </rect>
   </property>
   <property name="maximumSize">
@@ -24,23 +24,8 @@
   <property name="windowTitle">
    <string>&amp;3 Treatment/Adjustments/&amp;5 Set Points</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_13">
-   <property name="spacing">
-    <number>5</number>
-   </property>
-   <property name="leftMargin">
-    <number>5</number>
-   </property>
-   <property name="topMargin">
-    <number>5</number>
-   </property>
-   <property name="rightMargin">
-    <number>5</number>
-   </property>
-   <property name="bottomMargin">
-    <number>5</number>
-   </property>
-   <item>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout_9">
      <property name="spacing">
       <number>2</number>
@@ -130,29 +115,77 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="1">
+           <widget class="QLabel" name="lbSetPointsReqDialysateFlowRate">
+            <property name="frameShape">
+             <enum>QFrame::Box</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Sunken</enum>
+            </property>
+            <property name="text">
+             <string>--</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+           </widget>
+          </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label_9">
             <property name="text">
              <string>Dialysate Temperature (°C)</string>
             </property>
            </widget>
           </item>
+          <item row="2" column="1">
+           <widget class="QLabel" name="lbSetPointsReqDialysateTemperature">
+            <property name="frameShape">
+             <enum>QFrame::Box</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Sunken</enum>
+            </property>
+            <property name="text">
+             <string>--</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+           </widget>
+          </item>
           <item row="3" column="0">
            <widget class="QLabel" name="label_26">
             <property name="text">
              <string>Acid Concentrate</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="0">
+          <item row="3" column="1">
+           <widget class="QLabel" name="lbSetPointsReqAcidConcentrate">
+            <property name="frameShape">
+             <enum>QFrame::Box</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Sunken</enum>
+            </property>
+            <property name="text">
+             <string>--</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
            <widget class="QLabel" name="label_27">
             <property name="text">
              <string>Bicarb Concentrate</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QLabel" name="lbSetPointsReqDialysateFlowRate">
+          <item row="5" column="1">
+           <widget class="QLabel" name="lbSetPointsReqBicarbConcentrate">
             <property name="frameShape">
              <enum>QFrame::Box</enum>
             </property>
@@ -167,8 +200,15 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QLabel" name="lbSetPointsReqDialysateTemperature">
+          <item row="6" column="0">
+           <widget class="QLabel" name="label_29">
+            <property name="text">
+             <string>Treatment Modality</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1">
+           <widget class="QLabel" name="lbSetPointsReqTreatmentModality">
             <property name="frameShape">
              <enum>QFrame::Box</enum>
             </property>
@@ -183,8 +223,15 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
-           <widget class="QLabel" name="lbSetPointsReqAcidConcentrate">
+          <item row="7" column="0">
+           <widget class="QLabel" name="label_30">
+            <property name="text">
+             <string>Hepatitis</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="1">
+           <widget class="QLabel" name="lbSetPointsReqHepatitis">
             <property name="frameShape">
              <enum>QFrame::Box</enum>
             </property>
@@ -199,8 +246,61 @@
             </property>
            </widget>
           </item>
+          <item row="8" column="0">
+           <widget class="QLabel" name="label_31">
+            <property name="text">
+             <string>Sodium</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="1">
+           <widget class="QLabel" name="lbSetPointsReqSodium">
+            <property name="frameShape">
+             <enum>QFrame::Box</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Sunken</enum>
+            </property>
+            <property name="text">
+             <string>--</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="9" column="0">
+           <widget class="QLabel" name="label_32">
+            <property name="text">
+             <string>Bicarbonate</string>
+            </property>
+           </widget>
+          </item>
+          <item row="9" column="1">
+           <widget class="QLabel" name="lbSetPointsReqBicarbonate">
+            <property name="frameShape">
+             <enum>QFrame::Box</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Sunken</enum>
+            </property>
+            <property name="text">
+             <string>--</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="label_33">
+            <property name="text">
+             <string>Acid Concentrate Conversion Factor</string>
+            </property>
+           </widget>
+          </item>
           <item row="4" column="1">
-           <widget class="QLabel" name="lbSetPointsReqBicarbConcentrate">
+           <widget class="QLabel" name="lbSetPointsReqAcidConcentrateFactor">
             <property name="frameShape">
              <enum>QFrame::Box</enum>
             </property>
@@ -319,7 +419,7 @@
      </item>
     </layout>
    </item>
-   <item>
+   <item row="0" column="1">
     <layout class="QVBoxLayout" name="verticalLayout_5">
      <property name="spacing">
       <number>2</number>