Index: sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml
===================================================================
diff -u -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 -r0975a67dd4e4673b9a7b226bfea02cbfa489c418
--- sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml	(.../WaterSampleDialysatePage.qml)	(revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84)
+++ sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml	(.../WaterSampleDialysatePage.qml)	(revision 0975a67dd4e4673b9a7b226bfea02cbfa489c418)
@@ -10,13 +10,11 @@
     anchors.fill: parent
 
     contentItem : Item { id: _content
-        readonly property int cellWidth : width / 2 - ( _row.spacing / 2 ) // 2 items for the row and subtract spacing for widths
         Text {  id: _description
             anchors.top         : parent.top
             text                : qsTr("Test dialysate sample per your clinic's instructions.\n\nBased on facility policies, pH, conductivity, and temperature may be tested at this time")
             color               : Colors.offWhite
             font.pixelSize      : Fonts.fontPixelNotification
-            font.weight         : Font.Light
             width               : _content.width
             height              : implicitHeight
             horizontalAlignment : Text.AlignHCenter
@@ -26,15 +24,13 @@
         Row { id: _row
             anchors.top         : _description.bottom
             anchors.topMargin   : Variables.defaultMargin * 4
-            spacing             : Variables.defaultMargin * 2
+            spacing             : Variables.defaultMargin * 3
 
             Column { id: _leftColumn
-                spacing     : Variables.defaultMargin
+                spacing     : 15
 
                 LabelUnitContainer { id: _acidConcentrateContainer
                     objectName          : "_acidConcentrateContainer"
-                    width               : _content.cellWidth
-                    height              : Variables.adjustmentLabelUnitContainerHeight
                     text                : qsTr("Acid Concentrate")
                     contentItem : Text {  id: _acidConcentrateText
                         anchors.centerIn: parent
@@ -47,8 +43,6 @@
 
                 LabelUnitContainer { id: _bicarbonateCartrideSizeContainer
                     objectName          : "_bicarbonateCartrideSizeContainer"
-                    width               : _content.cellWidth
-                    height              : Variables.adjustmentLabelUnitContainerHeight
                     text                : qsTr("Bicarbonate Cartridge Size")
                     contentItem : Text {  id: _bicarbonateCartrideSizeText
                         anchors.centerIn: parent
@@ -58,11 +52,8 @@
                     }
                 }
 
-
                 LabelUnitContainer { id: _sodiumContainer
                     objectName          : "_sodiumContainer"
-                    width               : _content.cellWidth
-                    height              : Variables.adjustmentLabelUnitContainerHeight
                     text                : qsTr("Sodium")
                     unitText            : Variables.unitTextConcentration
                     contentItem : Text {  id: _sodiumText
@@ -75,8 +66,6 @@
 
                 LabelUnitContainer { id: _bicarbonateContainer
                     objectName          : "_bicarbonateContainer"
-                    width               : _content.cellWidth
-                    height              : Variables.adjustmentLabelUnitContainerHeight
                     text                : qsTr("Bicarbonate")
                     unitText            : Variables.unitTextConcentration
                     contentItem : Text {  id: _bicarbonateText
@@ -93,8 +82,6 @@
 
                 LabelUnitContainer { id: _theoriticalCondictivityContainer
                     objectName          : "_theoriticalCondictivityContainer"
-                    width               : _content.cellWidth
-                    height              : Variables.adjustmentLabelUnitContainerHeight
                     text                : qsTr("Theoretical Conductivity")
                     unitText            : Variables.unitTextDialCond
                     contentItem : Text {  id: _theoriticalCondictivityText
@@ -107,36 +94,30 @@
 
                 LabelUnitContainer { id: _independentConductivityReadingContainer1
                     objectName          : "_independentConductivityReadingContainer1"
-                    width               : _content.cellWidth
-                    height              : Variables.adjustmentLabelUnitContainerHeight
                     text                : qsTr("Independent Conductivity Reading 1")
                     unitText            : Variables.unitTextDialCond
                     contentItem : Text {  id: _independentConductivityReading1Text
                         anchors.centerIn: parent
-                        text            : "13.7" // TODO add actual value
+                        text            : vDDConductivity.acidBicarbCondutivity1.toFixed(Variables.dialysateCondPrecision)
                         color           : Colors.offWhite
                         font.pixelSize  : Fonts.fontPixelValueControl
                     }
                 }
 
                 LabelUnitContainer { id: _independentConductivityReadingContainer2
                     objectName          : "_independentConductivityReadingContainer2"
-                    width               : _content.cellWidth
-                    height              : Variables.adjustmentLabelUnitContainerHeight
-                    text                : qsTr("Independent Conductivity Reading 2")
+                    text                : qsTr("Dialysate Conductivity")
                     unitText            : Variables.unitTextDialCond
                     contentItem : Text {  id: _independentConductivityReading2Text
                         anchors.centerIn: parent
-                        text            : "13.7" // TODO add actual value
+                        text            : vDDConductivity.acidBicarbCondutivity2.toFixed(Variables.dialysateCondPrecision)
                         color           : Colors.offWhite
                         font.pixelSize  : Fonts.fontPixelValueControl
                     }
                 }
 
                 LabelUnitContainer { id: _dialsateTemperatureContainer
                     objectName          : "_dialsateTemperatureContainer"
-                    width               : _content.cellWidth
-                    height              : Variables.adjustmentLabelUnitContainerHeight
                     text                : qsTr("Dialysate Temperature")
                     unitText            : Variables.unitTextTemperature
                     contentItem : Text {  id: _dialsateTemperatureText
@@ -149,8 +130,6 @@
 
                 LabelUnitContainer { id: _actualRORejectionPercentageContainer
                     objectName          : "_actualRORejectionPercentageContainer"
-                    width               : _content.cellWidth
-                    height              : Variables.adjustmentLabelUnitContainerHeight
                     text                : qsTr("Actual RO Rejection Percentage")
                     unitText            : "%"
                     contentItem : Text {  id: _actualRORejectionPercentageText