Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -r5a0639ee020873025a536140b8c6b5507d173412 -r21f5ab716813d1cb4bc03b5f16cab708b489b9e6
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 5a0639ee020873025a536140b8c6b5507d173412)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 21f5ab716813d1cb4bc03b5f16cab708b489b9e6)
@@ -59,7 +59,7 @@
                     _dryDemoDialog.open()
                 }
                 else {
-                    _diagnosticsDialog.open()
+//                    _diagnosticsDialog.open()
                 }
                 lastClickTime = 0
             }
@@ -244,7 +244,12 @@
             iconImageSource : "qrc:/images/iInformation"
             extraSpace      : _headerButtonRow.spacing
 
-            onPressed       : _headerbarInformation.openDialog(_informationButton)
+            onPressed       : {
+                vAdjustmentVersions     .doAdjustment()
+                vAdjustmentServiceDates .doAdjustment()
+                vHDUsageInfo            .doAdjustment()
+                _headerbarInformation.openDialog(_informationButton)
+            }
         }
     }
 }
Index: sources/gui/qml/components/HeaderBarPopup.qml
===================================================================
diff -u -r56d6ed00b13ebfeba45c999e73d0198e702e1961 -r21f5ab716813d1cb4bc03b5f16cab708b489b9e6
--- sources/gui/qml/components/HeaderBarPopup.qml	(.../HeaderBarPopup.qml)	(revision 56d6ed00b13ebfeba45c999e73d0198e702e1961)
+++ sources/gui/qml/components/HeaderBarPopup.qml	(.../HeaderBarPopup.qml)	(revision 21f5ab716813d1cb4bc03b5f16cab708b489b9e6)
@@ -18,6 +18,11 @@
      * \param   vButton     - Headerbar icon button
      */
     function openDialog     ( vButton ) {
+        if ( visible ) {
+            close()
+            return
+        }
+
         button = vButton
         adjustPosition(button)
         open()
Index: sources/gui/qml/components/MainMenu.qml
===================================================================
diff -u -r56381aae237db191956aff493907cd1f0801216b -r21f5ab716813d1cb4bc03b5f16cab708b489b9e6
--- sources/gui/qml/components/MainMenu.qml	(.../MainMenu.qml)	(revision 56381aae237db191956aff493907cd1f0801216b)
+++ sources/gui/qml/components/MainMenu.qml	(.../MainMenu.qml)	(revision 21f5ab716813d1cb4bc03b5f16cab708b489b9e6)
@@ -56,7 +56,7 @@
         anchors.rightMargin                     : anchors.leftMargin
         currentIndex                            : 0
         highlightFollowsCurrentItem             : true
-        highlightMoveDuration                   : 500
+        highlightMoveDuration                   : 250
         highlightMoveVelocity                   : -1
         orientation                             : ListView.Horizontal
         interactive                             : false
Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -r5a0639ee020873025a536140b8c6b5507d173412 -r21f5ab716813d1cb4bc03b5f16cab708b489b9e6
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision 5a0639ee020873025a536140b8c6b5507d173412)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision 21f5ab716813d1cb4bc03b5f16cab708b489b9e6)
@@ -115,6 +115,7 @@
             setPage ( _pretreatmentPrime )
             break
         case PreTreatmentStack.Step.Prime:
+            setPage ( _pretreatmentCreate )
             break
         case PreTreatmentStack.Step.CreateRx:
             _pretreatmentCreate.confirmButtonClicked()
@@ -176,8 +177,8 @@
         switch ( stepKeys[_root.stackStepIndex] ) {
 //        case PreTreatmentStack.Step.SelfTests:        // TODO set when implementing self test/ prime
 //            return _pretreatmentSelfTests.isComplete
-        case PreTreatmentStack.Step.Prime:
-            return false
+//        case PreTreatmentStack.Step.Prime:
+//            return false
         case PreTreatmentStack.Step.CreateRx:
             return _pretreatmentCreate.confirmReady()
         default: