Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d -r3ef1a4ff361ba1774ad1a6f6170dbb174cadbdd5
--- sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 3ef1a4ff361ba1774ad1a6f6170dbb174cadbdd5)
@@ -42,60 +42,10 @@
     signal logVitalTime()
 
     readonly property int cellWidth : (_root.width / 7) - 10 // = screen width / # columns
-    readonly property int cellHeight: (_root.height / 2) - Variables.notificationHeight - (Variables.defaultMargin * 2) // = screen height / # rows - header bar - margin
+    readonly property int cellHeight: (Variables.screenContentHeight / 2) - Variables.notificationHeight  // = screen height / # rows - headerbar
 
     onLogVitalTime: _treatmentVitals.updateVitalTime()
 
-    AutoHideInfo { id: _lockDialog
-        objectName      : "lockDialog"
-
-        width: 600
-        height: 400
-        backgroundColor: "#091E31"
-        fontSize: 35
-        verticalOffset: Variables.defaultMargin * 5
-
-        Rectangle { id: _mainCircle
-            objectName:    "lockDialogMainCircle"
-            anchors {
-                top: parent.top
-                topMargin: Variables.defaultMargin * 2
-                horizontalCenter: parent.horizontalCenter
-            }
-            height      : 200
-            width       : height
-            radius      : height
-            color       : "transparent"
-            border.color: _treatmentFlows.editEnabled ? "#6697D2" :
-                                                        "#A47E38"
-            border.width: 2
-
-            Image { id  : _iconImage
-                objectName:    "lockDialogIcon"
-
-                anchors.centerIn    : parent
-                height  : 80
-                width   : 80
-                fillMode: Image.PreserveAspectFit
-                source  : _treatmentFlows.editEnabled ? "qrc:/images/iUnlock" :
-                                                        "qrc:/images/iLock"
-            }
-
-            Rectangle { id: _innerCircle
-                objectName:    "lockDialogInnerCircle"
-
-                anchors.centerIn: parent
-                color           : "transparent"
-                border.color    : _treatmentFlows.editEnabled ? "#8FC1FE" :
-                                                                "#CDAF78"
-                border.width    : 1
-                height          : parent.height - 20
-                width           : height
-                radius          : height
-            }
-        }
-    }
-
     Column { id: _column
         objectName:    "column"
 
@@ -104,7 +54,7 @@
         anchors {
             fill: parent
             margins: Variables.defaultMargin
-            topMargin : Variables.notificationHeight + 30
+            topMargin : 30
         }
 
         Row { id: _topRow
@@ -183,6 +133,7 @@
 
                 onEditClicked   : sectionFlowClicked()
                 onLockClicked   :  {
+                    _lockDialog.isLocked = editEnabled
                     _lockDialog.showDialog (
                                 editEnabled ? qsTr("Treatment Parameters Unlocked") :
                                               qsTr("Treatment Parameters Locked"),
@@ -196,7 +147,9 @@
     onVisibleChanged: {
         if (visible) {
             _mainMenu.hidden = true
-            _treatmentMenu.hidden = false
+            _headerBar.headerMenuTitles         = [ qsTr("Treatment")   ,   qsTr("Trends")  ,   qsTr("Heparin") ]
+            _headerBar.headerMenuVisibleItems   = [       true          ,   false           ,   false           ]
+            _headerBar.menuHidden = false
         }
     }
 }