Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -r3082da7333694567052cdf407765e0e409328a5b -r03fc094f2ee80d50ad2eb09def56b9f4b8d15b8f
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 3082da7333694567052cdf407765e0e409328a5b)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 03fc094f2ee80d50ad2eb09def56b9f4b8d15b8f)
@@ -338,6 +338,9 @@
     readonly property string unitTextHeparin                : unitTextFluid
     readonly property string unitWeight                     : qsTr("Kg")
 
+    // - RPM
+    readonly property string unitTextPumpRate               : qsTr("RPM")
+
     // - Pressure
     readonly property string unitTextPressure               : qsTr("mmHg")
     // - Temperature
Index: sources/gui/qml/pages/settings/servicemode/ServiceModeHydraulics.qml
===================================================================
diff -u -r3082da7333694567052cdf407765e0e409328a5b -r03fc094f2ee80d50ad2eb09def56b9f4b8d15b8f
--- sources/gui/qml/pages/settings/servicemode/ServiceModeHydraulics.qml	(.../ServiceModeHydraulics.qml)	(revision 3082da7333694567052cdf407765e0e409328a5b)
+++ sources/gui/qml/pages/settings/servicemode/ServiceModeHydraulics.qml	(.../ServiceModeHydraulics.qml)	(revision 03fc094f2ee80d50ad2eb09def56b9f4b8d15b8f)
@@ -156,25 +156,25 @@
             horizontalCenter: parent.horizontalCenter
         }
         text                : qsTr("Current Pump Rate")
-        unitText            : qsTr("D-to-A")
+        unitText            : Varaibles.unitTextPumpRate
         showEdit            : true
         width               :  _root.width / 3
         visible             : _root.currentIndex === ServiceModeHydraulics.DeaerationPressure
 
+//        onEditClicked       : _numPad.open(_pumpRate, qsTr("Current Pump Rate"),"","", Varaibles.unitTextPumpRate)
 
-        contentItem : TextEntry { id: _pretreatmentPatientIDEntry
-            clip                        : true
-            textInput.width             : parent.width - Variables.defaultMargin * 4
-            text                        : vTreatmentCreate.patientID
+        contentItem : Text { id: _pumpRate
+//            textInput.width             : parent.width - Variables.defaultMargin * 4
+            text                        : "23424234"//vTreatmentCreate.patientID
             anchors.centerIn            : parent
-            textInput.maximumLength     : 20  // LEAHI-PRS-236
-            textInput.rightPadding      : Variables.defaultMargin
-            textInput.leftPadding       : Variables.defaultMargin * 14
-            textInput.inputMethodHints  : Qt.ImhPreferLowercase
-            textInput.echoMode          : TextInput.Normal
-            textInput.validator         : RegExpValidator { regExp: Variables.regExp_PatientID }
-            line.visible                : false
-            textInput.onTextChanged     : vTreatmentCreate.patientID = textInput.text
+//            textInput.maximumLength     : 20  // LEAHI-PRS-236
+//            textInput.rightPadding      : Variables.defaultMargin
+//            textInput.leftPadding       : Variables.defaultMargin * 14
+//            textInput.inputMethodHints  : Qt.ImhPreferLowercase
+//            textInput.echoMode          : TextInput.Normal
+//            textInput.validator         : RegExpValidator { regExp: Variables.regExp_PatientID }
+//            line.visible                : false
+//            textInput.onTextChanged     : vTreatmentCreate.patientID = textInput.text
 
             Text { id: _placeHolderText
                 text                : Variables.emptyEntry
@@ -183,8 +183,7 @@
                 horizontalAlignment : Text.AlignRight
                 font.pixelSize      : Fonts.fontPixelValueControl
                 color               : Colors.offWhite
-                visible             :   _pretreatmentPatientIDEntry.textInput.text.length === 0 &&
-                                      ! _pretreatmentPatientIDEntry.textInput.activeFocus
+                visible             :   _pretreatmentPatientIDEntry.textInput.text.length === 0
             }
         }
     }