Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -r07121b02499a4c929c5b5e8bd804a67539574c1b -rc70815ad2b3beadf61832f2e4d12eb90d476e020
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 07121b02499a4c929c5b5e8bd804a67539574c1b)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision c70815ad2b3beadf61832f2e4d12eb90d476e020)
@@ -36,11 +36,10 @@
         Mode_HDF
     }
 
-    onIsHDFFeaturedChanged      : vListModel.setHeaderbarHDFVisible(_root.isHDFFeatured     )
-    onIsHeparinFeaturedChanged  : vListModel.setHeaderbarHeparinVisible(_root.isHeparinFeatured )
+    onIsHDFFeaturedChanged      : vHeaderbarModel.setHeaderbarHDFVisible(_root.isHDFFeatured     )
+    onIsHeparinFeaturedChanged  : vHeaderbarModel.setHeaderbarHeparinVisible(_root.isHeparinFeatured )
     Component.onCompleted       : {
-        vListModel.setHeaderbarHeparinVisible   (_root.isHeparinFeatured )
-        vListModel.setHeaderbarHDFVisible       (_root.isHDFFeatured     )
+        vHeaderbarModel.setHeaderbarHDFVisible       (_root.isHDFFeatured     )
     }
 
     function vitalsRecorded() { _vitalsButton.pulseAnimation.start() }
@@ -160,7 +159,7 @@
         titlePixelSize  : 32
         backgroundColor : Colors.transparent
         highlightHeight : 15
-        model           : vListModel.headerbarModel
+        model           : vHeaderbarModel.model
         onHiddenChanged : { if (hidden) { index = 0 } }
     }