diff --git a/src/Gui/GcWindowRegistry.cpp b/src/Gui/GcWindowRegistry.cpp
index 6df0e7ff6..de7b0713b 100644
--- a/src/Gui/GcWindowRegistry.cpp
+++ b/src/Gui/GcWindowRegistry.cpp
@@ -101,8 +101,8 @@ GcWindowRegistry::initialize()
     //{ VIEW_ANALYSIS, tr("Bing Map"),GcWindowTypes::BingMap },
     { VIEW_ANALYSIS, tr("Scatter"),GcWindowTypes::Scatter },
     { VIEW_ANALYSIS, tr("Aerolab"),GcWindowTypes::Aerolab },
-    { VIEW_DIARY, tr("Calendar"),GcWindowTypes::Diary },
-    { VIEW_DIARY, tr("Navigator"), GcWindowTypes::ActivityNavigator },
+    { VIEW_TRENDS|VIEW_DIARY, tr("Calendar"),GcWindowTypes::Diary },
+    { VIEW_TRENDS|VIEW_DIARY, tr("Navigator"), GcWindowTypes::ActivityNavigator },
     //{ VIEW_DIARY|VIEW_TRENDS, tr("Summary "), GcWindowTypes::DateRangeSummary }, // DEPRECATED IN V3.6
     { VIEW_TRAIN, tr("Telemetry"),GcWindowTypes::DialWindow },
     { VIEW_TRAIN, tr("Workout"),GcWindowTypes::WorkoutPlot },
