Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml
===================================================================
diff -u -r89be2d248cac3f748b704cd62408cf8911991039 -r81aec0b1316a43c46f8c27c773d8f95e695ec273
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml	(.../DiagnosticsFP.qml)	(revision 89be2d248cac3f748b704cd62408cf8911991039)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml	(.../DiagnosticsFP.qml)	(revision 81aec0b1316a43c46f8c27c773d8f95e695ec273)
@@ -63,164 +63,164 @@
         }
 
         DebugDataColumn { id: _FPROPumpColumn
-                textObjectName  :"_FPROPumpData"
-                title           : qsTr(" RO Pump ")
-                anchors {
-                    top         : parent.top
-                    left        : _FPPressureColumn.right
-                    leftMargin  : spacing
-                }
-                model: [
-                    vFPROPump.pumpState                         ,
-                    vFPROPump.pumpDutyCycle                     ,
-                    vFPROPump.pumpFBDutyCycle                   ,
-                    vFPROPump.pumpSpeed             .toFixed(2) ,
-                    vFPROPump.targetPressure        .toFixed(2) ,
-                    vFPROPump.targetFlow            .toFixed(2) ,
-                    vFPROPump.targetDutyCycle       .toFixed(2) ,
-                    vFPROPump.pumpDutyCyclePct      .toFixed(2) ,
-                    vFPROPump.pumpFBDutyCyclePct    .toFixed(2) ,
-                ]
-                label: [
-                    "P12 State      ",
-                    "P12 DC         ",
-                    "P12 FBDC       ",
-                    "P12 Spd        ",
-                    "P12 tPSI       ",
-                    "P12 tFlow      ",
-                    "P12 tDC        ",
-                    "P12 DCPct      ",
-                    "P12 FBDCPct    ",
-                ]
+            textObjectName  :"_FPROPumpData"
+            title           : qsTr(" RO Pump ")
+            anchors {
+                top         : parent.top
+                left        : _FPPressureColumn.right
+                leftMargin  : spacing
             }
+            model: [
+                vFPROPump.pumpState                         ,
+                vFPROPump.pumpDutyCycle                     ,
+                vFPROPump.pumpFBDutyCycle                   ,
+                vFPROPump.pumpSpeed             .toFixed(2) ,
+                vFPROPump.targetPressure        .toFixed(2) ,
+                vFPROPump.targetFlow            .toFixed(2) ,
+                vFPROPump.targetDutyCycle       .toFixed(2) ,
+                vFPROPump.pumpDutyCyclePct      .toFixed(2) ,
+                vFPROPump.pumpFBDutyCyclePct    .toFixed(2) ,
+            ]
+            label: [
+                "P12 State      ",
+                "P12 DC         ",
+                "P12 FBDC       ",
+                "P12 Spd        ",
+                "P12 tPSI       ",
+                "P12 tFlow      ",
+                "P12 tDC        ",
+                "P12 DCPct      ",
+                "P12 FBDCPct    ",
+            ]
+        }
 
         DebugDataColumn { id: _FPBoostPumpColumn
-                textObjectName  :"_FPBoostPumpData"
-                title           : qsTr(" Boost Pump ")
-                anchors {
-                    top         : parent.top
-                    left        : _FPROPumpColumn.right
-                    leftMargin  : spacing
-                }
-                model: [
-                    vFPBoostPump.pumpState                         ,
-                    vFPBoostPump.pumpDutyCycle                     ,
-                    vFPBoostPump.pumpFBDutyCycle                   ,
-                    vFPBoostPump.pumpSpeed             .toFixed(2) ,
-                    vFPBoostPump.targetPressure        .toFixed(2) ,
-                    vFPBoostPump.targetFlow            .toFixed(2) ,
-                    vFPBoostPump.targetDutyCycle       .toFixed(2) ,
-                    vFPBoostPump.pumpDutyCyclePct      .toFixed(2) ,
-                    vFPBoostPump.pumpFBDutyCyclePct    .toFixed(2) ,
-                ]
-                label: [
-                    "P40 State      ",
-                    "P40 DC         ",
-                    "P40 FBDC       ",
-                    "P40 Spd        ",
-                    "P40 tPSI       ",
-                    "P40 tFlow      ",
-                    "P40 tDC        ",
-                    "P40 DCPct      ",
-                    "P40 FBDCPct    ",
-                ]
+            textObjectName  :"_FPBoostPumpData"
+            title           : qsTr(" Boost Pump ")
+            anchors {
+                top         : parent.top
+                left        : _FPROPumpColumn.right
+                leftMargin  : spacing
             }
+            model: [
+                vFPBoostPump.pumpState                         ,
+                vFPBoostPump.pumpDutyCycle                     ,
+                vFPBoostPump.pumpFBDutyCycle                   ,
+                vFPBoostPump.pumpSpeed             .toFixed(2) ,
+                vFPBoostPump.targetPressure        .toFixed(2) ,
+                vFPBoostPump.targetFlow            .toFixed(2) ,
+                vFPBoostPump.targetDutyCycle       .toFixed(2) ,
+                vFPBoostPump.pumpDutyCyclePct      .toFixed(2) ,
+                vFPBoostPump.pumpFBDutyCyclePct    .toFixed(2) ,
+            ]
+            label: [
+                "P40 State      ",
+                "P40 DC         ",
+                "P40 FBDC       ",
+                "P40 Spd        ",
+                "P40 tPSI       ",
+                "P40 tFlow      ",
+                "P40 tDC        ",
+                "P40 DCPct      ",
+                "P40 FBDCPct    ",
+            ]
+        }
 
         DebugDataColumn { id: _FPTemperatureColumn
-                textObjectName  :"_FPTemperatureData"
-                title           : qsTr(" Temperature ")
-                anchors {
-                    top         : parent.top
-                    left        : _FPBoostPumpColumn.right
-                    leftMargin  : spacing
-                }
-                model: [
-                    vFPTemperature.inletConductivityTemp        .toFixed(2) ,
-                    vFPTemperature.outletConductivityTemp       .toFixed(2) ,
-                    vFPTemperature.beforePressureRegulatorTemp  .toFixed(2) ,
-                    vFPTemperature.afterPressureRegulatorTemp   .toFixed(2) ,
-                    vFPTemperature.beforeInletConductivityTemp  .toFixed(2) ,
-                    vFPTemperature.beforeROFilterTemp           .toFixed(2) ,
-                    vFPTemperature.afterROFilterTemp            .toFixed(2) ,
-                    vFPTemperature.beforeROPumpTemp             .toFixed(2) ,
-                    vFPTemperature.ROConcentrateTemp            .toFixed(2) ,
-                    vFPTemperature.ROConcentratePumpTemp        .toFixed(2) ,
-                    vFPTemperature.drainDropTemp                .toFixed(2) ,
-                    vFPTemperature.ROInletTemp                  .toFixed(2) ,
-                    vFPTemperature.ROOutletTemp                 .toFixed(2) ,
-                ]
-                label: [
-                    "P10 inCond     ",
-                    "P19 outCond    ",
-                    "M1 bReg        ",
-                    "M3 aReg        ",
-                    "P8 bInCond     ",
-                    "P13 bRO        ",
-                    "P17 aRO        ",
-                    "X1 bROPump     ",
-                    "X2 ROConc      ",
-                    "X3 ROConcPump  ",
-                    "X4 Drain       ",
-                    "P7 ROIn        ",
-                    "P16 ROOut      ",
-                ]
+            textObjectName  :"_FPTemperatureData"
+            title           : qsTr(" Temperature ")
+            anchors {
+                top         : parent.top
+                left        : _FPBoostPumpColumn.right
+                leftMargin  : spacing
             }
+            model: [
+                vFPTemperature.inletConductivityTemp        .toFixed(2) ,
+                vFPTemperature.outletConductivityTemp       .toFixed(2) ,
+                vFPTemperature.beforePressureRegulatorTemp  .toFixed(2) ,
+                vFPTemperature.afterPressureRegulatorTemp   .toFixed(2) ,
+                vFPTemperature.beforeInletConductivityTemp  .toFixed(2) ,
+                vFPTemperature.beforeROFilterTemp           .toFixed(2) ,
+                vFPTemperature.afterROFilterTemp            .toFixed(2) ,
+                vFPTemperature.beforeROPumpTemp             .toFixed(2) ,
+                vFPTemperature.ROConcentrateTemp            .toFixed(2) ,
+                vFPTemperature.ROConcentratePumpTemp        .toFixed(2) ,
+                vFPTemperature.drainDropTemp                .toFixed(2) ,
+                vFPTemperature.ROInletTemp                  .toFixed(2) ,
+                vFPTemperature.ROOutletTemp                 .toFixed(2) ,
+            ]
+            label: [
+                "P10 inCond     ",
+                "P19 outCond    ",
+                "M1 bReg        ",
+                "M3 aReg        ",
+                "P8 bInCond     ",
+                "P13 bRO        ",
+                "P17 aRO        ",
+                "X1 bROPump     ",
+                "X2 ROConc      ",
+                "X3 ROConcPump  ",
+                "X4 Drain       ",
+                "P7 ROIn        ",
+                "P16 ROOut      ",
+            ]
+        }
 
         DebugDataColumn { id: _FPFlowColumn
-                textObjectName  :"_FPFlowData"
-                title           : qsTr(" Flow ")
-                anchors {
-                    top         : parent.top
-                    left        : _FPTemperatureColumn.right
-                    leftMargin  : spacing
-                }
-                model: [
-                    vFPFlow.waterInletFlow       .toFixed(2) ,
-                    vFPFlow.waterInletTemp       .toFixed(2) ,
-                    vFPFlow.rOFilterOutletFlow   .toFixed(2) ,
-                    vFPFlow.rOFilterOutletTemp   .toFixed(2) ,
-                ]
-                label: [
-                    "P7 FlowIn     ",
-                    "P7 TempIn     ",
-                    "P16 FlowOut   ",
-                    "P16 TempOut   ",
-                ]
+            textObjectName  :"_FPFlowData"
+            title           : qsTr(" Flow ")
+            anchors {
+                top         : parent.top
+                left        : _FPTemperatureColumn.right
+                leftMargin  : spacing
             }
+            model: [
+                vFPFlow.waterInletFlow       .toFixed(2) ,
+                vFPFlow.waterInletTemp       .toFixed(2) ,
+                vFPFlow.rOFilterOutletFlow   .toFixed(2) ,
+                vFPFlow.rOFilterOutletTemp   .toFixed(2) ,
+            ]
+            label: [
+                "P7 FlowIn     ",
+                "P7 TempIn     ",
+                "P16 FlowOut   ",
+                "P16 TempOut   ",
+            ]
+        }
 
