Index: leahi.qrc
===================================================================
diff -u -rd7cdeb52d868ce60c0fb5b6ac0e279c440ba99a8 -r8302a9d68a896a5b2694d69818aecbc33061cd49
--- leahi.qrc	(.../leahi.qrc)	(revision d7cdeb52d868ce60c0fb5b6ac0e279c440ba99a8)
+++ leahi.qrc	(.../leahi.qrc)	(revision 8302a9d68a896a5b2694d69818aecbc33061cd49)
@@ -300,6 +300,7 @@
         <file alias="TreatmentAdjustmentIsolatedUFConfirm.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFConfirm.qml</file>
         <file alias="TreatmentAdjustmentVitals.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml</file>
         <file alias="TreatmentAdjustmentVitalsInterval.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml</file>
+        <file alias="TreatmentAdjustmentMode.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentMode.qml</file>
     </qresource>
     <qresource prefix="/pages/endtreatment">
         <file alias="EndTreatmentRinsebackStack.qml">sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml</file>
Index: sources/gui/qml/pages/treatment/TreatmentHDF.qml
===================================================================
diff -u -rd7cdeb52d868ce60c0fb5b6ac0e279c440ba99a8 -r8302a9d68a896a5b2694d69818aecbc33061cd49
--- sources/gui/qml/pages/treatment/TreatmentHDF.qml	(.../TreatmentHDF.qml)	(revision d7cdeb52d868ce60c0fb5b6ac0e279c440ba99a8)
+++ sources/gui/qml/pages/treatment/TreatmentHDF.qml	(.../TreatmentHDF.qml)	(revision 8302a9d68a896a5b2694d69818aecbc33061cd49)
@@ -29,6 +29,7 @@
     readonly property color statusColor : Colors.statusActive
 
     signal sectionPressuresClicked()
+    signal treatmentModeEditClicked()
 
     Component.onCompleted: {
         _headerBar.hdfStatusColor = _root.statusColor // TODO update later
@@ -93,6 +94,8 @@
             statusColor     : _root.statusColor
 
             onSubstitutionFlowClicked: print ("Substitution Flow Clicked")
+
+            onTreatmentModeEditClicked: _root.treatmentModeEditClicked()
         }
     }
 }
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -rd7cdeb52d868ce60c0fb5b6ac0e279c440ba99a8 -r8302a9d68a896a5b2694d69818aecbc33061cd49
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision d7cdeb52d868ce60c0fb5b6ac0e279c440ba99a8)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 8302a9d68a896a5b2694d69818aecbc33061cd49)
@@ -127,13 +127,19 @@
         function onSectionPressuresClicked ( ) {
             _treatmentAdjustmentPressuresLimits.open()
         }
+
+        function onTreatmentModeEditClicked ( ) {
+            _treatmentAdjustmentMode.open()
+
+        }
     }
 
     //// Treatment Adjustment Dialogs
     TreatmentAdjustmentSetPoints            { id:       _treatmentAdjustmentSetPoints       }
     TreatmentAdjustmentPressuresLimits      { id:       _treatmentAdjustmentPressuresLimits }
     TreatmentAdjustmentBolusVolume          { id:       _treatmentAdjustmentBolusVolume     }
     TreatmentAdjustmentUltrafiltrationStack { id:       _treatmentAdjustmentUltrafiltration }
