Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
===================================================================
diff -u -r54a8a895371d2fe6d40434fff420fa90fe5ce170 -rd4b731494a05087a763afff95b91c675bb417347
--- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml	(.../TreatmentSaline.qml)	(revision 54a8a895371d2fe6d40434fff420fa90fe5ce170)
+++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml	(.../TreatmentSaline.qml)	(revision d4b731494a05087a763afff95b91c675bb417347)
@@ -43,30 +43,26 @@
                                     isStarted   ?   _private.textStop  :
                                                     _root.buttonText
 
-    header.title    : qsTr("Saline" )
-    header.showEdit : false
+    header.title    : qsTr("Fluid Delivery" )
 
     QtObject { id: _private
         readonly property string textStart          : qsTr("Start Bolus") + "<b>" + textVolumeTarget + "<\b>"
         readonly property string textStop           : qsTr("Stop Bolus" ) + "<b>" + textVolumeTarget + "<\b>"
         readonly property string textVolumeTarget   : " (" + valueTarget + unit + ")"
-        readonly property string mesgDisabled       : qsTr("Maximum cumulative saline bolus volume delivered")
-        readonly property string mesgWaitForPump    : "" // qsTr("Saline Bolus is starting") // Not sure if we shouls show any message at this point
-        readonly property string mesgRejectReason   : vTreatmentAdjustmentSaline.adjustment_ReasonText
     }
 
-    VTreatmentSaline  { id: vTreatmentSaline }
-
     contentItem: Column { id :_content
         spacing             : Variables.defaultMargin * 3
 
         Text { id: _descriptionText
             objectName: "salineDescriptionText"
-            text            : isStarted ? ("<i>%1</i>").arg(qsTr("Delivering Saline")) : qsTr("Total Saline Delivered")
+            text            : isStarted ? ("<i>%1</i>").arg(qsTr("Delivering Fluid")) : qsTr("Total Fluid Delivered")
             height          : Variables.contentHeight
             font.pixelSize  : Fonts.fontPixelFluidText
+            font.weight     : Font.Normal
             color           : isStarted ? Colors.progressBarSaline : Colors.fluidText
             horizontalAlignment: Text.AlignHCenter
+            leftPadding     : Variables.defaultMargin
         }
 
         Item { id: _progressBarArea
@@ -84,7 +80,6 @@
                 value           : isStarted ? valueDelivered : 0
                 decimal         : _root.valueDecimal
                 radius          : 9
-                progressRadius  : radius
             }
 
             Label { id: _valueDelivered
@@ -115,8 +110,8 @@
         }
 
         TouchRect { id: _startFluidButton
-            width           : _fluidProgressBar.width
-            height          : Variables.contentHeight + 10
+            width           : Variables.defaultButtonWidth
+            height          : Variables.defaultButtonHeight
             radius          : 9
             text.textFormat : Text.RichText
             text.text       : buttonText
@@ -133,11 +128,4 @@
             }
         }
     }
-        // TODO:
-//    notification {
-//        visible : true
-//        text    : isDisabled ? _private.mesgDisabled    :
-//                  isWaitPump ? _private.mesgWaitForPump :
-//                  _private.mesgRejectReason
-//    }
 }