Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -rc80e4dade15bd769ea20f8098b37655fb22407b7 -rab8d45628ab0172cf8875784108529e29486e4d1
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision c80e4dade15bd769ea20f8098b37655fb22407b7)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision ab8d45628ab0172cf8875784108529e29486e4d1)
@@ -185,15 +185,15 @@
                         if(!active) {
                             active = true
                             _heparinDispensingRate.overrideActiveVisual(true)
+                            _heparinStopTime.overrideActiveVisual(true)
                         } else {
-                            isSliderOn = !isSliderOn
+                            _heparinDispensingRateSwitch.isSliderOn = !_heparinDispensingRateSwitch.isSliderOn
                         }
-                        _heparinDispensingRate.active = isSliderOn
-                        checked = isSliderOn
+                        _heparinDispensingRate.active = _heparinDispensingRateSwitch.isSliderOn
+                        _heparinStopTime.active = _heparinDispensingRateSwitch.isSliderOn
+                        checked = _heparinDispensingRateSwitch.isSliderOn
                     }
 
-                    onCheckedChanged: console.log("_heparinDispensingRate switch changed " + checked)
-
                     x       : width * -1.5
                     y       : Variables.createTreatmentSwitchYDisplacement    // these values are set to align the switch with slider
                     width   : 75    // these values are set to align the switch with slider
@@ -249,6 +249,8 @@
                 adjustable      : _heparinBolusVolumeSwitch.isSliderOn
                 inActiveZero    : true
                 enableAdjustButtons: _heparinBolusVolumeSwitch.isSliderOn
+                showActiveDisabled: _heparinBolusVolumeSwitch.active
+                active:false
 
                 //            ToDo: create a component for this,
                 //            ToDo: Consider putting the new CheckBox component into the SliderCreateTreatment component and set via boolean property
@@ -265,12 +267,12 @@
                     onClicked: {
                         if(!active) {
                             active = true
-                            _heparinDispensingRate.overrideActiveVisual(true)
+                            _heparinBolusVolume.overrideActiveVisual(true)
                         } else {
-                            isSliderOn = !isSliderOn
+                            _heparinBolusVolumeSwitch.isSliderOn = !_heparinBolusVolumeSwitch.isSliderOn
                         }
-                        _heparinDispensingRate.active = isSliderOn
-                        checked = isSliderOn
+                        _heparinBolusVolume.active = _heparinBolusVolumeSwitch.isSliderOn
+                        checked = _heparinBolusVolumeSwitch.isSliderOn
                     }
 
                     x       : width * -1.5
@@ -324,7 +326,10 @@
                 value       : vTreatmentRanges.heparinStopTimeDef
                 onValueChanged  : vTreatmentCreate.heparinStopTime = value
                 enabled         : false // this switch depends on the heparin dispencing
-                enableAdjustButtons: _heparinDispensingRateSwitch.checked
+                showActiveDisabled  : _heparinDispensingRateSwitch.active
+                inActiveZero    : true
+                enableAdjustButtons : _heparinDispensingRateSwitch.isSliderOn
+                adjustable      : _heparinDispensingRateSwitch.isSliderOn
             }
 
             SliderCreateTreatment { id: _salineBolus
@@ -610,7 +615,7 @@
                 adjustable  : _bloodPressureIntervalSwitch.isSliderOn
                 inActiveZero: true
                 enableAdjustButtons: _bloodPressureIntervalSwitch.isSliderOn
-                showActiveDisabled: true
+                showActiveDisabled: _bloodPressureIntervalSwitch.active
                 //            ToDo: create a component for this,
                 //            ToDo: Consider putting the new CheckBox component into the SliderCreateTreatment component and set via boolean property
                 //            This is a full implementation of a CheckBox
@@ -626,12 +631,12 @@
                     onClicked: {
                         if(!active) {
                             active = true
-                            _heparinDispensingRate.overrideActiveVisual(true)
+                            _bloodPressureInterval.overrideActiveVisual(true)
                         } else {
-                            isSliderOn = !isSliderOn
+                            _bloodPressureIntervalSwitch.isSliderOn = !_bloodPressureIntervalSwitch.isSliderOn
                         }
-                        _heparinDispensingRate.active = isSliderOn
-                        checked = isSliderOn
+                        _bloodPressureInterval.active = _bloodPressureIntervalSwitch.isSliderOn
+                        checked = _bloodPressureIntervalSwitch.isSliderOn
                     }
 
                     x       : width * -1.5