Index: SDDs/Wifi.puml
===================================================================
diff -u -r4eccdd2b92306a143b0b73bb0fb2e5d4a60b64e0 -rdf622adadade170f17ed7f1971295f7f5f83fbd6
--- SDDs/Wifi.puml	(.../Wifi.puml)	(revision 4eccdd2b92306a143b0b73bb0fb2e5d4a60b64e0)
+++ SDDs/Wifi.puml	(.../Wifi.puml)	(revision df622adadade170f17ed7f1971295f7f5f83fbd6)
@@ -68,36 +68,7 @@
         end
     end
 
-    == Wi-Fi Information ==
-    group Wi-Fi Information
-        SW -> SW: ACT: Request connected Wi-Fi information
-        SW -> Script: ACT: wifi_info.sh ( )
-        activate Script
-            Script -> OS: CMD:                                                          \
-                \n\t SSID   : sudo nmcli -t -f NAME connection show --active            \
-                \n\t IPMASK : sudo nmcli -t -g IP4.ADDRESS device show wlan0            \
-                \n\t ADDR   : echo $IPMASK | sed 's/\/.*//g'                            \
-                \n\t MASK   : sudo ipcalc -m "$(echo $IPMASK)" | sed "s/NETMASK=//g")   \
-                \n\t GATEWAY: sudo nmcli -t -g IP4.GATEWAY device show wlan0)"          \
-                \n\t DNS    : sudo nmcli -t -g IP4.DNS device show wlan0 | sed "s/ //g" | sed 's/|/,/g'
-            OS -> Script: MSG: Connection Information
-            Script -> SW: MSG:      \
-                \n - echo <         \
-                    \n\t SSID       \
-                    \n\t ADDR       \
-                    \n\t MASK       \
-                    \n\t GATEWAY    \
-                    \n\t DNS        \
-                \n >                \
-                \n - exit #
-        deactivate Script
-        alt successful ( exit == 0 )
-            SW -> UI: CMD: Update Items
-        else failed
-            SW -> UI: ACT: Empty Items
-            UI -> US: ACT: Notify user
-        end
-    end
+    !include common_puml/WiFi_Info.puml
 
     == Wi-Fi Connection ==
     group Wi-Fi Connection
Index: SDDs/Wifi_Popup.png
===================================================================
diff -u
Binary files differ
Index: SDDs/Wifi_Popup.puml
===================================================================
diff -u
--- SDDs/Wifi_Popup.puml	(revision 0)
+++ SDDs/Wifi_Popup.puml	(revision df622adadade170f17ed7f1971295f7f5f83fbd6)
@@ -0,0 +1,47 @@
+@startuml Wifi_Popup
+
+    participant OS                  as OS
+    participant Script              as Script
+    participant SW                  as SW
+    participant UI                  as UI
+    actor       USER                as US
+
+    'Possible actions and interaction types
+    ' External on CANBus
+    ' TD -> SW: MSG: Message
+    ' SW -> TD: MSG: Message
+
+    ' Internal to the application
+    ' XX -> YY: CMD: Command
+    ' XX -> XX: ACT: Action
+
+    ' External on OS/FS
+    ' SW -> Script: ACT: Command
+    ' Script -> OS: CMD: Command
+    ' Script -> SW: MSG: Message
+    ' OS -> Script: MSG: Message
+
+    ' US -> UI: User actions are:
+    '   ASK: Display a <message>
+    '   ENT: User enters a value or string
+    '   TCH: User touches a button (RadioButton, CheckBox, ...)
+    '   SCL: User scrolls a flip-able area
+
+    == Normal Bootup ==
+    group Wi-Fi Information
+        SW ->o SW: ...
+    end
+
+    == Wi-Fi Popup ==
+        loop QTimerEvent
+            SW ->o SW: ⟲: ACT: Check for a valid and active Wi-Fi connection
+        end
+        alt Wi-Fi Connected 
+            SW -> UI: MSG: IP Address and SSID
+        else Wi-Fi Not Connected
+            SW -> UI: MSG: "No WiFi" or "WiFi Not Connected"
+        end
+
+    !include common_puml/WiFi_Info.puml
+
+@enduml
Index: SDDs/common_puml/WiFi_Info.puml
===================================================================
diff -u
--- SDDs/common_puml/WiFi_Info.puml	(revision 0)
+++ SDDs/common_puml/WiFi_Info.puml	(revision df622adadade170f17ed7f1971295f7f5f83fbd6)
@@ -0,0 +1,60 @@
+@startuml Wifi_Info(id=wifi_info)
+
+    participant OS                  as OS
+    participant Script              as Script
+    participant SW                  as SW
+    participant UI                  as UI
+    actor       USER                as US
+
+    'Possible actions and interaction types
+    ' External on CANBus
+    ' TD -> SW: MSG: Message
+    ' SW -> TD: MSG: Message
+
+    ' Internal to the application
+    ' XX -> YY: CMD: Command
+    ' XX -> XX: ACT: Action
+
+    ' External on OS/FS
+    ' SW -> Script: ACT: Command
+    ' Script -> OS: CMD: Command
+    ' Script -> SW: MSG: Message
+    ' OS -> Script: MSG: Message
+
+    ' US -> UI: User actions are:
+    '   ASK: Display a <message>
+    '   ENT: User enters a value or string
+    '   TCH: User touches a button (RadioButton, CheckBox, ...)
+    '   SCL: User scrolls a flip-able area
+
+    == Wi-Fi Information ==
+    group Wi-Fi Information
+        SW -> SW: ACT: Request connected Wi-Fi information
+        SW -> Script: ACT: wifi_info.sh ( )
+        activate Script
+            Script -> OS: CMD:                                                          \
+                \n\t SSID   : sudo nmcli -t -f NAME connection show --active            \
+                \n\t IPMASK : sudo nmcli -t -g IP4.ADDRESS device show wlan0            \
+                \n\t ADDR   : echo $IPMASK | sed 's/\/.*//g'                            \
+                \n\t MASK   : sudo ipcalc -m "$(echo $IPMASK)" | sed "s/NETMASK=//g")   \
+                \n\t GATEWAY: sudo nmcli -t -g IP4.GATEWAY device show wlan0)"          \
+                \n\t DNS    : sudo nmcli -t -g IP4.DNS device show wlan0 | sed "s/ //g" | sed 's/|/,/g'
+            OS -> Script: MSG: Connection Information
+            Script -> SW: MSG:      \
+                \n - echo <         \
+                    \n\t SSID       \
+                    \n\t ADDR       \
+                    \n\t MASK       \
+                    \n\t GATEWAY    \
+                    \n\t DNS        \
+                \n >                \
+                \n - exit #
+        deactivate Script
+        alt successful ( exit == 0 )
+            SW -> UI: CMD: Update Items
+        else failed
+            SW -> UI: ACT: Empty Items
+            UI -> US: ACT: Notify user
+        end
+    end
+@enduml
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -r3bee9f20350882eca47f3d18b0accf5bec3933d4 -rdf622adadade170f17ed7f1971295f7f5f83fbd6
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 3bee9f20350882eca47f3d18b0accf5bec3933d4)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision df622adadade170f17ed7f1971295f7f5f83fbd6)
@@ -114,7 +114,7 @@
 
     Row { id: _headerButtonRow
         height      : parent.height
-        spacing     : Variables.defaultMargin * 2
+        spacing     : 30
         anchors {
             verticalCenter: parent.verticalCenter
             right         : parent.right