Index: sources/gui/qml/dialogs/UfVolumeAdjustment.qml
===================================================================
diff -u -r1132f049e169cc87a059261f72fca0ceb7d739f1 -r773b0b83e72af1bdc50c2643459cb0ef19c02ee6
--- sources/gui/qml/dialogs/UfVolumeAdjustment.qml	(.../UfVolumeAdjustment.qml)	(revision 1132f049e169cc87a059261f72fca0ceb7d739f1)
+++ sources/gui/qml/dialogs/UfVolumeAdjustment.qml	(.../UfVolumeAdjustment.qml)	(revision 773b0b83e72af1bdc50c2643459cb0ef19c02ee6)
@@ -56,10 +56,10 @@
             defaultValue    : vTreatmentRanges.weightDef
             decimal         : Variables.weightPrecision
             value           : vTreatmentCreate.ufPreWeight
-
-            onDidChange         : function(vValue) {
+            isActive        : true
+            onDidChange     : function(vValue) {
                 if ( ! _preWeight.valid ) { vTreatmentCreate.ufPreWeightRejectionReason = Variables.noRejectReason }
-                value = valid
+                value = vValue
             }
         }
 
@@ -76,8 +76,9 @@
             defaultValue    : vTreatmentRanges.weightDef
             decimal         : Variables.weightPrecision
             value           : vTreatmentCreate.ufEstimatedTargetWeight
+            isActive        : true
 
