Index: leahi.qrc
===================================================================
diff -u -rcf4466dfa9b676d38cf535e2c1a23b14a83ea8b5 -r204d5f7514be78430a667297ced829bd104880d5
--- leahi.qrc	(.../leahi.qrc)	(revision cf4466dfa9b676d38cf535e2c1a23b14a83ea8b5)
+++ leahi.qrc	(.../leahi.qrc)	(revision 204d5f7514be78430a667297ced829bd104880d5)
@@ -34,6 +34,7 @@
         <file alias="NotificationDialog.qml">sources/gui/qml/dialogs/NotificationDialog.qml</file>
         <file alias="AlarmListDialog.qml">sources/gui/qml/dialogs/AlarmListDialog.qml</file>
         <file alias="DiagnosticsDialog.qml">sources/gui/qml/dialogs/DiagnosticsDialog.qml</file>
+        <file alias="LockDialog.qml">sources/gui/qml/dialogs/LockDialog.qml</file>
     </qresource>
     <qresource prefix="/images">
         <file alias="iLogoD">resources/images/Logo d.png</file>
Index: sources/gui/qml/components/MainMenu.qml
===================================================================
diff -u -rc25c6f4c14dd48a77d863b0af4c708cb781db91c -r204d5f7514be78430a667297ced829bd104880d5
--- sources/gui/qml/components/MainMenu.qml	(.../MainMenu.qml)	(revision c25c6f4c14dd48a77d863b0af4c708cb781db91c)
+++ sources/gui/qml/components/MainMenu.qml	(.../MainMenu.qml)	(revision 204d5f7514be78430a667297ced829bd104880d5)
@@ -62,7 +62,7 @@
         model                                   : _model
         currentIndex                            : 0
         highlightFollowsCurrentItem             : true
-        highlightMoveDuration                   : 750
+        highlightMoveDuration                   : 500
         highlightMoveVelocity                   : -1
         orientation                             : ListView.Horizontal
         interactive                             : false
Index: sources/gui/qml/dialogs/LockDialog.qml
===================================================================
diff -u
--- sources/gui/qml/dialogs/LockDialog.qml	(revision 0)
+++ sources/gui/qml/dialogs/LockDialog.qml	(revision 204d5f7514be78430a667297ced829bd104880d5)
@@ -0,0 +1,58 @@
+// Qt
+import QtQuick 2.12
+
+//  Qml imports
+import "qrc:/components"
+import "qrc:/dialogs"
+import "qrc:/globals"
+
+// Treatment Lock Dialog
+AutoHideInfo { id: _root
+    property bool isLocked: false
+
+    width   : 600
+    height  : 400
+    backgroundColor: "#091E31"
+    fontSize: 35
+    verticalOffset: Variables.defaultMargin * 5
+
+    Rectangle { id: _mainCircle
+        objectName:    "mainCircle"
+        anchors {
+            top: parent.top
+            topMargin: Variables.defaultMargin * 2
+            horizontalCenter: parent.horizontalCenter
+        }
+        height      : 200
+        width       : height
+        radius      : height
+        color       : "transparent"
+        border.color: _root.isLocked ?  "#6697D2" :
+                                        "#A47E38"
+        border.width: 2
+
+        Image { id  : _iconImage
+            objectName:    "iconImage"
+
+            anchors.centerIn    : parent
+            height  : 80
+            width   : 80
+            fillMode: Image.PreserveAspectFit
+            source  : _root.isLocked ?  "qrc:/images/iUnlock" :
+                                        "qrc:/images/iLock"
+        }
+
+        Rectangle { id: _innerCircle
+            objectName:    "inncerCircle"
+
+            anchors.centerIn: parent
+            color           : "transparent"
+            border.color    : _root.isLocked ?  "#8FC1FE" :
+                                                "#CDAF78"
+            border.width    : 1
+            height          : parent.height - 20
+            width           : height
+            radius          : height
+        }
+    }
+}
Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -r3ef1a4ff361ba1774ad1a6f6170dbb174cadbdd5 -r204d5f7514be78430a667297ced829bd104880d5
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 3ef1a4ff361ba1774ad1a6f6170dbb174cadbdd5)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 204d5f7514be78430a667297ced829bd104880d5)
@@ -70,7 +70,7 @@
             Behavior on opacity { OpacityAnimator { duration: 1000 } }
             opacity         : _postModeScreen.visible ? 1 : 0
             anchors.centerIn: parent
-            anchors.verticalCenterOffset: -Variables.notificationHeight
+            anchors.verticalCenterOffset: Variables.notificationHeight * -1
             source          : "qrc:/images/iLogoDiality"
         }
 
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r76e1360b5d2377d4f6d3310d524a902a04e64ff1 -r204d5f7514be78430a667297ced829bd104880d5
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 76e1360b5d2377d4f6d3310d524a902a04e64ff1)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 204d5f7514be78430a667297ced829bd104880d5)
@@ -17,10 +17,10 @@
 import QtQuick 2.12
 
 //  Qml imports
-import "qrc:/globals"
 import "qrc:/components"
 import "qrc:/compounds"
 import "qrc:/dialogs"
+import "qrc:/globals"
 import "qrc:/pages/treatment/adjustments"
 
 /*!
@@ -164,58 +164,8 @@
         }
     }
 
-    // Treatment Lock Dialog
-    AutoHideInfo { id: _lockDialog
-        objectName      : "lockDialog"
-        property bool isLocked: false
+    LockDialog { id: _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: _lockDialog.isLocked ?    "#6697D2" :
-                                                    "#A47E38"
-            border.width: 2
-
-            Image { id  : _iconImage
-                objectName:    "lockDialogIcon"
-
-                anchors.centerIn    : parent
-                height  : 80
-                width   : 80
-                fillMode: Image.PreserveAspectFit
-                source  : _lockDialog.isLocked ?    "qrc:/images/iUnlock" :
-                                                    "qrc:/images/iLock"
-            }
-
-            Rectangle { id: _innerCircle
-                objectName:    "lockDialogInnerCircle"
-
-                anchors.centerIn: parent
-                color           : "transparent"
-                border.color    : _lockDialog.isLocked ?    "#8FC1FE" :
-                                                            "#CDAF78"
-                border.width    : 1
-                height          : parent.height - 20
-                width           : height
-                radius          : height
-            }
-        }
-    }
-
     // ---------- Manages Responses ----------
     Connections { target: vTreatmentAdjustmentDuration
         function onAdjustmentTriggered              ( vValue ) {