Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r975e1964b60365b24c74be139c6b84369a7248ce -ra8fc31a5e27e844ee98fa17f5d95b9e5f5dc15ef
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 975e1964b60365b24c74be139c6b84369a7248ce)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision a8fc31a5e27e844ee98fa17f5d95b9e5f5dc15ef)
@@ -55,7 +55,14 @@
     onHeaderMenuIndexChanged: {
         if ( _root.headerMenuIndex === 2)     page(_treatmentHeparin)
         if ( _root.headerMenuIndex === 1)     page(_treatmentTrends)
-        if ( _root.headerMenuIndex === 0)     pop(null) // unwind stack
+        if ( _root.headerMenuIndex === 0)     {
+            if (vTDOpMode.inTreatment && vTDTreatmentStates.txTreatment) {
+                page(_treatmentHome)
+            }
+            else {
+                pop(null) // unwind stack
+            }
+        }
     }
 
     // Components
@@ -82,7 +89,17 @@
         }
     }
 
-    ScreenItem                  { id: _treatmentTrends      } // TODO: make me!
+    TreatmentTrends             { id: _treatmentTrends
+        objectName: "_treatmentTrends"
+        Connections { target: vTDOpMode
+            function onInTreatmentChanged() {
+                if (vTDOpMode.inTreatment) {
+                    _treatmentTrends.isParamExpanded = true
+                    vTreatmentTrends.doClearData()
+                }
+            }
+        }
+    }
     ScreenItem                  { id: _treatmentHeparin     } // TODO: make me!
 
     //// Treatment Adjustment Dialogs