Index: sources/gui/qml/main.qml
===================================================================
diff -u -rb04fa0fce565a52305f2153f2cb6c5858453ab15 -r37d205586674df8b2b50fed94336c6d7f0d8481a
--- sources/gui/qml/main.qml	(.../main.qml)	(revision b04fa0fce565a52305f2153f2cb6c5858453ab15)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 37d205586674df8b2b50fed94336c6d7f0d8481a)
@@ -324,17 +324,23 @@
         anchors.top: parent.top
     }
 
+    GuiView { id: _GuiView
+        //        Component.onCompleted: {
+        //            console.debug("GuiView - complete")
+        //        }
+    }
     // keyboard should always be before AlarmItem to not to covet it.
-    KeyboardItem        { id: _keyboard                    }
+    KeyboardItem            { id: _keyboard                    }
 
-    WiFiDialog          { id: _wifiDialog                  }
+    HeaderbarWiFi           { id: _headerbarWifi               }
     StorageDialog       { id: _storageDialog               }
     SettingsDialog      { id: _settingsDialog              }
-    LockDialog          { id: _lockDialog                  }
-    AlarmItem           { id: _alarmItem        ;   z: 996 }
-    PowerItem           { id: _powerItem        ;   z: 997 }
-    ConfirmDialog       { id: _confirmDialog    ;   z: 998 }
-    DiagnosticsDialog   { id: _diagnosticsDialog;   z: 999 }
+    HeaderbarInformation    { id: _headerbarInformation        }
+    LockDialog              { id: _lockDialog                  }
+    AlarmItem               { id: _alarmItem        ;   z: 996 }
+    PowerItem               { id: _powerItem        ;   z: 997 }
+    ConfirmDialog           { id: _confirmDialog    ;   z: 998 }
+    DiagnosticsDialog       { id: _diagnosticsDialog;   z: 999 }
 
     // Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem
     //       then cannot be anchored.
@@ -349,10 +355,4 @@
         timeout             : _alarmItem.timeout
         z                   : 995
     }
-
-    GuiView { id: _GuiView
-        //        Component.onCompleted: {
-        //            console.debug("GuiView - complete")
-        //        }
-    }
 }