diff --git a/src/routes/docs.js b/src/routes/docs.js
index 0123ce2..f436a3c 100644
--- a/src/routes/docs.js
+++ b/src/routes/docs.js
@@ -8,6 +8,7 @@
 const docsContext = require("../utils/docsContext");
 const HttpError = require("../utils/HttpError");
 const { baseUrl } = require("../utils/baseUrl");
+const { qualifyLink } = require("../utils/qualifyLinks");
 
 const docsDir = path.join(__dirname, "../../content/docs");
 let docsCache = {}; // { [path]: { modules: {}, crossCuttingSummary: {} } }
@@ -76,8 +77,8 @@
 
   res.render("docs/path", {
     ...context,
-
-    path: docPath,
+    docsHome: qualifyLink("/docs"),
+    pathName: docPath,
     crossCuttingSummary: doc.crossCuttingSummary,
     modules: modulesWithLinks,
   });
@@ -100,7 +101,9 @@
 
   res.render("docs/module", {
     ...context,
-    path: docPath,
+    docsHome: qualifyLink("/docs"),
+    pathUrl: qualifyLink("/docs/" + docPath),
+    pathName: docPath,
     module,
     moduleDoc,
   });
diff --git a/src/views/docs/module.handlebars b/src/views/docs/module.handlebars
index 34bd415..b5a1b94 100644
--- a/src/views/docs/module.handlebars
+++ b/src/views/docs/module.handlebars
@@ -1,5 +1,5 @@
 {{!-- views/docs/module.hbs --}}
-<h1>Documentation: {{path}} / {{module}}</h1>
+<h1><a href="{{docsHome}}">Documentation:</a> <a href="{{pathUrl}}">{{pathName}}</a> / {{module}}</h1>
 
 <div class="doc-content">
     {{> _renderObject moduleDoc}}
diff --git a/src/views/docs/path.handlebars b/src/views/docs/path.handlebars
index 7a225af..d804338 100644
--- a/src/views/docs/path.handlebars
+++ b/src/views/docs/path.handlebars
@@ -1,21 +1,31 @@
-{{!-- views/docs/path.hbs --}}
-<h1>Documentation: {{path}}</h1>
+<h1><a href="{{docsHome}}">Documentation:</a> {{pathName}}</h1>
 
 {{#if crossCuttingSummary}}
 <section>
     <h2>Cross Cutting Summary</h2>
+
+    {{#if crossCuttingSummary.themes}}
+    {{#if crossCuttingSummary.themes.length}}
     <h3>Themes</h3>
     <ul>
         {{#each crossCuttingSummary.themes}}
         <li>{{this}}</li>
         {{/each}}
     </ul>
+    {{/if}}
+    {{/if}}
+
+    {{#if crossCuttingSummary.systemRecommendations}}
+    {{#if crossCuttingSummary.systemRecommendations.length}}
     <h3>System Recommendations</h3>
     <ul>
         {{#each crossCuttingSummary.systemRecommendations}}
         <li>{{this}}</li>
         {{/each}}
     </ul>
+    {{/if}}
+    {{/if}}
+
 </section>
 {{/if}}