Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53 -r153409973471214f29d5fad170a8b4ec0f4c4f2e
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 153409973471214f29d5fad170a8b4ec0f4c4f2e)
@@ -68,6 +68,8 @@
                                                   isUFOff       ? "gray"  :
                                                   isUFCompleted ? "lightgray" : ""
 
+    readonly property bool   isSBInProgress     : ( vHDTreatmentStates.sbRunning || vHDTreatmentStates.sbWaitPump )
+
     // Components
     MainMenu                { id: _treatmentMenu
         y               : Variables.mainMenuHeight * -1
Index: sources/gui/qml/pages/treatment/TreatmentStart.qml
===================================================================
diff -u -r820a00638e0573a5b0c51ed0b3e38d605d4400be -r153409973471214f29d5fad170a8b4ec0f4c4f2e
--- sources/gui/qml/pages/treatment/TreatmentStart.qml	(.../TreatmentStart.qml)	(revision 820a00638e0573a5b0c51ed0b3e38d605d4400be)
+++ sources/gui/qml/pages/treatment/TreatmentStart.qml	(.../TreatmentStart.qml)	(revision 153409973471214f29d5fad170a8b4ec0f4c4f2e)
@@ -108,7 +108,7 @@
         }
     }
     Line                        { x: rightLinesX; y: row1LineY; length: lineLength }
-    TreatmentSaline             { id: _SalineTouchArea
+    TreatmentSaline             { id: _salineTouchArea
         x           : rightColumnX
         y           : row2Y
         width       : areaWidth
Index: sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml
===================================================================
diff -u -r595ede3b4cf5a1f5c06a04d1db99a0674ae742bd -r153409973471214f29d5fad170a8b4ec0f4c4f2e
--- sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision 595ede3b4cf5a1f5c06a04d1db99a0674ae742bd)
+++ sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision 153409973471214f29d5fad170a8b4ec0f4c4f2e)
@@ -29,17 +29,18 @@
 TreatmentFluid { id: _root
     readonly property bool isOff            : vHDTreatmentStates.hpOff
     readonly property bool isPaused         : vHDTreatmentStates.hpPaused
-    readonly property bool isInitial        : vHDTreatmentStates.hpInitial_bolus
+    readonly property bool isBolus         : vHDTreatmentStates.hpInitial_bolus
     readonly property bool isDispensing     : vHDTreatmentStates.hpDispensing
     readonly property bool isCompleted      : vHDTreatmentStates.hpCompleted
     readonly property bool isEmpty          : vHDTreatmentStates.hpEmpty
 
     QtObject { id: _private
         readonly property string textHeparin        : qsTr("HEPARIN DELIVERY")
         readonly property string textPause          : qsTr("PAUSE DELIVERY")
-        readonly property string textResume         : qsTr("RESUME DELIVERY" )
+        readonly property string textResume         : qsTr("RESUME DELIVERY")
         readonly property string textVolumeTarget   : "(" + valueTarget + unit + ")"
-        readonly property string mesgCompleted      : qsTr("Maximum cumulative heparin bolus volume delivered")
+        readonly property string mesgBolus          : qsTr("Heparin bolus is active")
+        readonly property string mesgCompleted      : qsTr("Maximum cumulative heparin volume delivered")
         readonly property string mesgEmpty          : qsTr("Heparin syringe empty")
         readonly property string mesgOff            : qsTr("Heparin delivery Off")
         readonly property string mesgRejectReason   : vTreatmentAdjustmentHeparin.adjustment_ReasonText
@@ -52,14 +53,14 @@
     targetVisible: false
     progressBarVisible: false
 
-    isTouchable : ! (isOff || isInitial || isEmpty)
+    isTouchable : ! (isOff || isBolus || isEmpty) && ! isSBInProgress
     buttonText  : isDispensing  ? _private.textPause    :
                   isPaused      ? _private.textResume   :
                   isCompleted   ? _private.textResume   :
                                   _private.textHeparin
     unit        : Variables.unitTextSaline
 
-    valueDelivered: vTreatmentHeparin.cumulative // this is the cumulative volume of the Heparin bolus and despensing.
+    valueDelivered: vTreatmentHeparin.cumulative.toFixed(1) // this is the cumulative volume of the Heparin bolus and despensing.
 
     VTreatmentHeparin  { id: vTreatmentHeparin }
 
@@ -69,7 +70,8 @@
 
     notification {
         visible : true
-        text    : isOff         ? _private.mesgOff          :
+        text    : isBolus       ? _private.mesgBolus        :
+                  isOff         ? _private.mesgOff          :
                   isCompleted   ? _private.mesgCompleted    :
                   isEmpty       ? _private.mesgEmpty        :
                                   _private.mesgRejectReason
Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
===================================================================
diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -r153409973471214f29d5fad170a8b4ec0f4c4f2e
--- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(.../TreatmentUltrafiltration.qml)	(revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95)
+++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(.../TreatmentUltrafiltration.qml)	(revision 153409973471214f29d5fad170a8b4ec0f4c4f2e)
@@ -38,7 +38,7 @@
     width   : 200
     height  : 200
 
-    isTouchable : ! ( vHDTreatmentStates.sbRunning || vHDTreatmentStates.sbWaitPump )
+    isTouchable : ! isSBInProgress
     title   : qsTr("ULTRAFILTRATION VOLUME") + " " + Variables.unitTextUltrafiltrationVolume
     notification {
         visible     : true