Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rdb77d641586bcf38af1b931296519307d5901281 -r3c543158a4f8165fe878b59e5d09ea82e06c53f5
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision db77d641586bcf38af1b931296519307d5901281)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 3c543158a4f8165fe878b59e5d09ea82e06c53f5)
@@ -9,7 +9,6 @@
     property alias headerMenuIndex          : _headerMenu.index
     property alias titleText                : _title.text
     property alias loggedUser               : _loggedInUser.text
-    property alias model                    : _model
     readonly property int currentScreen     : _headerMenu.currentScreen
     property bool isCreateRx                : false     // set in slot in parent
     property bool isHeparinFeatured         : vSettings.heparinSyringePump
@@ -30,16 +29,9 @@
         HDF         = 3
     }
 
-    onIsHeparinFeaturedChanged  : _model.setProperty(HeaderBar.Heparin, "visible", _root.isHeparinFeatured)
-    Component.onCompleted       : _model.setProperty(HeaderBar.Heparin, "visible", _root.isHeparinFeatured)
+    onIsHeparinFeaturedChanged  : vListModel.setHeaderbarVisible(HeaderBar.Heparin, _root.isHeparinFeatured)
+    Component.onCompleted       : vListModel.setHeaderbarVisible(HeaderBar.Heparin, _root.isHeparinFeatured)
 
-    ListModel { id: _model
-        ListElement {   text: qsTr("Treatment");    visible: true;      screen:  0; statusColor: "Transparent"  }   // HeaderBar.Treatment
-        ListElement {   text: qsTr("Trends");       visible: true;      screen:  1; statusColor: "Transparent"  }   // HeaderBar.Trends
-        ListElement {   text: qsTr("Heparin");      visible: true;      screen:  2; statusColor: "Transparent"  }   // HeaderBar.Heparin
-        ListElement {   text: qsTr("HDF");          visible: true;      screen:  3; statusColor: "Transparent"  }   // HeaderBar.HDF
-    }
-
     function vitalsRecorded() { _vitalsButton.pulseAnimation.start() }
 
     MouseArea { id: _mouseArea
@@ -155,7 +147,7 @@
         titlePixelSize  : 32
         backgroundColor : Colors.transparent
         highlightHeight : 15
-        model           : _model
+        model           : vListModel.headerbarModel
         onHiddenChanged : { if (hidden) { index = 0 } }
     }