Index: SDDs/Wifi.puml
===================================================================
diff -u -rc09499d47f00f95775c821786df5bb2531db807e -rdf92841ca338405494f1b84867d1ccf96e3b9f0d
--- SDDs/Wifi.puml	(.../Wifi.puml)	(revision c09499d47f00f95775c821786df5bb2531db807e)
+++ SDDs/Wifi.puml	(.../Wifi.puml)	(revision df92841ca338405494f1b84867d1ccf96e3b9f0d)
@@ -1,8 +1,8 @@
 @startuml Wifi
 
     participant TD                  as TD
-    participant UI                  as UI
     participant SW                  as SW
+    participant UI                  as UI
     participant Script              as Script 
     participant Operating_System    as OS
     control     Wait_Retry          as Wait_Retry
@@ -13,9 +13,11 @@
     ' SW -> TD: MSG: Message
     ' SW -> UI: CMD: command
     ' UI -> SW: ACT: Action
-    ' SW -> Script: RUN: Run script
+    ' UI -> UI: ACT: Action
+    ' SW -> Script: ACT: Action
     ' Script -> OS: CMD: command
     ' Script -> SW: MSG: Message
+    ' OS -> Script: MSG: Message
 
     ' US -> UI: User actions are:
     '   ENT: User enters a value or string
@@ -27,41 +29,62 @@
     SW -> UI: CMD: MainHome Screen
     UI ->o Wait_Retry: ⟲: MainHome Screen
     == Wi-Fi Settings Page ==
-    US -> UI: TCH: Settings Button
-    UI -> SW: CMD: Device Settings Screen
+    US -> UI: TCH: Settings Menu
+    UI -> UI: ACT: Device Settings Screen
     US -> UI: TCH: Wi-Fi Button
-    UI -> SW: CMD: Wi-Fi Settings Screen
-    SW -> Script: RUN: wifi_scan.sh
+    UI -> UI: ACT: Wi-Fi Settings Screen
+    UI -> SW: ACT: Request Wi-Fi Scan
+    SW -> Script: ACT: wifi_scan.sh
     activate Script
-    Script -> OS: CMD: 'nmcli dev wifi list'
-    Script -> SW: MSG: List of available Wi-Fi networks
+    Script -> OS: CMD: Send 'nmcli' command to get wifi networks
+    OS -> Script: MSG: Show list of Wi-Fi networks <SSID,BSSID,FREQ,RATE,\nSIGNAL,SECURITY,WPA-FLAGS,RSN-FLAGS,IN-USE>
+    Script -> SW: MSG: Return list of available Wi-Fi networks <SSID,BSSID,\nFREQ,RATE,SIGNAL,SECURITY,WPA-FLAGS,RSN-FLAGS,IN-USE>
     deactivate Script
-    SW -> UI: ACT: Process and display available networks
+    SW -> UI: ACT: Display available networks and highlight connected network
     UI ->o Wait_Retry: ⟲: Wi-Fi Screen
+        alt Wi-Fi Scan
+        US -> UI: TCH: Scan Button
+        UI -> SW: ACT: Request Wi-Fi Scan
+        SW -> Script: ACT: wifi_scan.sh
+        activate Script
+        Script -> OS: CMD: Send 'nmcli' command to get wifi networks
+        OS -> Script: MSG: Show list of Wi-Fi networks <SSID,BSSID,FREQ,RATE,\nSIGNAL,SECURITY,WPA-FLAGS,RSN-FLAGS,IN-USE>
+        Script -> SW: MSG: Return list of available Wi-Fi networks <SSID,BSSID,\nFREQ,RATE,SIGNAL,SECURITY,WPA-FLAGS,RSN-FLAGS,IN-USE>
+        deactivate Script
+        SW -> UI: ACT: Display available networks and highlight connected network
+        UI ->o Wait_Retry: ⟲: Wi-Fi Screen
+        end
         alt Connect Wi-Fi
         US -> UI: SCL: Scroll through available networks
         US -> UI: TCH: Select desired network
         US -> UI: ENT: Enter password 
             alt Confirm
             US -> UI: TCH: Confirm Button
             UI -> SW: ACT: Connect Wi-Fi by SSID and password
-            SW -> Script: RUN: wifi_connect.sh
+            SW -> Script: ACT: wifi_connect.sh
             activate Script
-            Script -> OS: CMD: 'nmcli dev wifi connect <SSID> password <password>'
+            Script -> OS: CMD: Send 'nmcli' command with SSID and password
+            OS -> Script: MSG: Result of Wi-Fi connect command
             deactivate Script
-            SW -> UI: CMD: Wi-Fi Settings Screen
-            SW -> Script: RUN: wifi_scan.sh
+            UI -> UI: ACT: Wi-Fi Settings Screen
+            UI -> SW: ACT: Request Wi-Fi Scan
+            SW -> Script: ACT: wifi_scan.sh
             activate Script
-            Script -> OS: CMD: 'nmcli dev wifi list'
-            Script --> SW: MSG: Provide list of available Wi-Fi networks
+            Script -> OS: CMD: Send 'nmcli' command to get wifi networks
+            OS -> Script: MSG: Show list of Wi-Fi networks <SSID,BSSID,FREQ,RATE,\nSIGNAL,SECURITY,WPA-FLAGS,RSN-FLAGS,IN-USE>
+            Script -> SW: MSG: Return list of available Wi-Fi networks <SSID,BSSID,\nFREQ,RATE,SIGNAL,SECURITY,WPA-FLAGS,RSN-FLAGS,IN-USE>
             deactivate Script
+            SW -> UI: ACT: Display available networks and highlight connected network
+            UI ->o Wait_Retry: ⟲: Wi-Fi Screen
                 alt Connection Successful
-                SW -> Script: RUN: wifi_info.sh
+                SW -> SW: ACT: Request connected Wi-Fi information
+                SW -> Script: ACT: wifi_info.sh
                 activate Script
                 Script -> OS: CMD: 'nmcli commands to retrieve desired parameters'
-                Script --> SW: MSG: Provide Wi-Fi info <SSID,IP,SUBNET_MASK,GATEWAY,DNS>
+                Script -> SW: MSG: Provide Wi-Fi info <SSID,IP,SUBNET_MASK,GATEWAY,DNS>
                 deactivate Script
-                SW -> UI: CMD: Update all UI fields (IP, Gateway, Subnet, DNS, SSID)
+                SW -> UI: CMD: Update all UI fields <IP,Gateway,Subnet,DNS,SSID>
+                UI ->o Wait_Retry: ⟲: Wi-Fi Screen
                 end
             else Back
             US -> UI: TCH: Back Button
@@ -71,10 +94,11 @@
         US -> UI: TCH: Select connected network
             alt Confirm
             US -> UI: TCH: Confirm Button
-            UI -> SW: ACT: Disconnect Wi-Fi by SSID
-            SW -> Script: RUN: wifi_disconnect.sh
+            UI -> SW: ACT: Request disconnect Wi-Fi by SSID
+            SW -> Script: ACT: wifi_disconnect.sh
             activate Script
-            Script -> OS: CMD: 'nmcli nmcli connection delete <SSID>'
+            Script -> OS: CMD: 'nmcli' command to disconnect from Wi-Fi network by SSID
+            OS -> Script: MSG: Result of Wi-Fi disconnect command
             deactivate Script
             SW -> UI: CMD: Clear all UI fields (IP, Gateway, Subnet, DNS, SSID)
             else Back