diff --git a/bin/_template.html b/bin/_template.html
index fc100e1c4..a51f92378 100644
--- a/bin/_template.html
+++ b/bin/_template.html
@@ -31,6 +31,8 @@ $endif$
 $for(css)$
   <link rel="stylesheet" href="$css$" />
 $endfor$
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
+  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.2/css/all.css" integrity="sha384-/rXc/GQVaYpyDdyxK+ecHPVYJSN9bmVFBvjA/9eOB+pb3F2w2N6fc5qB9Ew5yIns" crossorigin="anonymous">
 $if(math)$
   $math$
 $endif$
@@ -46,7 +48,7 @@ $endfor$
 
 $if(title)$
 <header id="title-block-header">
-  <img src="$rel-root$/doc/Logos/gf1.svg" height="200px" class="float-md-right mb-3 mb-md-0" alt="GF Logo">
+  <img src="$rel-root$/doc/Logos/gf1.svg" height="200px" class="float-md-right mb-3" alt="GF Logo">
 <h1 class="title">$title$</h1>
 $if(subtitle)$
 <p class="subtitle">$subtitle$</p>
@@ -68,10 +70,46 @@ $body$
 </div><!-- .container -->
 
 <footer class="bg-light mt-5 py-5">
-  <div class="container mb-5">
+  <div class="container">
     <div class="row">
-      <div class="col-6">
-        <a href="$rel-root$">Home</a>
+      <div class="col-3">
+        <a href="$rel-root$">
+          <i class="fas fa-home"></i>
+          Home
+        </a>
+        <h6 class="text-muted mt-3">Use</h6>
+        <ul class="list-unstyled">
+          <li><a href="$rel-root$/demos">Demos</a></li>
+          <li><a href="$rel-root$/download">Download GF</a></li>
+        </ul>
+      </div>
+      <div class="col-3">
+        <h6 class="text-muted">Documentation</h6>
+        <ul class="list-unstyled">
+          <li><a href="$rel-root$/doc/gf-shell-reference.html">GF Shell Reference</a>
+          <li><a href="$rel-root$/lib/doc/synopsis.html">RGL Library Synopsis</a>
+          <li><a href="$rel-root$/gf-book">The GF Book</a>
+          <li><a href="$rel-root$/doc/gf-refman.html">Reference Manual</a>
+        </ul>
+      </div>
+      <div class="col-3">
+        <h6 class="text-muted">Reference</h6>
+        <ul class="list-unstyled">
+          <li><a href="http://hackage.haskell.org/package/gf/docs/PGF.html">PGF library API (Haskell runtime)</a>
+          <li><a href="$rel-root$/doc/runtime-api.html">PGF library API (C runtime)</a>
+          <li><a href="http://hackage.haskell.org/package/gf/docs/GF.html">GF compiler API</a>
+        </ul>
+      </div>
+      <div class="col-3">
+        <h6 class="text-muted">
+          Repositories
+          <i class="fab fa-github"></i>
+        </h6>
+        <ul class="list-unstyled">
+          <li><a href="https://github.com/GrammaticalFramework/gf-core">GF Core</a></li>
+          <li><a href="https://github.com/GrammaticalFramework/gf-rgl">RGL</a></li>
+          <li><a href="https://github.com/GrammaticalFramework/gf-contrib">Contrib</a></li>
+        </ul>
       </div>
     <div>
   <div>
diff --git a/bin/update_html b/bin/update_html
index a5194bbdd..7b214314f 100755
--- a/bin/update_html
+++ b/bin/update_html
@@ -17,7 +17,6 @@ function render_html {
     --to=html5 \
     --standalone \
     --template="$DIR/_template.html" \
-    --css="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" \
     --variable="rel-root:$relroot" \
     "$t2t" \
     --output="$html"
diff --git a/index.html b/index.html
index fe0e47e74..45ab1debe 100644
--- a/index.html
+++ b/index.html
@@ -48,12 +48,12 @@
 
     <ul>
       <li><a href="doc/gf-shell-reference.html">GF Shell Reference</a>
-    <li><a href="lib/doc/synopsis.html">RGL Library Synopsis</a>
-    <li><a href="gf-book">The GF Book</a>
-    <li><a href="doc/tutorial/gf-tutorial.html">GF Tutorial</a>
-    <li><a href="doc/gf-refman.html">Reference Manual</a>
-    <li><a href="doc/gf-quickstart.html">QuickStart</a>
-    <li><a href="doc/gf-reference.html">QuickRefCard</a>
+      <li><a href="lib/doc/synopsis.html">RGL Library Synopsis</a>
+      <li><a href="gf-book">The GF Book</a>
+      <li><a href="doc/tutorial/gf-tutorial.html">GF Tutorial</a>
+      <li><a href="doc/gf-refman.html">Reference Manual</a>
+      <li><a href="doc/gf-quickstart.html">QuickStart</a>
+      <li><a href="doc/gf-reference.html">QuickRefCard</a>
     </ul>
 
     <h4>Other resources</h4>
@@ -72,13 +72,14 @@
         GF on GitHub
         <i class="fab fa-github"></i>
       </a>
-      <li><a href="/~hallgren/gf-experiment/browse/">Browse Source Code</a>
+      <!-- <li><a href="/~hallgren/gf-experiment/browse/">Browse Source Code</a> -->
       <li><a href="doc/gf-people.html">Authors</a>
     </ul>
     <h4>Applications</h4>
     <ul>
-      <li><a href="http://hackage.haskell.org/package/gf-3.9/docs/PGF.html">PGF library API (Haskell runtime)</a>
+      <li><a href="http://hackage.haskell.org/package/gf/docs/PGF.html">PGF library API (Haskell runtime)</a>
       <li><a href="doc/runtime-api.html">PGF library API (C runtime)</a>
+      <li><a href="http://hackage.haskell.org/package/gf/docs/GF.html">GF compiler API</a>
       <!-- <li><a href="src/ui/android/README">GF on Android (new)</a>
       <li><a href="/android/">GF on Android (old) </a> -->
       <li><a href="doc/gf-editor-modes.html">GF Editor Modes</a>