Index: sources/gui/qml/pages/settings/SettingsWiFi.qml
===================================================================
diff -u -r57ea732311e6f4c746974f5a52316f63dec23ca8 -rbf9223700613ced6c377f3e3a7b4de8367c30474
--- sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 57ea732311e6f4c746974f5a52316f63dec23ca8)
+++ sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision bf9223700613ced6c377f3e3a7b4de8367c30474)
@@ -41,7 +41,8 @@
     readonly property int spacing       : 20
     readonly property int leftMargin    : 50
     readonly property int rightMargin   : 50
-    readonly property int topMargin     : topMarginContent - 40 // moved up to top of the keyboard
+    readonly property int topMargin     : 160
+    readonly property bool  isConnected : vDevice.ssid !== ""
 
 
     readonly property bool  isValid     :
@@ -68,46 +69,51 @@
             textInput.width : entryWidth
             label.width     : labelWidth
             hasCursor       : false // set false for now to disable the static IP entry for phase 1
+            textInput.color : Colors.textMain
         }
 
         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  : vDevice.ssid !== "" ? vDevice.ipAddress : ""
+            textInput.text  : vDevice.ipAddress
+            textInput.visible: _root.isConnected
             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
-            validator       : ipValidator
+            textInput.color : Colors.textMain
         }
 
         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  : vDevice.gateway
+            textInput.visible: _root.isConnected
             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
-            validator       : ipValidator
+            textInput.color : Colors.textMain
         }
 
         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  : vDevice.subnetMask
+            textInput.visible: _root.isConnected
             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
-            validator       : ipValidator
+            textInput.color : Colors.textMain
         }
 
         TextEntry { id      : _dns
             textInput.text  : vDevice.dns
+            textInput.visible: _root.isConnected
             textInput.width : entryWidth
             textInput.wrapMode :  Text.WordWrap
             label.width     : labelWidth
             label.text      : qsTr("DNS")
             hasCursor       : false // set false for now to disable the static IP entry for phase 1
-//            validator       : ipValidator // Will fail the validor if there are more than 1 ip
+            textInput.color : Colors.textMain
         }
     }
 
@@ -198,7 +204,7 @@
     UserConfirmation { id : _userConfirmation
         property string ssid        : ""
         property string macAddress  : ""
-        property string separator   : "\n\n"
+        property string separator   : "\n"
         readonly property string spaceSeparator : " "
         notificationText    : vDevice.status
         message             : qsTr("Do you want to disconnect from `%1`?").arg(ssid)