+    TreatmentAdjustmentMode                 { id:       _treatmentAdjustmentMode            }
 
     Connections                 { target:   _treatmentAdjustmentSetPoints
         function onConfirmClicked                   ( vValue ) {
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentMode.qml
===================================================================
diff -u
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentMode.qml	(revision 0)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentMode.qml	(revision 8302a9d68a896a5b2694d69818aecbc33061cd49)
@@ -0,0 +1,63 @@
+
+// Qt
+import QtQuick 2.12
+
+// Project
+import "qrc:/globals"
+import "qrc:/components"
+import "qrc:/compounds"
+
+TreatmentAdjustmentBase { id: _root
+    contentItem.objectName: "TreatmentAdjustmentMode"
+    titleText           : qsTr("Treatment Mode")
+
+    titlePixelSize      : Fonts.fontPixelSection
+    height              : Variables.smallDialogHeight
+    width               : Variables.smallDialogWidth
+
+    function confirm() {
+        vTreatmentCreate.hdfTreatmentMode  = _treatmentModeControl.currentIndex
+        _root.close()
+    }
+
+    onOpened: _treatmentModeControl.currentIndex = vTreatmentCreate.hdfTreatmentMode
+
+    LabelUnitContainer { id: _treatmentMode
+        objectName      : "_treatmentMode"
+        anchors {
+            verticalCenter      : _root.contentItem.verticalCenter
+            verticalCenterOffset: Variables.defaultMargin * -3 // better align label with dialog height
+            horizontalCenter    : _root.contentItem.horizontalCenter
+        }
+        text            : qsTr("Treatment Mode")
+        width           : Variables.adjustmentLabelUnitContainerWidth
+        height          : Variables.adjustmentLabelUnitContainerHeight
+        onEditClicked   : _root.treatmentModeEditClicked()
+
+        contentItem : ValueAdjusterCustom { id: _treatmentModeControl
+            value       : vTreatmentCreate.hdfTreatmentMode
+            model       : vTreatmentRanges.hdfTreatmentModeOptions
+
+        }
+    }
+
+    ConfirmButton { id : _confirmButton
+        anchors {
+            bottom          : _root.contentItem.bottom
+            bottomMargin    : Variables.defaultMargin * 4
+            horizontalCenter: _root.contentItem.horizontalCenter
+        }
+
+        width       : Variables.defaultButtonWidth
+        height      : Variables.defaultButtonHeight
+
+        anchors {
+            top     : undefined
+            right   : undefined
+            margins : 0
+        }
+        onClicked   : {
+            _root.confirm()
+        }
+    }
+}
Index: sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml
===================================================================
diff -u -rd7cdeb52d868ce60c0fb5b6ac0e279c440ba99a8 -r8302a9d68a896a5b2694d69818aecbc33061cd49
--- sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml	(.../TreatmentHDFComponent.qml)	(revision d7cdeb52d868ce60c0fb5b6ac0e279c440ba99a8)
+++ sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml	(.../TreatmentHDFComponent.qml)	(revision 8302a9d68a896a5b2694d69818aecbc33061cd49)
@@ -69,6 +69,7 @@
     readonly property int cellWidth : contentItem.width / 2 - _row.spacing
 
     signal substitutionFlowClicked()
+    signal treatmentModeEditClicked()
 
     contentItem: Row { id: _row
         spacing: Variables.defaultMargin * 2
@@ -92,12 +93,13 @@
                 bottomTextFont.weight   : Font.Normal
                 leftAlign               : true
                 unitText                : Variables.unitVolume
+                bottomTextTopMargin     : Variables.defaultMargin
             }
 
             LabelValue { id: _substitutionRate
                 anchors {
                     top         : _estimatedSubstitutionVol.bottom
-                    topMargin   : Variables.defaultMargin
+                    topMargin   : Variables.defaultMargin * 2
                     left        : parent.left
                 }
                 height                  : parent.height / 3
@@ -110,6 +112,7 @@
                 bottomTextFont.weight   : Font.Normal
                 leftAlign               : true
                 unitText                : Variables.unitTextFlowRate
+                bottomTextTopMargin     : Variables.defaultMargin
             }
 
             ProgressBar { id: _progressbar
@@ -252,11 +255,12 @@
                 width           : _rightColumn.width
                 height          : Variables.adjustmentLabelUnitContainerHeight
                 showEdit        : true
-                onEditClicked   : print ("Treatment Mode Edit Clicked")
+                onEditClicked   : _root.treatmentModeEditClicked()
 
-                contentItem : ValueAdjusterCustom { id: _bpMeasurementIntervalControl
+                contentItem : ValueAdjusterCustom { id: _treatmentModeControl
                     value       : vTreatmentCreate.hdfTreatmentMode
                     model       : vTreatmentRanges.hdfTreatmentModeOptions
+                    editable    : false
                     onDidChange : function(vValue) {
                         vTreatmentCreate.hdfTreatmentMode = vValue
                     }