diff --git a/content/faq.html b/content/faq.html
index a629be878444c6eff26f44ecd0fd177ae30138df..2a15e5aca658701f97daf8aac7d76bdf3f92846d 100644
--- a/content/faq.html
+++ b/content/faq.html
@@ -1,10 +1,13 @@
 <main>
   <article>
-    <h2>Common-Lisp.net Frequently Asked Questions</h2>
+    <h1><i class="far fa-question-circle"></i>&nbsp;FAQ - Common-Lisp.net Frequently Asked Questions</h1>
 
-    <ul>
-      <li>GitLab: configure e-mail on push</li>
-    </ul>
+    <div class="tocbox">
+      <h4 class="bg-primary" style="color:white;">Table of contents</h4>
+      <ul>
+        <li><a href="#faq-email-on-push">GitLab: configure e-mail on push</a></li>
+      </ul>
+    </div>
 
     <section id="faq-email-on-push">
       <h3>GitLab: configure e-mail on push</h3>
diff --git a/content/phub.html b/content/phub.html
index 0153371e987a0532114b91ec342312a97af6bcf8..8ae1cf7e6d33f0c1864870630302fe4ec4072a1f 100644
--- a/content/phub.html
+++ b/content/phub.html
@@ -1,4 +1,6 @@
+<a style="clear:both;" class="btn btn-primary float-right" href="/project-intro"><i class="fa fa-arrow-right"></i>&nbsp;&nbsp;Projects Hosting</a>
 <div id="bodyText">
+  <h1 style="padding-bottom: 30px;"><i class="fa fa-project-diagram"></i>&nbsp;Common-Lisp.net projects</h1>
   <h2 id="aindex">Alphabetical index</h2>
   <p>
     <a href="/project/able">able</a><br/>
@@ -439,7 +441,10 @@
     <a href="/project/yason">yason</a><br/>
     <a href="/project/zip">zip</a><br/>
     <a href="/project/zlib">zlib</a><br/>
-
   </p>
 
+  <h2>Orphaned Projects</h2>
+
+  <a href="/orphaned-projects/">Here</a> is a list of orphaned projects.  
+
 </div>
diff --git a/content/project-intro.html b/content/project-intro.html
index d6fabefb25330c3c6ae36a06cebb021bc2bdc650..6ea66fd4d2dc233101a2b934f00172a194a68ebd 100644
--- a/content/project-intro.html
+++ b/content/project-intro.html
@@ -1,4 +1,6 @@
-<div class="tocbox">
+<a style="clear:both;" class="btn btn-primary float-right" href="/phub"><i class="fa fa-arrow-right"></i>&nbsp;&nbsp;Common-Lisp.net projects</a>
+
+<div style="clear:both;margin-top: 20px;" class="tocbox">
   <h4 class="bg-primary" style="color:white;">Table of contents</h4>
   <ul>
     <li><a href="#whatyouget">What you get</a></li>
@@ -16,7 +18,7 @@
   </ul>
 </div>
 
-<h1 style="padding-bottom: 30px;"><i class="fa fa-project-diagram"></i>&nbsp;Common-Lisp.net projects</h1>
+<h1 style="padding-bottom: 30px;"><i class="fa fa-project-diagram"></i>&nbsp;Common-Lisp.net project hosting</h1>
 
 <div id="bodyTextWide">
   <h2 id="whatyouget">What you get</h2>
diff --git a/content/tools.html b/content/tools.html
index f54b8175ccb91a3b8d6f716e59b959b0c00d60c6..06f5b150b398531ebad27a9cafb5404f0e2ab22d 100644
--- a/content/tools.html
+++ b/content/tools.html
@@ -1,4 +1,4 @@
-<h1 style="margin-bottom: 30px;"><i class="fa fa-wrench"></i>  Tools</h1>
+<h1><i class="fa fa-wrench"></i>  Common-Lisp.net Tools</h1>
 <h2 id="trac">Trac</h2>
 
 <p><a href="http://trac.common-lisp.net/">Click here to access Trac.</a>
diff --git a/layout/templates/layout_2018.html b/layout/templates/layout_2018.html
index 5d7d5fce54e12767e830d3f1dd3c0920862ea787..8519a3a1f1e193030d22695e132a83cd0a218aee 100644
--- a/layout/templates/layout_2018.html
+++ b/layout/templates/layout_2018.html
@@ -37,10 +37,8 @@
             <li class="nav-item dropdown">
               <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Projects <span class="caret"></span></a>
               <div class="dropdown-menu" role="menu">
-                <a class="dropdown-item" href="/phub/">Projects hub</a>
                 <a class="dropdown-item" href="/project-intro/">Hosting services</a>
-                <a class="dropdown-item" href="/orphaned-projects/">Orphaned projects</a>
-                <a class="dropdown-item" href="/faq/">FAQ</a>
+                <a class="dropdown-item" href="/phub/">Projects hub</a>
               </div>
             </li>
             <li class="nav-item dropdown">
@@ -48,6 +46,7 @@
               <div class="dropdown-menu" role="menu">
                 <a class="dropdown-item" href="/tools/">Tools</a>
                 <a class="dropdown-item" href="/implementations/">Implementations</a>
+                <a class="dropdown-item" href="/faq/">FAQ</a>
               </div>
             </li>
             <li class="nav-item">