diff --git a/component/footer.jsx b/component/footer.jsx
new file mode 100644
index 0000000..b1481ce
--- /dev/null
+++ b/component/footer.jsx
@@ -0,0 +1,3 @@
+export function Footer(props) {
+  return <footer></footer>;
+}
diff --git a/component/header.jsx b/component/header.jsx
index d675768..846a2a4 100644
--- a/component/header.jsx
+++ b/component/header.jsx
@@ -34,14 +34,17 @@ export function Header(props) {
         <Link href="/">
           <span className="title">{__(m.title)}</span>
         </Link>
-
-        {!faqPage && (
-          <div className="header__links">
+        <div className="header__links">
+          {!faqPage ? (
             <Link href="/faq">
               <span className="link">FAQ</span>
             </Link>
-          </div>
-        )}
+          ) : (
+            <Link href="/">
+              <span className="link">Go Home</span>
+            </Link>
+          )}
+        </div>
       </header>
     </>
   );
diff --git a/pages/faq.js b/pages/faq.js
index 48228b1..e4480ef 100644
--- a/pages/faq.js
+++ b/pages/faq.js
@@ -1,8 +1,22 @@
+import React from 'react';
 import ReactMarkdown from 'react-markdown';
 import { Header } from '../component/header';
 import { Email } from '../component/email';
 import md from '../faq.md';
 
+function flatten(text, child) {
+  return typeof child === 'string'
+    ? text + child
+    : React.Children.toArray(child.props.children).reduce(flatten, text);
+}
+
+function HeadingRenderer(props) {
+  var children = React.Children.toArray(props.children);
+  var text = children.reduce(flatten, '');
+  var slug = text.toLowerCase().replace(/\W/g, '-');
+  return React.createElement('h' + props.level, { id: slug }, props.children);
+}
+
 export default function Faq() {
   return (
     <div>
@@ -10,7 +24,9 @@ export default function Faq() {
 
       <main>
         <div className="content md">
-          <ReactMarkdown>{md}</ReactMarkdown>
+          <ReactMarkdown renderers={{ heading: HeadingRenderer }}>
+            {md}
+          </ReactMarkdown>
         </div>
 
         <Email />