Index: sources/gui/qml/components/GridSelection.qml
===================================================================
diff -u -r79a6cfcb10472261f3ec26eaf0baf6f1245cd311 -rc75017688e992f20dd126054abf6e639883b0303
--- sources/gui/qml/components/GridSelection.qml	(.../GridSelection.qml)	(revision 79a6cfcb10472261f3ec26eaf0baf6f1245cd311)
+++ sources/gui/qml/components/GridSelection.qml	(.../GridSelection.qml)	(revision c75017688e992f20dd126054abf6e639883b0303)
@@ -35,6 +35,7 @@
     property int    optionWidth     : Variables.gridSelectionButtonWidth
     property alias  title           : _title.text
     property var    labels          : []
+    property bool   active          : false
 
     readonly property int _itemCount: labels.length
     readonly property int _rowCount : Math.ceil( _itemCount / _colCount )
@@ -77,6 +78,7 @@
                 onClicked: {
                     _root.curIndex = index
                     _root.clicked  ( index )
+                    _root.active   = true
                 }
             }
         }
Index: sources/gui/qml/components/SliderCreateTreatment.qml
===================================================================
diff -u -rd058eb89be720f349c507886dbd120fb7a775dfb -rc75017688e992f20dd126054abf6e639883b0303
--- sources/gui/qml/components/SliderCreateTreatment.qml	(.../SliderCreateTreatment.qml)	(revision d058eb89be720f349c507886dbd120fb7a775dfb)
+++ sources/gui/qml/components/SliderCreateTreatment.qml	(.../SliderCreateTreatment.qml)	(revision c75017688e992f20dd126054abf6e639883b0303)
@@ -35,7 +35,7 @@
     property alias  value       : _slider.value
     property alias  step        : _slider.step
 
-    property string zeroLabel   : qsTr("OFF")
+    property string zeroLabel   : ""
 
     property string unit        : ""
     property bool   active      : false
@@ -67,14 +67,10 @@
         let value = "__"
         let unit  = " " + _root.unit
         if ( _root.active ) {
-            if ( _slider.value ) {
-                value = _slider.value
+            if ( _slider.value === 0 && zeroLabel !== "" ) {
+                return _root.zeroLabel
             }
-            else {
-                if ( zeroLabel ) {
-                    return _root.zeroLabel
-                }
-            }
+            value = _slider.value
         }
         return value + unit
     }
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -rd058eb89be720f349c507886dbd120fb7a775dfb -rc75017688e992f20dd126054abf6e639883b0303
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision d058eb89be720f349c507886dbd120fb7a775dfb)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision c75017688e992f20dd126054abf6e639883b0303)
@@ -30,8 +30,27 @@
 PreTreatmentBase { id: _root
     objectName: "_PreTreatmentCreate" // SquishQt testability
 
-    header.confirmEnabled: vTreatmentCreate.continueEnabled
+    header.confirmEnabled:
+        _bloodFlowRate          .active &&
+        _dialysateFlowRate      .active &&
+        _duration               .active &&
+        _heparinDispensingRate  .active &&
+        _heparinBolusVolume     .active &&
+        _heparinStopTime        .active &&
+        _salineBolus            .active &&
+        _heparinType            .active &&
+        _acidConcentrate        .active &&
+        _bicarbonateConcentrate .active &&
+        _dialyzerType           .active &&
+        _dialysateTemperature   .active &&
+        _arterialPressureLimits .minAdjusted &&
+        _arterialPressureLimits .maxAdjusted &&
+        _venousPressureLimits   .minAdjusted &&
+        _venousPressureLimits   .maxAdjusted &&
+        _bloodPressureInterval  .active &&
+        _rinsebackFlowRate      .active
 
+
     function setInteractive(vInteractive) {
         _flickable.interactive = vInteractive
     }
@@ -155,6 +174,7 @@
             SliderCreateTreatment { id: _heparinDispensingRate
                 objectName  : "_heparinDispensingRate"
                 label       : qsTr("Heparin Dispensing Rate")
+                zeroLabel   : qsTr("OFF")
                 flickable   : _flickable
                 unit        : Variables.unitTextDispensingRate
                 value       : vTreatmentCreate.heparinDispensingRate
@@ -220,6 +240,7 @@
             SliderCreateTreatment { id: _heparinBolusVolume
                 objectName  : "_heparinBolusVolume"
                 label       : qsTr("Heparin Bolus Volume")
+                zeroLabel   : qsTr("OFF")
                 flickable   : _flickable
                 unit        : Variables.unitTextFluid
                 value       : vTreatmentCreate.heparinBolusVolume
Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -rd058eb89be720f349c507886dbd120fb7a775dfb -rc75017688e992f20dd126054abf6e639883b0303
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision d058eb89be720f349c507886dbd120fb7a775dfb)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision c75017688e992f20dd126054abf6e639883b0303)
@@ -7,7 +7,7 @@
  *                                                                                 
  * \file    MAlarmMapping.cpp                                                     
  * \author  (last)      Behrouz NematiPour                                        
- * \date    (last)      19-Jul-2022                                                        
+ * \date    (last)      20-Jul-2022                                                        
  * \author  (original)  Behrouz NematiPour                                        
  * \date    (original)  03-May-2021                                               
  *