Index: sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml
===================================================================
diff -u -r11cf98a0aae3c01a7e7608b0c9f8a4c2112ca997 -r600b6707b102919d981f3b1d18611834e23eae60
--- sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml	(.../TreatmentHDFComponent.qml)	(revision 11cf98a0aae3c01a7e7608b0c9f8a4c2112ca997)
+++ sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml	(.../TreatmentHDFComponent.qml)	(revision 600b6707b102919d981f3b1d18611834e23eae60)
@@ -24,11 +24,8 @@
     color           : Colors.panelBackgroundColor
     header.color    : Colors.heparinSectionHeader
     enableDropShadow: false
-    header {
-        showEdit        : false
-        title           :  qsTr("Hemodiafiltration") + " (" + qsTr("HDF") + ")"
+    header.title    :  qsTr("Hemodiafiltration") + " (" + qsTr("HDF") + ")"
 
-    }
     contentArea.anchors {
         topMargin   : Variables.defaultMargin
         leftMargin  : Variables.defaultMargin * 2
@@ -68,7 +65,6 @@
     readonly property int cellWidth : contentItem.width / 2 - _row.spacing
 
     signal substitutionFlowClicked()
-    signal treatmentModeEditClicked()
 
     contentItem: Row { id: _row
         spacing: Variables.defaultMargin * 2
@@ -123,7 +119,7 @@
                 height          : 20
                 decimal         : Variables.substitutionPrecision
                 minimum         : _root.minimum
-                maximum         : _root.maximum
+                maximum         : vTreatmentCreate.substitutionFluidVolume
                 value           : _root.substitutionValue
                 unitText        : Variables.unitVolume
                 color           : Colors.progressBarUltrafiltration
@@ -253,8 +249,6 @@
                 text            : qsTr("Treatment Mode")
                 width           : _rightColumn.width
                 height          : Variables.adjustmentLabelUnitContainerHeight
-                showEdit        : true
-                onEditClicked   : _root.treatmentModeEditClicked()
 
                 contentItem : ValueAdjusterCustom { id: _treatmentModeControl
                     value       : vTreatmentCreate.hdfTreatmentMode
@@ -271,17 +265,15 @@
                 text                : qsTr("Prescribed Sub. Fluid Volume")
                 unitText            : Variables.unitVolume
                 decimal             : Variables.substitutionPrecision
+                valueTextColor      : Colors.offWhite
                 isActive            : true
+                editable            : false
                 minimum             : _root.minimum
                 maximum             : _root.maximum
                 step                : _root.resolution
                 width               : _rightColumn.width
-                value               : 24.0
-                defaultValue        : 24.0
-
-                onDidChange         : function(vValue) {
-                    value = vValue
-                }
+                value               : vTreatmentCreate.substitutionFluidVolume
+                defaultValue        : vTreatmentRanges.substitutionVolumeDef
             }
         }
     }