diff --git a/src/Resources/xml/home-perspectives.xml b/src/Resources/xml/home-perspectives.xml
index 671499a4b..0019a32f3 100644
--- a/src/Resources/xml/home-perspectives.xml
+++ b/src/Resources/xml/home-perspectives.xml
@@ -595,4 +595,28 @@
 		<property name="settings" type="QString" value="{ &quot;title&quot;: &quot;Macro Nutrient Distribution &quot;,\n&quot;description&quot;: &quot;PRO:sl:/CHO:sl:/FAT as % of Energy intake and relative to body weight (g:sl:/kg) &quot;,\n&quot;type&quot;: 1,\n&quot;animate&quot;: false,\n&quot;intervalrefresh&quot;: false,\n&quot;legendpos&quot;: 3,\n&quot;stack&quot;: false,\n&quot;orientation&quot;: 2,\n&quot;bgcolor&quot;: &quot;#010102&quot;, \n&quot;scale&quot;: 1,\n&quot;SERIES&quot;: [\n{ &quot;name&quot;: &quot;PRO% &quot;, &quot;group&quot;: &quot; &quot;, &quot;xname&quot;: &quot;Date% &quot;, &quot;yname&quot;: &quot;% &quot;, &quot;program&quot;: &quot;{:sl:n    finalise {:sl:n        xx &lt;- measures(:qu:Nutrition:qu:, :qu:date:qu:);:sl:n        yy &lt;- 400*measures(:qu:Nutrition:qu:, :qu:PRO:qu:):sl:/measures(:qu:Nutrition:qu:, :qu:Energy:qu:);:sl:n:sl:n        avg &lt;- 400*sum(measures(:qu:Nutrition:qu:, :qu:PRO:qu:)):sl:/sum(measures(:qu:Nutrition:qu:, :qu:Energy:qu:));:sl:n        annotate(label, :qu:Avg PRO %:qu:, round(avg));:sl:n    }:sl:n:sl:n    x { xx; }:sl:n    y { yy; }:sl:n}:sl:n &quot;, &quot;line&quot;: 1, &quot;symbol&quot;: 0, &quot;size&quot;: 0, &quot;color&quot;: &quot;#c7c763&quot;, &quot;opacity&quot;: 1, &quot;legend&quot;: true, &quot;opengl&quot;: true, &quot;datalabels&quot;: false, &quot;aggregate&quot;: 1, &quot;fill&quot;: false},\n{ &quot;name&quot;: &quot;CHO% &quot;, &quot;group&quot;: &quot; &quot;, &quot;xname&quot;: &quot;Date% &quot;, &quot;yname&quot;: &quot;% &quot;, &quot;program&quot;: &quot;{:sl:n    finalise {:sl:n        xx &lt;- measures(:qu:Nutrition:qu:, :qu:date:qu:);:sl:n        yy &lt;- 400*measures(:qu:Nutrition:qu:, :qu:CHO:qu:):sl:/measures(:qu:Nutrition:qu:, :qu:Energy:qu:);:sl:n:sl:n        avg &lt;- 400*sum(measures(:qu:Nutrition:qu:, :qu:CHO:qu:)):sl:/sum(measures(:qu:Nutrition:qu:, :qu:Energy:qu:));:sl:n        annotate(label, :qu:Avg CHO %:qu:, round(avg));:sl:n    }:sl:n:sl:n    x { xx; }:sl:n    y { yy; }:sl:n}:sl:n &quot;, &quot;line&quot;: 1, &quot;symbol&quot;: 0, &quot;size&quot;: 0, &quot;color&quot;: &quot;#46d367&quot;, &quot;opacity&quot;: 1, &quot;legend&quot;: true, &quot;opengl&quot;: true, &quot;datalabels&quot;: false, &quot;aggregate&quot;: 1, &quot;fill&quot;: false},\n{ &quot;name&quot;: &quot;FAT% &quot;, &quot;group&quot;: &quot; &quot;, &quot;xname&quot;: &quot;Date% &quot;, &quot;yname&quot;: &quot;% &quot;, &quot;program&quot;: &quot;{:sl:n    finalise {:sl:n        xx &lt;- measures(:qu:Nutrition:qu:, :qu:date:qu:);:sl:n        yy &lt;- 900*measures(:qu:Nutrition:qu:, :qu:FAT:qu:):sl:/measures(:qu:Nutrition:qu:, :qu:Energy:qu:);:sl:n:sl:n        avg &lt;- 900*sum(measures(:qu:Nutrition:qu:, :qu:FAT:qu:)):sl:/sum(measures(:qu:Nutrition:qu:, :qu:Energy:qu:));:sl:n        annotate(label, :qu:Avg FAT %:qu:, round(avg));:sl:n    }:sl:n:sl:n    x { xx; }:sl:n    y { yy; }:sl:n} &quot;, &quot;line&quot;: 1, &quot;symbol&quot;: 0, &quot;size&quot;: 0, &quot;color&quot;: &quot;#ffaa7f&quot;, &quot;opacity&quot;: 1, &quot;legend&quot;: true, &quot;opengl&quot;: true, &quot;datalabels&quot;: false, &quot;aggregate&quot;: 1, &quot;fill&quot;: false},\n{ &quot;name&quot;: &quot;PRO &quot;, &quot;group&quot;: &quot; &quot;, &quot;xname&quot;: &quot;Date &quot;, &quot;yname&quot;: &quot;g:sl:/kg &quot;, &quot;program&quot;: &quot;{:sl:n    finalise {:sl:n        xx &lt;- measures(:qu:Nutrition:qu:, :qu:date:qu:);:sl:n        yy &lt;- measures(:qu:Nutrition:qu:, :qu:PRO:qu:):sl:/measures(:qu:Body:qu:, :qu:WEIGHTKG:qu:);:sl:n:sl:n        avg &lt;- mean(yy);:sl:n        annotate(label, :qu:Avg PRO g:sl:/kg:qu:, round(10*avg):sl:/10);:sl:n    }:sl:n:sl:n    x { xx; }:sl:n    y { yy; }:sl:n}:sl:n &quot;, &quot;line&quot;: 1, &quot;symbol&quot;: 0, &quot;size&quot;: 0, &quot;color&quot;: &quot;#c7c763&quot;, &quot;opacity&quot;: 1, &quot;legend&quot;: true, &quot;opengl&quot;: true, &quot;datalabels&quot;: false, &quot;aggregate&quot;: 1, &quot;fill&quot;: false},\n{ &quot;name&quot;: &quot;CHO &quot;, &quot;group&quot;: &quot; &quot;, &quot;xname&quot;: &quot;Date &quot;, &quot;yname&quot;: &quot;g:sl:/kg &quot;, &quot;program&quot;: &quot;{:sl:n    finalise {:sl:n        xx &lt;- measures(:qu:Nutrition:qu:, :qu:date:qu:);:sl:n        yy &lt;- measures(:qu:Nutrition:qu:, :qu:CHO:qu:):sl:/measures(:qu:Body:qu:, :qu:WEIGHTKG:qu:);:sl:n:sl:n        avg &lt;- mean(yy);:sl:n        annotate(label, :qu:Avg CHO g:sl:/kg:qu:, round(10*avg):sl:/10);:sl:n    }:sl:n:sl:n    x { xx; }:sl:n    y { yy; }:sl:n}:sl:n &quot;, &quot;line&quot;: 1, &quot;symbol&quot;: 0, &quot;size&quot;: 0, &quot;color&quot;: &quot;#46d367&quot;, &quot;opacity&quot;: 1, &quot;legend&quot;: true, &quot;opengl&quot;: true, &quot;datalabels&quot;: false, &quot;aggregate&quot;: 1, &quot;fill&quot;: false},\n{ &quot;name&quot;: &quot;FAT &quot;, &quot;group&quot;: &quot; &quot;, &quot;xname&quot;: &quot;Date &quot;, &quot;yname&quot;: &quot;g:sl:/kg &quot;, &quot;program&quot;: &quot;{:sl:n    finalise {:sl:n        xx &lt;- measures(:qu:Nutrition:qu:, :qu:date:qu:);:sl:n        yy &lt;- measures(:qu:Nutrition:qu:, :qu:FAT:qu:):sl:/measures(:qu:Body:qu:, :qu:WEIGHTKG:qu:);:sl:n:sl:n        avg &lt;- mean(yy);:sl:n        annotate(label, :qu:Avg FAT g:sl:/kg:qu:, round(10*avg):sl:/10);:sl:n    }:sl:n:sl:n    x { xx; }:sl:n    y { yy; }:sl:n}:sl:n &quot;, &quot;line&quot;: 1, &quot;symbol&quot;: 0, &quot;size&quot;: 0, &quot;color&quot;: &quot;#ffaa7f&quot;, &quot;opacity&quot;: 1, &quot;legend&quot;: true, &quot;opengl&quot;: true, &quot;datalabels&quot;: false, &quot;aggregate&quot;: 1, &quot;fill&quot;: false} ]\n,\n&quot;AXES&quot;: [\n{ &quot;name&quot;: &quot;Date% &quot;, &quot;type&quot;: 1, &quot;orientation&quot;: 1, &quot;align&quot;: 1, &quot;minx&quot;: 0, &quot;maxx&quot;: 0, &quot;miny&quot;: 0, &quot;maxy&quot;: 0, &quot;smooth&quot;: 0, &quot;groupby&quot;: 0, &quot;visible&quot;: true, &quot;fixed&quot;: false, &quot;log&quot;: false, &quot;minorgrid&quot;: false, &quot;majorgrid&quot;: true, &quot;labelcolor&quot;: &quot;#2684f6&quot;, &quot;axiscolor&quot;: &quot;#2684f6&quot;},\n{ &quot;name&quot;: &quot;% &quot;, &quot;type&quot;: 0, &quot;orientation&quot;: 2, &quot;align&quot;: 1, &quot;minx&quot;: 0, &quot;maxx&quot;: 0, &quot;miny&quot;: 0, &quot;maxy&quot;: 100, &quot;smooth&quot;: 0, &quot;groupby&quot;: 0, &quot;visible&quot;: true, &quot;fixed&quot;: true, &quot;log&quot;: false, &quot;minorgrid&quot;: false, &quot;majorgrid&quot;: true, &quot;labelcolor&quot;: &quot;#c7c763&quot;, &quot;axiscolor&quot;: &quot;#c7c763&quot;},\n{ &quot;name&quot;: &quot;Date &quot;, &quot;type&quot;: 1, &quot;orientation&quot;: 1, &quot;align&quot;: 1, &quot;minx&quot;: 0, &quot;maxx&quot;: 0, &quot;miny&quot;: 0, &quot;maxy&quot;: 0, &quot;smooth&quot;: 0, &quot;groupby&quot;: 0, &quot;visible&quot;: true, &quot;fixed&quot;: false, &quot;log&quot;: false, &quot;minorgrid&quot;: false, &quot;majorgrid&quot;: true, &quot;labelcolor&quot;: &quot;#2684f6&quot;, &quot;axiscolor&quot;: &quot;#2684f6&quot;},\n{ &quot;name&quot;: &quot;g:sl:/kg &quot;, &quot;type&quot;: 0, &quot;orientation&quot;: 2, &quot;align&quot;: 1, &quot;minx&quot;: 0, &quot;maxx&quot;: 0, &quot;miny&quot;: 0, &quot;maxy&quot;: 0, &quot;smooth&quot;: 0, &quot;groupby&quot;: 0, &quot;visible&quot;: true, &quot;fixed&quot;: false, &quot;log&quot;: false, &quot;minorgrid&quot;: false, &quot;majorgrid&quot;: true, &quot;labelcolor&quot;: &quot;#c7c763&quot;, &quot;axiscolor&quot;: &quot;#c7c763&quot;} ]\n}" />
 	</chart>
 </layout>
