Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 -r171387aefe2f3d21245ff32fc9b9656c79bfa406
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 171387aefe2f3d21245ff32fc9b9656c79bfa406)
@@ -35,11 +35,11 @@
         Mode_HDF
     }
 
-    onIsHDFFeaturedChanged      : vListModel.setHeaderbarVisible(HeaderBar.HDF,     _root.isHDFFeatured     )
-    onIsHeparinFeaturedChanged  : vListModel.setHeaderbarVisible(HeaderBar.Heparin, _root.isHeparinFeatured )
+    onIsHDFFeaturedChanged      : vListModel.setHeaderbarHDFVisible(_root.isHDFFeatured     )
+    onIsHeparinFeaturedChanged  : vListModel.setHeaderbarHeparinVisible(_root.isHeparinFeatured )
     Component.onCompleted       : {
-        vListModel.setHeaderbarVisible(HeaderBar.Heparin, _root.isHeparinFeatured )
-        vListModel.setHeaderbarVisible(HeaderBar.HDF,     _root.isHDFFeatured     )
+        vListModel.setHeaderbarHeparinVisible   (_root.isHeparinFeatured )
+        vListModel.setHeaderbarHDFVisible       (_root.isHDFFeatured     )
     }
 
     function vitalsRecorded() { _vitalsButton.pulseAnimation.start() }
Index: sources/gui/qml/pages/treatment/TreatmentHDF.qml
===================================================================
diff -u -r600b6707b102919d981f3b1d18611834e23eae60 -r171387aefe2f3d21245ff32fc9b9656c79bfa406
--- sources/gui/qml/pages/treatment/TreatmentHDF.qml	(.../TreatmentHDF.qml)	(revision 600b6707b102919d981f3b1d18611834e23eae60)
+++ sources/gui/qml/pages/treatment/TreatmentHDF.qml	(.../TreatmentHDF.qml)	(revision 171387aefe2f3d21245ff32fc9b9656c79bfa406)
@@ -32,7 +32,7 @@
     signal treatmentHDFEditClicked()
 
     // onStatusColorChanged: TODO update to this
-    Component.onCompleted : vListModel.setHeaderbarStatusColor(HeaderBar.HDF, _root.statusColor.toString())
+    Component.onCompleted : vListModel.setHeaderbarHDFStatusColor(_root.statusColor.toString())
 
     Connections { target: vTDOpMode
         function onInTreatmentChanged ( vValue ) { if ( vValue ) { _chart.updateXAxis() } }
Index: sources/gui/qml/pages/treatment/TreatmentHeparin.qml
===================================================================
diff -u -rbe078c5a3e044ad1d943525dd6c50124d2f78905 -r171387aefe2f3d21245ff32fc9b9656c79bfa406
--- sources/gui/qml/pages/treatment/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision be078c5a3e044ad1d943525dd6c50124d2f78905)
+++ sources/gui/qml/pages/treatment/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision 171387aefe2f3d21245ff32fc9b9656c79bfa406)
@@ -105,7 +105,7 @@
 
     Connections { target:   vTDTreatmentStates
         function onHeparinChanged                   ( vValue ) {
-            vListModel.setHeaderbarStatusColor(HeaderBar.Heparin, _root.statusColor(true).toString())
+            vListModel.setHeaderbarHeparinStatusColor(_root.statusColor(true).toString())
         }
     }
 
Index: sources/view/VListModel.cpp
===================================================================
diff -u -r3c543158a4f8165fe878b59e5d09ea82e06c53f5 -r171387aefe2f3d21245ff32fc9b9656c79bfa406
--- sources/view/VListModel.cpp	(.../VListModel.cpp)	(revision 3c543158a4f8165fe878b59e5d09ea82e06c53f5)
+++ sources/view/VListModel.cpp	(.../VListModel.cpp)	(revision 171387aefe2f3d21245ff32fc9b9656c79bfa406)
@@ -20,12 +20,22 @@
     _headerbarModel.insertRow( HDF      ,{{  eRole_Text, tr("HDF")      },  { eRole_Visible, true   }, { eRole_Screen, HDF      }, { eRole_StatusColor,  "Transparent"   }});
 }
 
-void View::VListModel::setHeaderbarStatusColor (int vRow, QString color)
+void View::VListModel::setHeaderbarHeparinStatusColor (QString color)
 {
-    _headerbarModel.updateData(vRow, eRole_StatusColor, color);
+    _headerbarModel.updateData(Heparin, eRole_StatusColor, color);
 }
 
-void View::VListModel::setHeaderbarVisible (int vRow, bool visible)
+void View::VListModel::setHeaderbarHDFStatusColor (QString color)
 {
-    _headerbarModel.updateData(vRow, eRole_Visible, visible);
+    _headerbarModel.updateData(HDFRow, eRole_StatusColor, color);
 }
+
+void View::VListModel::setHeaderbarHeparinVisible (bool visible)
+{
+    _headerbarModel.updateData(Heparin, eRole_Visible, visible);
+}
+
+void View::VListModel::setHeaderbarHDFVisible (bool visible)
+{
+    _headerbarModel.updateData(HDF, eRole_Visible, visible);
+}
Index: sources/view/VListModel.h
===================================================================
diff -u -r3c543158a4f8165fe878b59e5d09ea82e06c53f5 -r171387aefe2f3d21245ff32fc9b9656c79bfa406
--- sources/view/VListModel.h	(.../VListModel.h)	(revision 3c543158a4f8165fe878b59e5d09ea82e06c53f5)
+++ sources/view/VListModel.h	(.../VListModel.h)	(revision 171387aefe2f3d21245ff32fc9b9656c79bfa406)
@@ -43,9 +43,12 @@
     explicit VListModel(QObject *parent = nullptr);
 
 public slots:
-    void setHeaderbarStatusColor   (int vRow, QString color);
-    void setHeaderbarVisible       (int vRow, bool visible);
+    void setHeaderbarHeparinStatusColor (QString color);
+    void setHeaderbarHDFStatusColor     (QString color);
 
+    void setHeaderbarHeparinVisible     (bool visible);
+    void setHeaderbarHDFVisible         (bool visible);
+
 private:
     MListModel* headerbarModel () { return &_headerbarModel;  }
     MListModel  _headerbarModel;