Index: sources/gui/qml/pages/settings/SettingsWiFi.qml
===================================================================
diff -u -r7360f85ae13ee2a460ddfb11bc455203d6edf3ff -rcbe04ec89eb7261a6950871dc89a3eb7f18ce9fc
--- sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision 7360f85ae13ee2a460ddfb11bc455203d6edf3ff)
+++ sources/gui/qml/pages/settings/SettingsWiFi.qml	(.../SettingsWiFi.qml)	(revision cbe04ec89eb7261a6950871dc89a3eb7f18ce9fc)
@@ -63,56 +63,34 @@
 
             width   : parent.width / 2.5
 
-            Text { id : _wifiInfoTitle
+            ReviewContainer { id: _currentWifiInfo
                 anchors {
                     top : parent.top
                     left: parent.left
                 }
-                width           : parent.width
-                height          : 60
-                text            :  qsTr("Current Wi-Fi Information")
-                font.pixelSize  : Fonts.fontPixelButton
-                font.weight     : Font.Medium
-                color           : Colors.offWhite
-
-                Line { id: _divider
-                    color   : Colors.panelBorderColor
-                    anchors {
-                        bottom      : parent.bottom
-                        bottomMargin: 10
-                        left        : parent.left
-                        right       : parent.right
-                    }
-                }
-            }
-
-            TouchGrid { id: _currentWifi
-                anchors {
-                    top : _wifiInfoTitle.bottom
-                    left: _wifiInfoTitle.left
-                }
+                title               : qsTr("Current Wi-Fi Information")
                 width               : parent.width
-                touchable           : false
-                alignCenter         : false
-                rowCount            : 5
-                colCount            : 1
-                itemWidth           : width
-                itemsText           : [ qsTr("SSID")        ,
-                                        qsTr("IP Address")  ,
-                                        qsTr("Gateway")     ,
-                                        qsTr("Subnet Mask") ,
-                                        qsTr("DNS")         ]
-                lineColor           : Colors.panelBorderColor
+                cellHeight          : 100
+                valuePixelSize      : Fonts.fontPixelTextRectTitle
+                color               : Colors.transparent
+                headerColor         : Colors.transparent
+                border.width        : 0
+                delegateFontWeight  : Font.Medium
 
-                itemsValue          : [ vDevice.ssid                                ,
-                                        _root.isConnected ? vDevice.ipAddress : ""  ,
-                                        vDevice.gateway                             ,
-                                        vDevice.subnetMask                          ,
-                                        vDevice.dns                                 ]
+                label   : [ qsTr("SSID")        ,
+                            qsTr("IP Address")  ,
+                            qsTr("Gateway")     ,
+                            qsTr("Subnet Mask") ,
+                            qsTr("DNS")         ]
 
-                delegateColor       :  Colors.transparent
-                itemsHasLine        :  Array(itemsText.length).fill(true) // sets all to true
-                itemsHasImage       :  Array(itemsText.length).fill(false) // sets all to false
+                initial : [ vDevice.ssid                                ,
+                            _root.isConnected ? vDevice.ipAddress : ""  ,
+                            vDevice.gateway                             ,
+                            vDevice.subnetMask                          ,
+                            vDevice.dns                                 ]
+
+                actual  : [ "" , "" , ""  , ""  , "" ]
+                units   : [ "" , "" , ""  , ""  , "" ]
             }
         }
 
@@ -274,11 +252,11 @@
         height                      : Variables.completeDialogHeight - 130 // need to make room for keyboard
         width                       : Variables.completeDialogWidth
         y                           : 0
-        titleText                   : isPassword ? qsTr("Join") + separator + ssid :
-                                       qsTr("Disconnect") + separator + ssid
+        titleText                   : isPassword ? qsTr("Join ") + ssid :
+                                       qsTr("Disconnect ") + ssid
         messageText                 : isPassword ? qsTr("Password") : qsTr("Do you want to disconnect from `%1`?").arg(ssid)
         messageTextPixel            : Fonts.fontPixelTextRectExtra
-        notificationText            : vDevice.status
+        footerBottomMargin          : Variables.defaultMargin * 2
 
         Item { id: _passwordItem
             readonly    property string passwordCurrent : _passwordEntry.textInput.text