Index: leahi.qrc
===================================================================
diff -u -rb04fa0fce565a52305f2153f2cb6c5858453ab15 -r37d205586674df8b2b50fed94336c6d7f0d8481a
--- leahi.qrc	(.../leahi.qrc)	(revision b04fa0fce565a52305f2153f2cb6c5858453ab15)
+++ leahi.qrc	(.../leahi.qrc)	(revision 37d205586674df8b2b50fed94336c6d7f0d8481a)
@@ -43,9 +43,10 @@
         <file alias="DiagnosticsDD.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml</file>
     </qresource>
     <qresource prefix="/dialogs/headerbar">
-        <file alias="WiFiDialog.qml">sources/gui/qml/dialogs/headerbar/WiFiDialog.qml</file>
+        <file alias="HeaderbarWiFi.qml">sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml</file>
         <file alias="StorageDialog.qml">sources/gui/qml/dialogs/headerbar/StorageDialog.qml</file>
         <file alias="SettingsDialog.qml">sources/gui/qml/dialogs/headerbar/SettingsDialog.qml</file>
+        <file alias="HeaderbarInformation.qml">sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml</file>
     </qresource>
     <qresource prefix="/images">
         <file alias="iLogoD">resources/images/Logo d.png</file>
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rb04fa0fce565a52305f2153f2cb6c5858453ab15 -r37d205586674df8b2b50fed94336c6d7f0d8481a
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision b04fa0fce565a52305f2153f2cb6c5858453ab15)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 37d205586674df8b2b50fed94336c6d7f0d8481a)
@@ -68,27 +68,13 @@
         }
     }
 
-    Text { id: _version     // TEST : Application version should be moved into the information screen later.
+    Text { id: _timeZone    // TEST : Current timezone
         color   : Colors.textMain
         anchors {
             top         : parent.top
             left        : parent.left
+            leftMargin  : parent.width / 5
         }
-        horizontalAlignment : Text.AlignHCenter
-        verticalAlignment   : Text.AlignBottom
-
-        height  : 15
-        width   : _root.width / 4
-        text    : Qt.application.version //DEBUG: + "[" + _GuiView.platform + "]"
-        font.pixelSize: 14
-    }
-
-    Text { id: _timeZone    // TEST : Current timezone
-        color   : Colors.textMain
-        anchors {
-            top         : parent.top
-            left        : _version.right
-        }
         horizontalAlignment : Text.Alignleft
         verticalAlignment   : Text.AlignBottom
 
@@ -136,13 +122,15 @@
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iWifi"
             extraSpace      : _headerButtonRow.spacing
-            onPressed       : _wifiDialog.openDialog(_wifiButton)
+
+            onPressed       : _headerbarWifi.openDialog(_wifiButton)
         }
 
         IconButton { id  : _bluetoothButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iBluetooth"
             extraSpace      : _headerButtonRow.spacing
+            enabled         : false
 
             onPressed       : print("Bluetooth button pressed!")
         }
@@ -151,6 +139,7 @@
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iCloudSync"
             extraSpace      : _headerButtonRow.spacing
+            enabled         : false
 
             onPressed       : print("CloudSync button pressed!")
         }
@@ -176,7 +165,7 @@
             iconImageSource : "qrc:/images/iInformation"
             extraSpace      : _headerButtonRow.spacing
 
-            onPressed       : print("Information button pressed!")
+            onPressed       : _headerbarInformation.openDialog(_informationButton)
         }
     }
 }
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")
-        //        }
-    }
 }