Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml
===================================================================
diff -u -r180629277c415aeea3818dd6630f2ad8b0a009ca -r91c381afa3a5a01579d47a603600f1a56c8ab5b6
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml	(.../DiagnosticsFP.qml)	(revision 180629277c415aeea3818dd6630f2ad8b0a009ca)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml	(.../DiagnosticsFP.qml)	(revision 91c381afa3a5a01579d47a603600f1a56c8ab5b6)
@@ -21,21 +21,23 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
-import "qrc:/compounds"
 
 /*!
  * \brief   the post treatment prime stack screen
  */
 DiagnosticsBase { id: _root
-    objectName: "_DiagnosticsFP"
+    objectName  : "_DiagnosticsFP"
 
-    title: qsTr("Filtration & Purification")
+    contentItem : Item { id: _content
 
-    DebugDataColumn { id: _FPPressureColumn
+        DebugDataColumn { id: _FPPressureColumn
             textObjectName  :"_FPPressureData"
             title           : qsTr(" Pressure ")
-            x: col(0)
-            y: row(0)
+            anchors {
+                top     : parent.top
+                left    : parent.left
+            }
+
             model: [
                 vFPPressures.beforePresureRegulator      .toFixed(2) ,
                 vFPPressures.afterPressureRegulator      .toFixed(2) ,
@@ -60,11 +62,14 @@
             ]
         }
 
-    DebugDataColumn { id: _FPROPumpColumn
+        DebugDataColumn { id: _FPROPumpColumn
             textObjectName  :"_FPROPumpData"
             title           : qsTr(" RO Pump ")
-            x: col(3)
-            y: row(0)
+            anchors {
+                top         : parent.top
+                left        : _FPPressureColumn.right
+                leftMargin  : spacing
+            }
             model: [
                 vFPROPump.pumpState                         ,
                 vFPROPump.pumpDutyCycle                     ,
@@ -89,11 +94,14 @@
             ]
         }
 
-    DebugDataColumn { id: _FPBoostPumpColumn
+        DebugDataColumn { id: _FPBoostPumpColumn
             textObjectName  :"_FPBoostPumpData"
             title           : qsTr(" Boost Pump ")
-            x: col(4.5)
-            y: row(0)
+            anchors {
+                top         : parent.top
+                left        : _FPROPumpColumn.right
+                leftMargin  : spacing
+            }
             model: [
                 vFPBoostPump.pumpState                         ,
                 vFPBoostPump.pumpDutyCycle                     ,
@@ -118,11 +126,14 @@
             ]
         }
 
-    DebugDataColumn { id: _FPTemperatureColumn
+        DebugDataColumn { id: _FPTemperatureColumn
             textObjectName  :"_FPTemperatureData"
             title           : qsTr(" Temperature ")
-            x: col(6)
-            y: row(0)
+            anchors {
+                top         : parent.top
+                left        : _FPBoostPumpColumn.right
+                leftMargin  : spacing
+            }
             model: [
                 vFPTemperature.inletConductivityTemp        .toFixed(2) ,
                 vFPTemperature.outletConductivityTemp       .toFixed(2) ,
@@ -155,11 +166,14 @@
             ]
         }
 
-    DebugDataColumn { id: _FPFlowColumn
+        DebugDataColumn { id: _FPFlowColumn
             textObjectName  :"_FPFlowData"
             title           : qsTr(" Flow ")
-            x: col(7.5)
-            y: row(0)
+            anchors {
+                top         : parent.top
+                left        : _FPTemperatureColumn.right
+                leftMargin  : spacing
+            }
             model: [
                 vFPFlow.waterInletFlow       .toFixed(2) ,
                 vFPFlow.waterInletTemp       .toFixed(2) ,
@@ -174,11 +188,30 @@
             ]
         }
 
-    DebugDataColumn { id: _FPConductivityColumn
+        DebugDataColumn { id: _FPLevelColumn
+            textObjectName  :"_FPLevelData"
+            title           : qsTr(" Level ")
+            anchors {
+                top         : parent.top
+                left        : _FPFlowColumn.right
+                leftMargin  : spacing
+            }
+            model: [
+                vFPLevel.P25FloaterLevel                ,
+            ]
+            label: [
+                "P25 Floater    ",
+            ]
+        }
+
+        DebugDataColumn { id: _FPConductivityColumn
             textObjectName  :"_FPConductivityData"
             title           : qsTr(" Conductivity ")
-            x: col(9)
-            y: row(0)
+            anchors {
+                top         : _FPPressureColumn.bottom
+                topMargin   : spacing
+                left        : _FPPressureColumn.left
+            }
             model: [
                 vFPConductivity.P9Conductivity           .toFixed(2) ,
                 vFPConductivity.P18Conductivity          .toFixed(2) ,
@@ -189,40 +222,23 @@
             ]
         }
 
-    DebugDataColumn { id: _FPLevelColumn
-            textObjectName  :"_FPLevelData"
-            title           : qsTr(" Level ")
-            x: col(9)
-            y: row(1)
-            model: [
-                vFPLevel.P25FloaterLevel                ,
-            ]
-            label: [
-                "P25 Floater    ",
-            ]
-        }
+        // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version.
+        TouchRect {
+            width       : _FPVersionsColumn.width
+            height      : _FPVersionsColumn.height
+            onClicked   : vAdjustmentVersions.doAdjustment()
+            radius      : 5
+            anchors {
+                bottom          : parent.bottom
+                right           : parent.right
+            }
 
-    // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version.
-    TouchRect {
-        x           : col(9.0)
-        y           : row(8.0)
-        width       : 425
-        height      : 80
-        onClicked   : vAdjustmentVersions.doAdjustment()
-        radius      : 10
-        Column {
-            anchors.top : parent.top
-            anchors.topMargin: -20
-            anchors.left: parent.left
-            anchors.leftMargin: 5
-
-            spacing: -30
-
             DebugDataColumn { id: _FPVersionsColumn
                 textObjectName  :"_FPVersionsData"
                 title           : ""
-                horizontalAlignmentText: Text.AlignLeft
-                fontPixelSizeText: Fonts.fontPixelDebugTitle
+                horizontalAlignmentText : Text.AlignLeft
+                fontPixelSizeText       : Fonts.fontPixelDebugTitle
+                isTouchRect             : true
                 model: [ "FP: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9"
                     .arg(vAdjustmentVersions.fpVerMajor             )
                     .arg(vAdjustmentVersions.fpVerMinor             )
@@ -238,7 +254,6 @@
         }
     }
 
-
     Connections { target: _GuiView
         function onDidActionReceive( vAction, vData ) {
             // DEBUG: console.debug("onDidActionReceive", vAction, vData)