Index: sources/gui/qml/pages/settings/SettingsInformation.qml
===================================================================
diff -u -r3428dfd1fb3372d8de9a7c1afc55e4860b70ec89 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/settings/SettingsInformation.qml	(.../SettingsInformation.qml)	(revision 3428dfd1fb3372d8de9a7c1afc55e4860b70ec89)
+++ sources/gui/qml/pages/settings/SettingsInformation.qml	(.../SettingsInformation.qml)	(revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -27,15 +27,10 @@
  *          and display them
  */
 SettingsBase    { id: _root
-    itemIndex       : SettingsStack.Information
+    itemIndex                       : SettingsStack.Information
+    confirmVisible                  : false
 
-    confirmVisible          : false
-
-    TouchGrid {
-        anchors.top             : parent.top
-        anchors.topMargin       : 50
-        anchors.horizontalCenter: parent.horizontalCenter
-
+    contentItem: TouchGrid {
         colCount    : 2
         colSpacing  : 50
         rowCount    : 12 // this number indicates when to move to the next column
@@ -45,16 +40,16 @@
         touchable   : false
         itemsHasLine: [
             0, // title C1
-            1,1,1,1,1,1,1,1,
+            1,1,1,1,1,1,1,1,1,1,
             0,0,0,
-            0, // title C2
+            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,1,1,1,1,1,1,1,1,
             0,0,0,
             0, // title C2
             1,1,1,1,
@@ -73,16 +68,15 @@
             vAdjustmentVersions     .ddVerDevice        ,
             vAdjustmentVersions     .ddVerFPGA          ,
             vAdjustmentVersions     .ddSerial           ,
+            vAdjustmentVersions     .fpVerDevice        ,
+            vAdjustmentVersions     .fpVerFPGA          ,
             "", "", "", "", // Space and title
             vAdjustmentServiceDates .hdLastServiceDate  ,
             vAdjustmentServiceDates .hdNextServiceDate  ,
             vAdjustmentServiceDates .dgLastServiceDate  ,
             vAdjustmentServiceDates .dgNextServiceDate  ,
             "",         // Space and title
-            vHDUsageInfo            .totalTxHours                   ,
-            vHDUsageInfo            .totalTxHoursSinceLastService   ,
-            vHDUsageInfo            .epochOfStartOfLastTx           ,
-            vHDUsageInfo            .epochOfLastRecordReset         ,
+            "",         // Space for Water Configuration Setting
         ]
         itemsText   : [
             qsTr("Versions"             ), // col1 title
@@ -94,19 +88,18 @@
             qsTr("DD Version"           ),
             qsTr("DD FPGA Version"      ),
             qsTr("DD Serial Number"     ),
+            qsTr("FP Version"           ),
+            qsTr("FP FPGA Version"      ),
             "", "", "", // Holders for last elements
 
             qsTr("Service"              ), // col2 title
-            qsTr("HD Last Service Date" ),
-            qsTr("HD Next Service Date" ),
-            qsTr("DG Last Service Date" ),
-            qsTr("DG Next Service Date" ),
+            qsTr("TD Last Service Date" ),
+            qsTr("TD Next Service Date" ),
+            qsTr("DD Last Service Date" ),
+            qsTr("DD Next Service Date" ),
 
-            qsTr("Treatment"                ),
-            qsTr("Total Hours"              ),
-            qsTr("Hours Since Last Service" ),
-            qsTr("Last Start"               ),
-            qsTr("Last Reset"               ),
+            qsTr("Water Configuration"  ),
+            qsTr("Water Input"          ),
         ]
     }
 }