Index: sources/gui/qml/pages/treatment/TreatmentTrends.qml
===================================================================
diff -u -r09674de82c6501c9fd2e250b3e54fc14961eb83d -r77063e62e298a8e74321c714011364514dd54e4f
--- sources/gui/qml/pages/treatment/TreatmentTrends.qml	(.../TreatmentTrends.qml)	(revision 09674de82c6501c9fd2e250b3e54fc14961eb83d)
+++ sources/gui/qml/pages/treatment/TreatmentTrends.qml	(.../TreatmentTrends.qml)	(revision 77063e62e298a8e74321c714011364514dd54e4f)
@@ -44,6 +44,7 @@
         readonly property int paramAreaRightMargin  : 5
         readonly property int paramWidth            : 
             (_root.width - Variables.defaultMargin - labelWidth - scrollButtonWidth - paramAreaRightMargin - _expandButton.width) / 7
+        readonly property int historyTimeWidth      : 45
     }
 
     component ScrollButton: TouchRect { id: _scrollButton
@@ -149,7 +150,7 @@
                 height              : text.length === 0 ? 0 : contentHeight
                 color               : Colors.textProgressBar
                 horizontalAlignment : Text.AlignLeft
-                text                : (_labelItem.unit.length !== 0) ? " (%1)".arg(_labelItem.unit) : ""
+                text                : (_labelItem.unit.length !== 0) ? "  (%1)".arg(_labelItem.unit) : ""
             }
             Text { id: _subLabelText
                 objectName          : "_subLabelText"
@@ -233,7 +234,7 @@
                 verticalCenter  : parent.verticalCenter
             }
             width   : contentWidth
-            color   : Colors.textProgressBar
+            color   : Colors.offWhite
             font.pixelSize       : 16
             text: _labelTime.labelText
         }
@@ -435,19 +436,19 @@
                         }
                         ValueText { id: _bloodFlowRateValue
                             objectName  : "_bloodFlowRateValue"
-                            value       : bloodFlowRate ? bloodFlowRate.toFixed(Variables.bloodFlowPrecision) : "--"
+                            value       : bloodFlowRate != undefined ? bloodFlowRate.toFixed(Variables.bloodFlowPrecision) : "--"
                         }
                         ValueText { id: _dialysateFlowRateValue
                             objectName  : "_dialysateFlowRateValue"
-                            value       : dialysateFlowRate ? dialysateFlowRate.toFixed(Variables.dialysateFlowPrecision) : "--"
+                            value       : dialysateFlowRate != undefined ? dialysateFlowRate.toFixed(Variables.dialysateFlowPrecision) : "--"
                         }
                         ValueText { id: _dialysateTemperatureValue
                             objectName  : "_dialysateTemperatureValue"
-                            value       : dialysateTemperature ? dialysateTemperature.toFixed(Variables.dialysateTempPrecision) : "--"
+                            value       : dialysateTemperature != undefined ? dialysateTemperature.toFixed(Variables.dialysateTempPrecision) : "--"
                         }
                         ValueText { id: _conductivityValue
                             objectName  : "_conductivityValue"
-                            value       : conductivity ? conductivity.toFixed(Variables.dialysateCondPrecision) : "--"
+                            value       : conductivity != undefined ? conductivity.toFixed(Variables.dialysateCondPrecision) : "--"
                             showDivider : false
                         }
                     }
@@ -574,7 +575,7 @@
                     top         : _historyHeader.bottom
                     topMargin   : Variables.defaultMargin
                     left        : parent.left
-                    leftMargin  : 10
+                    leftMargin  : Variables.defaultMargin
                     right       : parent.right
                     rightMargin : anchors.leftMargin
                 }
@@ -640,8 +641,9 @@
                         anchors {
                             top: parent.top
                             bottom: parent.bottom
+                            left: parent.left
                         }
-                        width: 50
+                        width: _private.historyTimeWidth
                         font.pixelSize: 20
                         font.weight: Font.Medium
                         color: _historyText.color
@@ -656,7 +658,7 @@
                             top: parent.top
                             bottom: parent.bottom
                             left: _time.right
-                            leftMargin: 10
+                            leftMargin: Variables.defaultMargin
                         }
                         width: 1
                         color: Colors.panelBorder
@@ -668,16 +670,15 @@
                             top: parent.top
                             bottom: parent.bottom
                             left: _historyDivider.right
-                            leftMargin: 10
+                            leftMargin: Variables.defaultMargin
                             right: parent.right
-                            rightMargin: 5
                         }
                         font.pixelSize: 18
                         color: Colors.offWhite
                         horizontalAlignment: Text.AlignLeft
                         verticalAlignment: Text.AlignVCenter
                         elide: Text.ElideRight
-                        text: entryID ? "%1 (%2: %3)".arg(message).arg(qsTr("ID")).arg(entryID) : message
+                        text: entryID ? "(%1: %2) %3".arg(qsTr("ID")).arg(entryID).arg(message) : message
                     }
                 }
             }