Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -r39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26 -r8cf828e5768d491c3e329c39b108624832054e94
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 8cf828e5768d491c3e329c39b108624832054e94)
@@ -63,7 +63,6 @@
 
     MainInitialization              { id: _postModeScreen                   }
 
-
     MainHome                        { id: _mainHome
         onCreateTreatment               : { vPreTreatmentAdjustmentInitTreatment.doInitiate( )}
     }
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r0975a67dd4e4673b9a7b226bfea02cbfa489c418 -r8cf828e5768d491c3e329c39b108624832054e94
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 0975a67dd4e4673b9a7b226bfea02cbfa489c418)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 8cf828e5768d491c3e329c39b108624832054e94)
@@ -87,7 +87,7 @@
     }
 
     TreatmentHome               { id: _treatmentHome        }
-    ScreenItem                  { id: _treatmentTrends      } // TODO: make me!
+    TreatmentTrends             { id: _treatmentTrends      }
     TreatmentHeparin            { id: _treatmentHeparin     }
     TreatmentHDF                { id: _treatmentHDF         }
 
@@ -125,26 +125,12 @@
         }
     }
 
-    TreatmentTrends             { id: _treatmentTrends
-        objectName: "_treatmentTrends"
-        Connections { target: vTDOpMode
-            function onInTreatmentChanged() {
-                if (vTDOpMode.inTreatment) {
-                    _treatmentTrends.isParamExpanded = true
-                    vTreatmentTrends.doClearData()
-                }
-            }
-        }
-    }
-
-    TreatmentHeparin            { id: _treatmentHeparin     }
     Connections { target: _treatmentHeparin
         function onIdleTimeout  ( ) {
             _headerBar.headerMenuIndex = HeaderBar.Treatment // on heparin idle timeout go to main treatment
         }
     }
 
-    TreatmentHDF                { id: _treatmentHDF         }
     Connections                 { target: _treatmentHDF
         function onSectionPressuresClicked ( ) {
             _treatmentAdjustmentPressuresLimits.open()
@@ -156,13 +142,6 @@
         }
     }
 
-    //// Treatment Adjustment Dialogs
-    TreatmentAdjustmentSetPoints            { id:       _treatmentAdjustmentSetPoints       }
-    TreatmentAdjustmentPressuresLimits      { id:       _treatmentAdjustmentPressuresLimits }
-    TreatmentAdjustmentBolusVolume          {    id:       _treatmentAdjustmentBolusVolume     }
-    TreatmentAdjustmentUltrafiltrationStack { id:       _treatmentAdjustmentUltrafiltration }
-    TreatmentAdjustmentHDF                  { id:       _treatmentAdjustmentHDF             }
-
     Connections                 { target:   _treatmentAdjustmentSetPoints
         function onConfirmClicked                   ( vValue ) {
             vTreatmentAdjustmentSetPoints.doAdjustment(
@@ -265,7 +244,13 @@
     Connections { target: vTDOpMode
         // The initail screen should be the Blood Prime, since that one is the earlier state in the list.
         // also since it is being used in two stacks In-Treatment and also in End-Treatmet is has been defined in the MainStack.
-        function onInTreatmentChanged               ( vValue ) { page( _treatmentBloodPrime  , vValue   )}
+        function onInTreatmentChanged               ( vValue ) {
+            page( _treatmentBloodPrime  , vValue   )
+            if (vValue) {
+                _treatmentTrends.isParamExpanded = true
+                vTreatmentTrends.doClearData()
+            }
+        }
     }
 
     Connections { target: vTDTreatmentStates