Index: sources/gui/qml/components/MainMenu.qml
===================================================================
diff -u -r81aec0b1316a43c46f8c27c773d8f95e695ec273 -r69c86c57349b7d4a6ba47a801ba27b1c470fade5
--- sources/gui/qml/components/MainMenu.qml	(.../MainMenu.qml)	(revision 81aec0b1316a43c46f8c27c773d8f95e695ec273)
+++ sources/gui/qml/components/MainMenu.qml	(.../MainMenu.qml)	(revision 69c86c57349b7d4a6ba47a801ba27b1c470fade5)
@@ -27,16 +27,14 @@
 Rectangle { id: _root
 
     property alias          index           : _listView.currentIndex
+    property alias          model           : _listView.model
     property bool           hidden          : false
     property bool           disable         : false
     property int            titlePixelSize  : 40
     property color          backgroundColor : Colors.backgroundMainMenu
     property int            highlightHeight : 10
-    property bool           isMainMenu      : false
     property bool           isMainTreatment : false
-    property bool           isDiagnostics   : false
-
-    readonly property int   currentScreen   : isMainTreatment ? _mainTreatmentModel.get(index).screen : 0
+    readonly property int   currentScreen   : isMainTreatment ? model.get(index).screen : 0
     property color          statusColor     : Colors.transparent
 
     width                                   : parent.width
@@ -58,35 +56,12 @@
 
     signal itemPressed(int vIndex)
 
-    ListModel { id: _mainTreatmentModel
-        ListElement {   text: qsTr("Treatment");    visible: true;      screen:  0      }   // MainMenu.Treatment
-        ListElement {   text: qsTr("Trends");       visible: true;      screen:  1      }   // MainMenu.Trends
-        ListElement {   text: qsTr("Heparin");      visible: true;      screen:  2      }   // MainMenu.Heparin
-        ListElement {   text: qsTr("HDF");          visible: false;     screen:  3      }   // MainMenu.HDF
-    }
-
-    ListModel { id: _mainMenuModel
-        ListElement {   text: qsTr("Treatment")     ; visible: true   }
-        ListElement {   text: qsTr("Prescriptions") ; visible: true   }
-        ListElement {   text: qsTr("Settings")      ; visible: true   }
-    }
-
-    ListModel { id: _diagnosticsModel
-        ListElement {   text: qsTr("TD & Blood Handling")   ; visible: true   }
-        ListElement {   text: qsTr("DD")                    ; visible: true   }
-        ListElement {   text: qsTr("FP")                    ; visible: true   }
-    }
-
     ListView { id: _listView
         property alias  index                   : _listView.currentIndex
 
         anchors.fill                            : parent
         anchors.leftMargin                      : 30
         anchors.rightMargin                     : anchors.leftMargin
-        model                                   : isMainMenu        ? _mainMenuModel        :
-                                                  isMainTreatment   ? _mainTreatmentModel   :
-                                                  isDiagnostics     ? _diagnosticsModel     :
-                                                                      null
         currentIndex                            : 0
         highlightFollowsCurrentItem             : true
         highlightMoveDuration                   : 500