-            onDidChange         : function(vValue) {
+            onDidChange     : function(vValue) {
                 if ( ! _estimatedTargetWeight.valid ) { vTreatmentCreate.ufEstimatedTargetWeightRejectionReason = Variables.noRejectReason }
                 value = vValue
             }
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml
===================================================================
diff -u -r63d974e3d2d03c93e0398de17bd6ca2d2e039982 -r773b0b83e72af1bdc50c2643459cb0ef19c02ee6
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml	(.../PreTreatmentCreateTreatmentSettings.qml)	(revision 63d974e3d2d03c93e0398de17bd6ca2d2e039982)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml	(.../PreTreatmentCreateTreatmentSettings.qml)	(revision 773b0b83e72af1bdc50c2643459cb0ef19c02ee6)
@@ -14,6 +14,8 @@
     readonly property bool heparinFeatured  : vSettings.heparinSyringePump
     readonly property string patientID      : _pretreatmentPatientIDEntry.text
     property bool isHDFFeatured             : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF
+    property bool isHeparinOn               :  _heparinRxControl.value === PreTreatmentCreateTreatmentSettings.ON
+
     property bool editingEnabled            : true
     property int columnSpacing              : 15
 
@@ -65,20 +67,20 @@
     }
 
     function ready () {
-        return _root.isHDFFeatured ? _hdfTreatmentModeControl   .isActive     && _hdfTreatmentMode          .valid          &&
-                                    _subFluidVolume             .isActive     && _subFluidVolume            .valid  : true  &&
-                _bloodFlowRate                                  .isActive     && _bloodFlowRate             .valid          &&
-                _dialysateFlowRate                              .isActive     && _dialysateFlowRate         .valid          &&
-                _duration                                       .isActive     && _duration                  .valid          &&
+        return _root.isHDFFeatured ? _hdfTreatmentModeControl   .isActive       && _hdfTreatmentMode          .valid            &&
+                                    _subFluidVolume             .isActive       && _subFluidVolume            .valid    : true  &&
+                _bloodFlowRate                                  .isActive       && _bloodFlowRate             .valid            &&
+                _dialysateFlowRate                              .isActive       && _dialysateFlowRate         .valid            &&
+                _duration                                       .isActive       && _duration                  .valid            &&
 
-                _ufVolume                                       .isActive     && _ufVolume                  .valid          &&
-                _root.isHDFFeatured &&
-                _heparinRxControl.value === PreTreatmentCreateTreatmentSettings.ON ? _heparinRxAdjustment.confirmReady() :
-                                                                                     true                                   &&
-                _acidConcentrateComboBox                        .isActive     && _acidConcentrate           .valid          &&
-                _bicarbonateConcentrateComboBox                 .isActive     && _bicarbonateConcentrate    .valid          &&
-                _dialyzerTypeComboBox                           .isActive     && _dialyzerType              .valid          &&
-                _dialysateTemperature                           .isActive     && _dialysateTemperature      .valid
+                _ufVolume                                       .isActive       && _ufVolume                  .valid            &&
+                _root.isHDFFeatured ? _hdfTreatmentMode         .isActive       && _hdfTreatmentMode          .valid            &&
+                                      _subFluidVolume           .isActive       && _hdfTreatmentMode          .valid    : true  &&
+                _root.isHeparinOn && _root. heparinFeatured ?   _heparinRxAdjustment.confirmReady()                     : true  &&
+                _acidConcentrateComboBox                        .isActive       && _acidConcentrate           .valid            &&
+                _bicarbonateConcentrateComboBox                 .isActive       && _bicarbonateConcentrate    .valid            &&
+                _dialyzerTypeComboBox                           .isActive       && _dialyzerType              .valid            &&
+                _dialysateTemperature                           .isActive       && _dialysateTemperature      .valid
     }
 
     Column {  id: _leftColumn
@@ -140,7 +142,7 @@
 
         LabelUnitContainer { id: _hdfTreatmentMode
             text            : _root.isHDFFeatured ? qsTr("HDF Operating Mode") : ""
-            valid           : ! vTreatmentCreate.hdfTreatmentModeRejectReason
+            valid           : ! vTreatmentCreate.hDFTreatmentModeRejectReason
             height          : _root.isHDFFeatured ? _root.cellHeight : 0
 
             contentItem : ValueAdjusterCustom { id: _hdfTreatmentModeControl
@@ -153,7 +155,7 @@
                 onDidActiveChange: function(vState) {  vTreatmentCreate.hdfTreatmentModeSet = vState }
 
                 onDidChange     : function(vValue) {
-                    if ( ! _hdfTreatmentMode.valid ) { vTreatmentCreate.hdfTreatmentModeRejectReason = Variables.noRejectReason }
+                    if ( ! _hdfTreatmentMode.valid ) { vTreatmentCreate.hDFTreatmentModeRejectReason = Variables.noRejectReason }
                     vTreatmentCreate.hdfTreatmentModeSet = true
                     vTreatmentCreate.hdfTreatmentMode    = vValue
                 }
@@ -167,7 +169,7 @@
             height          : _root.isHDFFeatured ? _root.cellHeight : 0
             contentItem.visible: _root.isHDFFeatured
             unitText        : _root.isHDFFeatured ? Variables.unitVolume : ""
-            valid           : ! vTreatmentCreate.substitutionFluidVolumeRejectionReason
+            valid           : ! vTreatmentCreate.substitutionFluidVolumeRejectReason
             editable        : _root.editingEnabled
             minimum         : vTreatmentRanges.substitutionVolumeMin
             maximum         : vTreatmentRanges.substitutionVolumeMax
@@ -179,7 +181,7 @@
 
             onDidActiveChange   : function(vState) {  vTreatmentCreate.substitutionFluidVolumeSet = vState }
             onDidChange         : function(vValue) {
-                if ( ! _ufVolume.valid ) { vTreatmentCreate.substitutionFluidVolumeRejectionReason = Variables.noRejectReason }
+                if ( ! _ufVolume.valid ) { vTreatmentCreate.substitutionFluidVolumeRejectReason = Variables.noRejectReason }
                 vTreatmentCreate.substitutionFluidVolume = vValue
             }
             Behavior on height  { NumberAnimation   { duration: 250 } }
@@ -258,7 +260,8 @@
             height          : _root.cellHeight
             unitText        : Variables.unitVolume
             showEdit        : true
-            valid           : ! vTreatmentCreate.ultrafiltrationVolumeRejectionReason
+            needsAttention  : vTreatmentCreate.ufPreWeightRejectionReason || vTreatmentCreate.ufEstimatedTargetWeightRejectionReason
+            valid           : ! vTreatmentCreate.ufVolumeRejectionReason
             editable        : _root.editingEnabled
             minimum         : vTreatmentRanges.ultrafiltrationVolumeMin
             maximum         : vTreatmentRanges.ultrafiltrationVolumeMax
@@ -270,7 +273,7 @@
 
             onDidActiveChange   : function(vState) {  vTreatmentCreate.ultrafiltrationVolumeSet = vState }
             onDidChange         : function(vValue) {
-                if ( ! _ufVolume.valid ) { vTreatmentCreate.ultrafiltrationVolumeRejectionReason = Variables.noRejectReason }
+                if ( ! _ufVolume.valid ) { vTreatmentCreate.ufVolumeRejectionReason = Variables.noRejectReason }
                 vTreatmentCreate.ultrafiltrationVolume = vValue
             }
 
@@ -313,7 +316,7 @@
             text            : qsTr("Acid Concentrate")
 //            showEdit        : _root.editingEnabled // Hide 👋📋 TODO Phase 2
             onEditClicked   : _acidConcentrateAdjustment.open()
-            valid           : ! vTreatmentCreate.acidConcentrateRejectReason
+            valid           : ! vTreatmentCreate.acidConcentrateConversionFactorRejectionReason
 
             contentItem : BaseComboBox { id: _acidConcentrateComboBox
                 anchors.rightMargin : Variables.defaultMargin * 2
@@ -330,7 +333,7 @@
                 }
 
                 onActivated         : {
-                    if ( ! _acidConcentrate.valid ) { vTreatmentCreate.acidConcentrateRejectReason = Variables.noRejectReason }
+                    if ( ! _acidConcentrate.valid ) { vTreatmentCreate.acidConcentrateConversionFactorRejectionReason = Variables.noRejectReason }
                     vTreatmentCreate.acidConcentrate    = _acidConcentrateComboBox.currentIndex
                     vTreatmentCreate.acidConcentrateSet = true
                     vTreatmentCreate.acidConcentrateConversionFactor = vTreatmentRanges.acidConcentrateModel.get(vTreatmentCreate.acidConcentrate).value