Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rb0370d82c7653eca5347374aa3f6b02a188c8fe7 -r0975a67dd4e4673b9a7b226bfea02cbfa489c418
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision b0370d82c7653eca5347374aa3f6b02a188c8fe7)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 0975a67dd4e4673b9a7b226bfea02cbfa489c418)
@@ -1,4 +1,5 @@
 import QtQuick 2.12
+import QtQuick.Controls 2.12 // StackView
 
 import "qrc:/components"
 import "qrc:/globals"
@@ -7,11 +8,12 @@
 
     property alias menuHidden               : _headerMenu.hidden
     property alias headerMenuIndex          : _headerMenu.index
-    property alias titleText                : _title.text
-    property alias loggedUser               : _loggedInUser.text
+    property alias userMode                 : _loggedInUser.text
     readonly property int currentScreen     : _headerMenu.currentScreen
-    property bool isCreateRx                : false     // set in slot in parent
+    property bool isCreateRx                : false     // This is to hide in the create rx icon in the screen only
     property bool isHeparinFeatured         : vSettings.heparinSyringePump
+    property bool isHDFFeatured             : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF
+    property StackView activeStack          : null
 
     width   : Variables.applicationWidth
     height  : Variables.headerHeight
@@ -29,9 +31,18 @@
         HDF         = 3
     }
 
-    onIsHeparinFeaturedChanged  : vListModel.setHeaderbarVisible(HeaderBar.Heparin, _root.isHeparinFeatured)
-    Component.onCompleted       : vListModel.setHeaderbarVisible(HeaderBar.Heparin, _root.isHeparinFeatured)
+    enum TreatmentModality {
+        Mode_HD  ,
+        Mode_HDF
+    }
 
+    onIsHDFFeaturedChanged      : vListModel.setHeaderbarHDFVisible(_root.isHDFFeatured     )
+    onIsHeparinFeaturedChanged  : vListModel.setHeaderbarHeparinVisible(_root.isHeparinFeatured )
+    Component.onCompleted       : {
+        vListModel.setHeaderbarHeparinVisible   (_root.isHeparinFeatured )
+        vListModel.setHeaderbarHDFVisible       (_root.isHDFFeatured     )
+    }
+
     function vitalsRecorded() { _vitalsButton.pulseAnimation.start() }
 
     MouseArea { id: _mouseArea
@@ -82,6 +93,9 @@
         verticalAlignment       : Text.AlignVCenter
         font.pixelSize          : Fonts.fontHeaderbarTitle
         font.weight             : Font.DemiBold
+        text                    : _root.activeStack &&
+                                  _root.activeStack.currentItem &&
+                                  _root.activeStack.currentItem.headerTitle ? _root.activeStack.currentItem.headerTitle : ""
     }
 
     Item { id: _dateTimeItem
@@ -179,18 +193,18 @@
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iPrescription"
             extraSpace      : _headerButtonRow.spacing
-            visible         : vTDOpMode.preTreatment        ||
-                              vTDOpMode.inTreatment         ||
-                              vTDOpMode.postTreatment
+            visible         : ( vTDOpMode.preTreatment      ||
+                                vTDOpMode.inTreatment       ||
+                                vTDOpMode.postTreatment )   && ! _root.isCreateRx
 
             onPressed       : _headerbarPrescription.open()
         }
 
         VitalsButton { id  : _vitalsButton
             extraSpace      : _headerButtonRow.spacing
-            visible         :( vTDOpMode.preTreatment        ||
+            visible         :  vTDOpMode.preTreatment        ||
                                vTDOpMode.inTreatment         ||
-                               vTDOpMode.postTreatment ) && ! _root.isCreateRx
+                               vTDOpMode.postTreatment
 
             onPressed       : _treatmentAdjustmentVitals.open()
         }