Index: leahi.qrc
===================================================================
diff -u -re5576e4397ed640fec2a936dc5e42c773870b29a -rd4b7643b0a19278ea948a75553ff777e4e436c22
--- leahi.qrc	(.../leahi.qrc)	(revision e5576e4397ed640fec2a936dc5e42c773870b29a)
+++ leahi.qrc	(.../leahi.qrc)	(revision d4b7643b0a19278ea948a75553ff777e4e436c22)
@@ -112,6 +112,8 @@
         <file alias="iVolume">resources/images/Volume.png</file>
         <file alias="iWaterSampleFail">resources/images/water_sample_fail.png</file>
         <file alias="iWaterSamplePass">resources/images/water_sample_pass.png</file>
+        <file alias="iArrowDownDisabled">resources/images/ArrowDownDisabled.png</file>
+        <file alias="iArrowUpDisabled">resources/images/ArrowUpDisabled.png</file>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -r45ce5cd058a8d0239d486e0ab4b057731f7dba76 -rd4b7643b0a19278ea948a75553ff777e4e436c22
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision d4b7643b0a19278ea948a75553ff777e4e436c22)
@@ -128,6 +128,8 @@
     readonly property int treatmentFlowsComponentWidth          : 150
     readonly property int treatmentPressureTitleWidth           : 125
     readonly property int treatmentPressureValueWidth           : 140
+    readonly property int completeDialogHeight                  : 600
+    readonly property int completeDialogWidth                   : 800
     readonly property int treatmentCellWidth                    : 264 // screen width / # columns
     readonly property int treatmentCellHeight                   : 420 //screen height / # rows - headerbar
 
Index: sources/gui/qml/pages/treatment/TreatmentHeparin.qml
===================================================================
diff -u -rd4b731494a05087a763afff95b91c675bb417347 -rd4b7643b0a19278ea948a75553ff777e4e436c22
--- sources/gui/qml/pages/treatment/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision d4b731494a05087a763afff95b91c675bb417347)
+++ sources/gui/qml/pages/treatment/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision d4b7643b0a19278ea948a75553ff777e4e436c22)
@@ -105,7 +105,7 @@
 
     Connections { target:   vTDTreatmentStates
         function onHeparinChanged                   ( vValue ) {
-            _headerBar.model.setProperty(HeaderBar.Heparin, "statusColor", _root.statusColor(true).toString())
+            vListModel.setHeaderbarStatusColor(HeaderBar.Heparin, _root.statusColor(true).toString())
         }
     }
 
Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -r45ce5cd058a8d0239d486e0ab4b057731f7dba76 -rd4b7643b0a19278ea948a75553ff777e4e436c22
--- sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision d4b7643b0a19278ea948a75553ff777e4e436c22)
@@ -99,6 +99,7 @@
                 objectName      : "treatmentUltrafiltration"
                 width           : cellWidth * 3
                 height          : cellHeight
+                header.setEditActive: ! isTreatmentEnd  // LEAHI-PRS-376
 
                 onEditClicked   : sectionUltrafiltrationClicked()
             }
@@ -128,70 +129,64 @@
         height              : 60
         visible             : ! _alarmBar.visible && text
 
-        property int source: -1
-
-        onTextChanged: {
-            if (text === "") {
-                source = -1
-            }
-        }
-
         CloseButton { id: _dismissButton
             objectName: "_dismissButton"
             anchors {
-                top: parent.top
-                bottom: parent.bottom
-                right: parent.right
-                margins: 20
+                top     : parent.top
+                bottom  : parent.bottom
+                right   : parent.right
+                margins : 20
             }
-            width: height
-            visible: true
-            onClicked: { _notification.text = "" }
+            width       : height
+            visible     : true
+            onClicked   : { _notification.text = "" }
         }
     }
 
     Connections { target: vTreatmentAdjustmentBloodFlowRate
         function onAdjustmentTriggered              ( vValue ) {
             if (vTreatmentAdjustmentBloodFlowRate.adjustment_Accepted) {
-                if (_notification.source === 0) {
-                    _notification.text = ""
-                }
+                _notification.text = ""
             }
             else {
                 _notification.text = vTreatmentAdjustmentBloodFlowRate.text()
-                _notification.source = 0
             }
         }
     }
 
     Connections { target: vTreatmentAdjustmentDialysateFlowRate
         function onAdjustmentTriggered              ( vValue ) {
             if (vTreatmentAdjustmentDialysateFlowRate.adjustment_Accepted) {
-                if (_notification.source === 1) {
-                    _notification.text = ""
-                }
+                _notification.text = ""
             }
             else {
                 _notification.text = vTreatmentAdjustmentDialysateFlowRate.text()
-                _notification.source = 1
             }
         }
     }
 
     Connections { target: vTreatmentAdjustmentDialysateTemperature
         function onAdjustmentTriggered              ( vValue ) {
             if (vTreatmentAdjustmentDialysateTemperature.adjustment_Accepted) {
-                if (_notification.source === 2) {
-                    _notification.text = ""
-                }
+                _notification.text = ""
             }
             else {
                 _notification.text = vTreatmentAdjustmentDialysateTemperature.text()
-                _notification.source = 2
             }
         }
     }
 
+    Connections { target: vTreatmentAdjustmentSaline
+        function onAdjustmentTriggered              ( vValue ) {
+            if (vTreatmentAdjustmentSaline.adjustment_Accepted) {
+                _notification.text = ""
+            }
+            else {
+                _notification.text = vTreatmentAdjustmentSaline.text()
+            }
+        }
+    }
+
     onVisibleChanged: {
         if (visible) {
             _mainMenu.hidden = true
Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -r45ce5cd058a8d0239d486e0ab4b057731f7dba76 -rd4b7643b0a19278ea948a75553ff777e4e436c22
--- sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
+++ sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision d4b7643b0a19278ea948a75553ff777e4e436c22)
@@ -79,6 +79,8 @@
     PROPERTY(bool       , heparinDispensingRateOff                      , true)
     PROPERTY(bool       , heparinBolusVolumeOff                         , true)
 
+    VALUESET(quint32    , treatmentModality                             , 0)
+    VALUESET(quint32    , hdfTreatmentMode                              , 0)
     VALUESET(quint32    , bloodFlowRate                                 , 0)
     VALUESET(quint32    , dialysateFlowRate                             , 0)
     VALUESET(quint32    , treatmentDuration                             , 0)
@@ -98,7 +100,6 @@
     VALUESET(float      , dialysateTemp                                 , 0)
     VALUESET(float      , heparinDispensingRate                         , 0)
     VALUESET(float      , heparinBolusVolume                            , 0)
-    VALUESET(quint32    , hdfTreatmentMode                              , 0)
 
     VALUESET(QString    , patientID                                     ,"")
     VALUESET(bool       , parametersValidated                           , 0)