Index: sources/gui/qml/pages/settings/SettingsWiFi.qml
===================================================================
diff -u -r59135abca5be03c9156d3847ccc1befa7132309e -r6f480a8d61165dd24cf8da7e9e637f89147303c3
--- sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 59135abca5be03c9156d3847ccc1befa7132309e)
+++ sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 6f480a8d61165dd24cf8da7e9e637f89147303c3)
@@ -53,13 +53,13 @@
     confirmEnabled  : isValid
     confirmVisible  : false // since the static setting is done one by one seems confirm is not needed for now.
     firstFocusInput : _ipAddress
-    notificationText: vNetwork.status
+    notificationText: vDevice.status
     onConfirmClicked:  {
-        vNetwork.doConfirm(
-            _ipAddress  .textInput.text ,
-            _gateway    .textInput.text ,
-            _subnetmask .textInput.text ,
-            _dns        .textInput.text )
+         vDevice.doConfirm(
+             _ipAddress  .textInput.text ,
+             _gateway    .textInput.text ,
+             _subnetmask .textInput.text ,
+             _dns        .textInput.text )
     }
 
     Column { id             : _ipColumn
@@ -70,52 +70,52 @@
 
         TextEntry { id      : _ipAddress
             nextInput       : _gateway // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry.
-            textInput.text  : vNetwork.ipAddress
+            textInput.text  : vDevice.ipAddress
             label.text      : qsTr("IP Address")
             textInput.width : entryWidth
             label.width     : labelWidth
-            hasCursor       : false // set false for now to disable the static IP entry for phase 1
+            // hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
-                vNetwork.doSetIPAddress(textInput.text)
+                // vDevice.doSetIPAddress(textInput.text)
             }
         }
 
         TextEntry { id      : _gateway
             nextInput       : _subnetmask // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry.
-            textInput.text  : vNetwork.gateway
+            textInput.text  : vDevice.gateway
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("Gateway")
-            hasCursor       : false // set false for now to disable the static IP entry for phase 1
+            // hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
-                vNetwork.doSetGateway(textInput.text)
+                // vDevice.doSetGateway(textInput.text)
             }
         }
 
         TextEntry { id      : _subnetmask
             nextInput       : _dns // helps user to tap on enter to go to the next entry, keyboard visibility is handled by TextEntry.
-            textInput.text  : vNetwork.subnetMask
+            textInput.text  : vDevice.subnetMask
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("Subnet Mask")
-            hasCursor       : false // set false for now to disable the static IP entry for phase 1
+            // hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
-                vNetwork.doSetSubnetMask(textInput.text)
+                // vDevice.doSetSubnetMask(textInput.text)
             }
         }
 
         TextEntry { id      : _dns
-            textInput.text  : vNetwork.dns
+            textInput.text  : vDevice.dns
             textInput.width : entryWidth
             label.width     : labelWidth
             label.text      : qsTr("DNS")
-            hasCursor       : false // set false for now to disable the static IP entry for phase 1
+            // hasCursor       : false // set false for now to disable the static IP entry for phase 1
             validator       : ipValidator
             onEnterPressed  : {
-                vNetwork.doSetDNS(textInput.text)
+                // vDevice.doSetDNS(textInput.text)
             }
         }
     }
@@ -150,18 +150,15 @@
         text.text           : qsTr("SCAN")
         width               : 350
         isDefault           : true
-        // enabled             : vDevice.wifiListEnabled
-        // onClicked           : vDevice.wifiList = ""
-        enabled             : !vNetwork.scanInProgress
-        onClicked           : vNetwork.doScan()
+        enabled             : vDevice.wifiListEnabled
+        onClicked           : vDevice.wifiList = ""
     }
 
     ScrollBar { flickable   : _networkList
                 anchors.fill: _networkList
     }
     ListView    { id        : _networkList
-        // model               : vDevice
-        model               : vNetwork
+        model               : vDevice
         clip                : true
         spacing             : 7
         y                   : _root.topMargin
@@ -178,6 +175,7 @@
             onIsConnectedChanged: {
                 if ( isConnected ) {
                     _ssidText.text = wifiSsid
+                    
                 }
             }
 
@@ -234,17 +232,17 @@
         property string macAddress  : ""
         property string separator   : "\n\n"
         readonly property string spaceSeparator : " "
-        notificationText    : vNetwork.status
+        notificationText    : vDevice.status
         message             : qsTr("Do you want to disconnect from `%1`?").arg(ssid)
         title               : isPassword ? qsTr("Join") + separator + ssid + spaceSeparator + qsTr("Password") : qsTr("Disconnect") + separator + ssid
         onConfirmClicked    : {
             if ( isPassword ) {
                 if( passwordCurrent.length > 0 ) {
-                    vNetwork.doJoinNetwork  ( macAddress, passwordCurrent )
+                    // vNetwork.doJoinNetwork  ( macAddress, passwordCurrent )
                     pop()
                 }
             } else {
-                vNetwork.doDisconnectNetwork( macAddress )
+                // vNetwork.doDisconnectNetwork( macAddress )
                 pop()
             }
         }