Index: sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml
===================================================================
diff -u -r533c771015857845302bcbc58b411ecef2d6ec79 -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53
--- sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml	(.../TreatmentFluid.qml)	(revision 533c771015857845302bcbc58b411ecef2d6ec79)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml	(.../TreatmentFluid.qml)	(revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
@@ -28,6 +28,8 @@
 TouchArea { id: _root
     property string buttonText          : ""
     property bool   cumulativeVisible   : true
+    property bool   targetVisible       : true
+    property bool   progressBarVisible  : true
 
     property int    rowTextSpacing      : 10
     property int    volumeTextWidth     : 60
@@ -64,73 +66,78 @@
         }
     }
 
-    ProgressBar { id: _fluidProgressBar
+    Text { id: _fluidText
         anchors {
             top: _startFluidButton.bottom
-            topMargin: 50
+            topMargin: 15
+
         }
+        width: parent.width
+        text: qsTr("Volume Delivered")
+        font.pixelSize: Fonts.fontPixelFluidText
+        color: Colors.fluidText
+        Text { id: _fluidTarget
+            visible: targetVisible
+            property real value: 0
+            width: volumeTextWidth
+            anchors {
+                right: parent.right
+                baseline: parent.baseline
+            }
+            text: qsTr("(%1 %2)").arg(value).arg(_root.unit)
+            font.pixelSize: Fonts.fontPixelFluidVolume
+            color: Colors.fluidUnit
+        }
+        Text { id: _fluidUnit
+            anchors {
+                right: parent.right
+                rightMargin: volumeTextWidth + rowTextSpacing
+                baseline: parent.baseline
+            }
+            text: _root.unit
+            font.pixelSize: Fonts.fontPixelFluidUnit
+            color: Colors.fluidUnit
+        }
+        Text { id: _fluidValue
+            anchors  {
+                right: _fluidUnit.left
+                rightMargin: rowTextSpacing
+                baseline: parent.baseline
+            }
+            horizontalAlignment: Text.AlignRight
+            text: _fluidProgressBar.value
+            width: 60
+            font.pixelSize: Fonts.fontPixelFluidValue
+            color: Colors.fluidText
+        }
+    }
+
+    ProgressBar { id: _fluidProgressBar
+        visible: progressBarVisible
+        anchors {
+            left        : parent.left
+            top         : _fluidText.bottom
+            topMargin   : 10
+        }
         width   : parent.width
         height  : Variables.progressbarFluidHeight
         minText.visible : false
         maxText.visible : false
         marker.visible  : false
 
+        maximum : _fluidTarget.value
         value   : 0
-
-        Text { id: _fluidText
-            anchors {
-                left        : parent.left
-                bottom      : parent.bottom
-                bottomMargin: 15
-            }
-            width: parent.width
-            text: qsTr("Volume Delivered")
-            font.pixelSize: Fonts.fontPixelFluidText
-            color: Colors.fluidText
-            Text { id: _fluidTarget
-                property real value: 0
-                width: volumeTextWidth
-                anchors {
-                    right: parent.right
-                    baseline: parent.baseline
-                }
-                text: qsTr("(%1 %2)").arg(value).arg(_root.unit)
-                font.pixelSize: Fonts.fontPixelFluidVolume
-                color: Colors.fluidUnit
-            }
-            Text { id: _fluidUnit
-                anchors {
-                    right: parent.right
-                    rightMargin: volumeTextWidth + rowTextSpacing
-                    baseline: parent.baseline
-                }
-                text: _root.unit
-                font.pixelSize: Fonts.fontPixelFluidUnit
-                color: Colors.fluidUnit
-            }
-            Text { id: _fluidValue
-                anchors  {
-                    right: _fluidUnit.left
-                    rightMargin: rowTextSpacing
-                    baseline: parent.baseline
-                }
-                horizontalAlignment: Text.AlignRight
-                text: _fluidProgressBar.value
-                width: 60
-                font.pixelSize: Fonts.fontPixelFluidValue
-                color: Colors.fluidText
-            }
-        }
     }
+
     Text { id: _cumulativeText
         visible: cumulativeVisible
         anchors {
             left        : parent.left
             top         : _fluidProgressBar.bottom
-            topMargin   : 15
+            topMargin   : 10
         }
         width: parent.width
-        text: qsTr("Cumulative Delivery")
+        text: qsTr("Cumulative Delivered")
         font.pixelSize: Fonts.fontPixelFluidText
         color: Colors.fluidText
         Text { id: _cumulativeUnit