Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8)
@@ -57,24 +57,19 @@
                                          || _treatmentUltrafiltrationItem       .visible
     // Components
     MainMenu            { id: _treatmentMenu
-        y               : Variables.mainMenuHeight * -1
         position        : MainMenu.Position.Top
         hidden          : true
-        titles          : [ qsTr("Treatment") , qsTr("Trending") , qsTr("Settings") ]
-        visibleItems    : [       true        ,       false      ,       false      ]
-        spacing         :  20
-        leftPdding      :  20
-        rightPdding     :  50
-        partitionWidth  : 100 // Todo Important : max width should be the width for all bottons
-        hasRightText    : true
-        hasLogo         : true
-        /* ----- TEST: Under the test code, for the plotting of the items -----
+        titles          : [ qsTr("Treatment")   ,   qsTr("Trends")  ,   qsTr("Heparin")]
+        visibleItems    : [       true          ,   false           ,   false  ]
+        spacing         :  Variables.defaultMargin
+        leftPdding      :  Variables.headerBarDateTimeWidth + Variables.columnSpacing // 200 + 60
+        partitionWidth  : 80 * titles.length// Todo Important : max width should be the width for all bottons
+        titlePixelSize  : 32
+
         onCurrentIndexChanged: {
-            console.debug(currentIndex)
-            if (currentIndex == 1) push(_treatmentTrending)
-            if (currentIndex == 0) pop()
+            if (currentIndex === 1)     push(_treatmentTrends)
+            if (currentIndex === 0)     pop()
         }
-        */
     }
 
     TreatmentBloodPrime         { id: _treatmentBloodPrime          }
@@ -101,7 +96,8 @@
         }
     }
 
-    ScreenItem                  { id: _treatmentTrending    }
+    ScreenItem                  { id: _treatmentTrends      } // TODO: make me!
+    ScreenItem                  { id: _treatmentHeparin     } // TODO: make me!
 
     //// Treatment Adjustment Dialogs
     TreatmentAdjustmentFlow             { id:       _treatmentAdjustmentFlow    }
@@ -144,6 +140,7 @@
                         _bphrEntry.diastolic  ,
                         _bphrEntry.heartRate
                         )
+            _treatmentHome.logVitalTime()
         }
 
         onCloseClicked          : {