-        DebugDataColumn { id: _FPConductivityColumn
-                textObjectName  :"_FPConductivityData"
-                title           : qsTr(" Conductivity ")
-                anchors {
-                    top         : parent.top
-                    left        : _FPFlowColumn.right
-                    leftMargin  : spacing
-                }
-                model: [
-                    vFPConductivity.P9Conductivity           .toFixed(2) ,
-                    vFPConductivity.P18Conductivity          .toFixed(2) ,
-                ]
-                label: [
-                    "P9     ",
-                    "P18    ",
-                ]
+        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: _FPLevelColumn
-                textObjectName  :"_FPLevelData"
-                title           : qsTr(" Level ")
-                anchors {
-                    top         : _FPConductivityColumn.bottom
-                    topMargin   : spacing
-                    left        : _FPConductivityColumn.left
-                }
-                model: [
-                    vFPLevel.P25FloaterLevel                ,
-                ]
-                label: [
-                    "P25 Floater    ",
-                ]
+        DebugDataColumn { id: _FPConductivityColumn
+            textObjectName  :"_FPConductivityData"
+            title           : qsTr(" Conductivity ")
+            anchors {
+                top         : _FPPressureColumn.bottom
+                topMargin   : spacing
+                left        : _FPPressureColumn.left
             }
+            model: [
+                vFPConductivity.P9Conductivity           .toFixed(2) ,
+                vFPConductivity.P18Conductivity          .toFixed(2) ,
+            ]
+            label: [
+                "P9     ",
+                "P18    ",
+            ]
+        }
 
         // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version.
         TouchRect {
@@ -230,9 +230,8 @@
             radius      : 10
             anchors {
                 bottom          : parent.bottom
-                bottomMargin    : spacing
                 right           : parent.right
-                rightMargin     : spacing
+                rightMargin     : Variables.defaultMargin
             }
 
             DebugDataColumn { id: _FPVersionsColumn