+<layout name="Diary" style="0" type="8" expression="" trainswitch="0">
+	<chart id="4" name="" title="Calendar" >
+		<property name="title" type="QString" value="Calendar" />
+		<property name="subtitle" type="QString" value="" />
+		<property name="widthFactor" type="double" value="2" />
+		<property name="heightFactor" type="double" value="2" />
+		<property name="style" type="int" value="0" />
+		<property name="resizable" type="bool" value="0" />
+		<property name="view" type="int" value="0" />
+	</chart>
+	<chart id="30" name="" title="Navigator" >
+		<property name="title" type="QString" value="Navigator" />
+		<property name="subtitle" type="QString" value="" />
+		<property name="widthFactor" type="double" value="2" />
+		<property name="heightFactor" type="double" value="2" />
+		<property name="style" type="int" value="0" />
+		<property name="resizable" type="bool" value="0" />
+		<property name="sortByIndex" type="int" value="4" />
+		<property name="sortByOrder" type="int" value="1" />
+		<property name="groupBy" type="int" value="-1" />
+		<property name="columns" type="QString" value="*|Date|Sport|SubSport|Duration|Distance|RPE|Workout Code|" />
+		<property name="widths" type="QString" value="100|100|100|100|100|100|100|100|" />
+	</chart>
+</layout>
 </layouts>