Index: sources/gui/qml/pages/settings/SettingsInformation.qml
===================================================================
diff -u -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f -rabb959f145f8af64bab3b8f24314bf0ba8f3bb0e
--- sources/gui/qml/pages/settings/SettingsInformation.qml	(.../SettingsInformation.qml)	(revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
+++ sources/gui/qml/pages/settings/SettingsInformation.qml	(.../SettingsInformation.qml)	(revision abb959f145f8af64bab3b8f24314bf0ba8f3bb0e)
@@ -19,8 +19,8 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/compounds"
+import "qrc:/components"
 
-
 /*!
  * \brief   SettingsInformation is the screen
  *          which queries the system for the versions and serial numbers and service records
@@ -30,76 +30,79 @@
     itemIndex                       : SettingsStack.Information
     confirmVisible                  : false
 
-    contentItem: TouchGrid {
-        colCount    : 2
-        colSpacing  : 50
-        rowCount    : 12 // this number indicates when to move to the next column
-        rowSpacing  : 0
-        itemHeight  : 50
-        itemWidth   : 575
-        touchable   : false
-        itemsHasLine: [
-            0, // title C1
-            1,1,1,1,1,1,1,1,1,1,
-            0,0,0,
-            0,// title C2
-            1,1,1,1,
-            0, // title C2B
-            1,1,1,1
-        ]
-        itemsHasIndent: [
-            0, // title C1
-            1,1,1,1,1,1,1,1,1,1,
-            0,0,0,
-            0, // title C2
-            1,1,1,1,
-            0, // title C2B
-            1,1,1,1
-        ]
-        itemsValueLeftMargin: itemWidth / 2 + 50
-        itemsUnitLeftMargin : itemWidth / 4 + 50
-        itemsValue  : [
-            ""                                          ,
-            vDevice                 .osVersion          ,
-            Qt                      .application.version,
-            vAdjustmentVersions     .tdVerDevice        ,
-            vAdjustmentVersions     .tdVerFPGA          ,
-            vAdjustmentVersions     .tdSerial           ,
-            vAdjustmentVersions     .ddVerDevice        ,
-            vAdjustmentVersions     .ddVerFPGA          ,
-            vAdjustmentVersions     .ddSerial           ,
-            vAdjustmentVersions     .fpVerDevice        ,
-            vAdjustmentVersions     .fpVerFPGA          ,
-            "", "", "", "", // Space and title
-            vAdjustmentServiceDates .hdLastServiceDate  ,
-            vAdjustmentServiceDates .hdNextServiceDate  ,
-            vAdjustmentServiceDates .dgLastServiceDate  ,
-            vAdjustmentServiceDates .dgNextServiceDate  ,
-            "",         // Space and title
-            "",         // Space for Water Configuration Setting
-        ]
-        itemsText   : [
-            qsTr("Versions"             ), // col1 title
-            qsTr("OS Version"           ),
-            qsTr("UI Version"           ),
-            qsTr("TD Version"           ),
-            qsTr("TD FPGA Version"      ),
-            qsTr("TD Serial Number"     ),
-            qsTr("DD Version"           ),
-            qsTr("DD FPGA Version"      ),
-            qsTr("DD Serial Number"     ),
-            qsTr("FP Version"           ),
-            qsTr("FP FPGA Version"      ),
-            "", "", "", // Holders for last elements
+    contentItem:  Row {
+        anchors.fill: parent
+        spacing     : Variables.defaultMargin * 2
 
-            qsTr("Service"              ), // col2 title
-            qsTr("TD Last Service Date" ),
-            qsTr("TD Next Service Date" ),
-            qsTr("DD Last Service Date" ),
-            qsTr("DD Next Service Date" ),
+        ReviewContainer { id: _versions
+            title           : qsTr("Versions")
+            width           : parent.width / 2 - Variables.defaultMargin
+            cellHeight      : 65
+            valuePixelSize  : Fonts.fontPixelDefaultButton
 
-            qsTr("Water Configuration"  ),
-            qsTr("Water Input"          ),
-        ]
+            label   : [ qsTr("OS Version"           ),
+                        qsTr("UI Version"           ),
+                        qsTr("TD Version"           ),
+                        qsTr("TD FPGA Version"      ),
+                        qsTr("TD Serial Number"     ),
+                        qsTr("DD Version"           ),
+                        qsTr("DD FPGA Version"      ),
+                        qsTr("DD Serial Number"     ),
+                        qsTr("FP Version"           ),
+                        qsTr("FP FPGA Version"      )]
+
+            initial : [ vDevice                 .osVersion          ,
+                        Qt                      .application.version,
+                        vAdjustmentVersions     .tdVerDevice        ,
+                        vAdjustmentVersions     .tdVerFPGA          ,
+                        vAdjustmentVersions     .tdSerial           ,
+                        vAdjustmentVersions     .ddVerDevice        ,
+                        vAdjustmentVersions     .ddVerFPGA          ,
+                        vAdjustmentVersions     .ddSerial           ,
+                        vAdjustmentVersions     .fpVerDevice        ,
+                        vAdjustmentVersions     .fpVerFPGA          ]
+
+            actual  : ["","","","","","","","","",""]
+            units   : ["","","","","","","","","",""]
+        }
+
+        Column {
+            width       : parent.width / 2 - Variables.defaultMargin
+            spacing     : Variables.defaultMargin * 2
+
+            ReviewContainer { id: _service
+                title           : qsTr("Service")
+                width           : parent.width
+                cellHeight      : 65
+                valuePixelSize  : Fonts.fontPixelDefaultButton
+
+                label   : [ qsTr("TD Last Service Date" ),
+                            qsTr("TD Next Service Date" ),
+                            qsTr("DD Last Service Date" ),
+                            qsTr("DD Next Service Date" )]
+
+                initial : [ vAdjustmentServiceDates .hdLastServiceDate ,
+                            vAdjustmentServiceDates .hdNextServiceDate ,
+                            vAdjustmentServiceDates .dgLastServiceDate ,
+                            vAdjustmentServiceDates .dgNextServiceDate ]
+
+                actual  : ["","","",""]
+                units   : ["","","",""]
+            }
+
+            ReviewContainer { id: _waterConfiguration
+                title           : qsTr("Water Configuration")
+                width           : parent.width
+                cellHeight      : 65
+                valuePixelSize  : Fonts.fontPixelDefaultButton
+
+                label   : [ qsTr("Water Input" )]
+
+                initial : [ qsTr("RO Water %1" ).arg(vSettings.roWaterMode ? qsTr("Featured") : qsTr("Defeatured")) ]
+
+                actual  : [""]
+                units   : [""]
+            }
+        }
     }
 }