diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
deleted file mode 100644
index e4ab96fb0b..0000000000
--- a/docs/_layouts/default.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-  {% include head.html %}
-
-  <body>
-
-    {% include header.html %}
-
-    <div class="page-content">
-      <div class="wrapper">
-        {{ content }}
-      </div>
-    </div>
-
-    {% include footer.html %}
-
-  </body>
-
-</html>
diff --git a/site/_includes/footer.html b/site/_includes/footer.html
index 735b95d7bd..4a48cdcb47 100644
--- a/site/_includes/footer.html
+++ b/site/_includes/footer.html
@@ -1,25 +1,14 @@
-<footer class="site-footer">
+<footer class="opa-footer">
+  <p class="opa-footer--text">
+    <a class="opa-footer--github--link" href="https://github.com/open-policy-agent/opa">{% img '{{assets["icon-github.svg"].logical_path}}' class:'opa-footer--github--icon' %}open-policy-agent/opa</a>
+    <a href="https://travis-ci.org/open-policy-agent/opa"><img class="opa-footer--github--ci" width="90" height="20" src="https://travis-ci.org/open-policy-agent/opa.svg?branch=master" alt="Build Status"></a>
+  </p>
 
-  <div class="wrapper">
-
-    <div class="footer-col-wrapper">
-      
-      <div class="footer-col footer-col-1">
-        <ul class="social-media-list">
-          {% if site.github_username %}
-          <li>
-            {% include icon-github.html username=site.github_username repo=site.github_repo %}
-          </li>
-          {% endif %}
-        </ul>
-      </div>
-
-      <div class="footer-col footer-col-2">
-        <p>{{ site.description }}</p>
-      </div>
-      
-    </div>
-
-  </div>
+  <p class="opa-footer--text">
+    Join the discussion on <a class="opa-footer--link" href="https://openpolicyagent.slack.com">Slack</a> or <a class="opa-footer--link" href="https://groups.google.com/forum/?hl=en#!forum/open-policy-agent">Google Groups</a>. Report a bug or request a feature using <a class="opa-footer--link" href="https://github.com/open-policy-agent/opa/issues">GitHub Issues</a>.
+  </p>
 
+  <p class="opa-footer--text">
+    © 2016 Open Policy Agent contributors. Licensed under the <a class="opa-footer--link" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. For information about contributing, see <a class="opa-footer--link" href="https://github.com/open-policy-agent/opa/blob/master/CONTRIBUTING.md">CONTRIBUTING.md</a>.
+  </p>
 </footer>
diff --git a/site/_includes/nav-main.html b/site/_includes/nav-main.html
index 073fa06eed..bda902b929 100644
--- a/site/_includes/nav-main.html
+++ b/site/_includes/nav-main.html
@@ -1,27 +1,40 @@
-<header class="site-header">
+{% assign page_top = false %}
+{% assign page_get = false %}
+{% assign page_doc = false %}
+{% assign page_xmp = false %}
+{% assign page_com = false %}
 
-  <div class="wrapper">
+{% for page in site.pages %}
+  {% case page.nav_id %}
+    {% when 'MAIN_HOME' %}
+      {% assign page_top = page %}
+    {% when 'MAIN_GET_OPA' %}
+      {% assign page_get = page %}
+    {% when 'MAIN_DOCUMENTATION' %}
+      {% assign page_doc = page %}
+    {% when 'MAIN_EXAMPLES' %}
+      {% assign page_xmp = page %}
+    {% when 'MAIN_COMMUNITY' %}
+      {% assign page_com = page %}
+  {% endcase %}
+{% endfor %}
 
-    <a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
-
-    <nav class="site-nav">
-      <a href="#" class="menu-icon">
-        <svg viewBox="0 0 18 15">
-          <path fill="#424242" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
-          <path fill="#424242" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484 h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
-          <path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
-        </svg>
-      </a>
-
-      <div class="trigger">
-        {% for p in site.pages %}
-          {% if p.show_in_header %}
-          <a class="page-link" href="{{ p.url | prepend: site.baseurl }}">{{ p.header_title }}</a>
-          {% endif %}
-        {% endfor %}
-      </div>
-    </nav>
-
-  </div>
-
-</header>
+<nav>
+  <ul class="opa-nav-main--list">
+    <li class="opa-nav-main--home-item{% if page.nav_id == page_top.nav_id %}--selected{% endif %}">
+      {% if page.nav_id != page_top.nav_id %}<a class="opa-nav-main--link" href="{{page_top.url}}">Open Policy Agent</a>{% else %}Open Policy Agent{% endif %}
+    </li>
+    <li class="opa-nav-main--item{% if page.nav_id == page_get.nav_id %}--selected{% endif %}">
+      {% if page.nav_id != page_get.nav_id %}<a class="opa-nav-main--link" href="{{page_get.url}}">Get OPA</a>{% else %}Get OPA{% endif %}
+    </li>
+    <li class="opa-nav-main--item{% if page.nav_id == page_doc.nav_id %}--selected{% endif %}">
+      {% if page.nav_id != page_doc.nav_id %}<a class="opa-nav-main--link" href="{{page_doc.url}}">Documentation</a>{% else %}Documentation{% endif %}
+    </li>
+    <li class="opa-nav-main--item{% if page.nav_id == page_xmp.nav_id %}--selected{% endif %}">
+      {% if page.nav_id != page_xmp.nav_id %}<a class="opa-nav-main--link" href="{{page_xmp.url}}">Examples</a>{% else %}Examples{% endif %}
+    </li>
+    <li class="opa-nav-main--item{% if page.nav_id == page_com.nav_id %}--selected{% endif %}">
+      {% if page.nav_id != page_com.nav_id %}<a class="opa-nav-main--link" href="{{page_com.url}}">Community</a>{% else %}Community{% endif %}
+    </li>
+  </ul>
+</nav>
