diff --git a/source/themes/opdavies/opdavies/_layouts/default.html.twig b/source/themes/opdavies/opdavies/_layouts/default.html.twig
index 6e67f1ae..c1fc0099 100644
--- a/source/themes/opdavies/opdavies/_layouts/default.html.twig
+++ b/source/themes/opdavies/opdavies/_layouts/default.html.twig
@@ -2,6 +2,7 @@
 <html lang="en" class="no-js">
   <head>
     <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="{% if page.front == true %}{{ site.description }}{% else %}{{ page.description }}{% endif %}">
     <link rel="author" href="{{ site.url }}/humans.txt" />
@@ -11,15 +12,15 @@
     {% block styles %}{% endblock %}
   </head>
   <body{% if page.nav %} class="{{ page.nav }}"{% endif %}>
-    {% include 'header' %}
+    {% include 'navbar' %}
 
     {% block content_wrapper %}
-      <div class="content">
+      <div class="container">
         {% block content %}{% endblock %}
       </div>
     {% endblock %}
 
-    <footer role="contentinfo">
+    <footer class="container" role="contentinfo">
       <p class="copyright">&copy; 2010&ndash;{{ 'now'|date('Y') }} {{ site.title }}</p>
     </footer>
 
diff --git a/source/themes/opdavies/opdavies/_partials/header.html.twig b/source/themes/opdavies/opdavies/_partials/header.html.twig
deleted file mode 100644
index 2beed871..00000000
--- a/source/themes/opdavies/opdavies/_partials/header.html.twig
+++ /dev/null
@@ -1,6 +0,0 @@
-<header role="banner">
-  <div class="inner">
-    <div class="site-name">{{ site.title }}</div>
-    {% include 'main-menu' %}
-  </div>{# .inner #}
-</header>
\ No newline at end of file
diff --git a/source/themes/opdavies/opdavies/_partials/main-menu.html.twig b/source/themes/opdavies/opdavies/_partials/main-menu.html.twig
deleted file mode 100644
index 478c8c57..00000000
--- a/source/themes/opdavies/opdavies/_partials/main-menu.html.twig
+++ /dev/null
@@ -1,10 +0,0 @@
-<nav class="main-menu" role="navigation">
-  <ul>
-    <li><a href="{{ site.url }}" class="about">About</a></li>
-    <li><a href="{{ site.url }}/work" class="work">Work</a></li>
-    <li><a href="{{ site.url }}/services" class="services">Services</a></li>
-    <li><a href="{{ site.url }}/talks" class="talks">Talks</a></li>
-    <li><a href="{{ site.url }}/blog" class="blog">Blog</a></li>
-    <li><a href="{{ site.url }}/contact" class="contact">Contact</a></li>
-  </ul>
-</nav>
\ No newline at end of file
diff --git a/source/themes/opdavies/opdavies/_partials/navbar.html.twig b/source/themes/opdavies/opdavies/_partials/navbar.html.twig
new file mode 100644
index 00000000..0fdcd60e
--- /dev/null
+++ b/source/themes/opdavies/opdavies/_partials/navbar.html.twig
@@ -0,0 +1,23 @@
+<nav class="navbar navbar-inverse navbar-fixed-top">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="{{ site.url }}">{{ site.title }}</a>
+    </div>
+    <div id="navbar" class="collapse navbar-collapse">
+      <ul class="nav navbar-nav navbar-right" role="navigation">
+        <li{% if page.nav == 'about' %} class="active"{% endif %}><a href="{{ site.url }}">About</a></li>
+    		<li{% if page.nav == 'work' %} class="active"{% endif %}><a href="{{ site.url }}/work">Work</a></li>
+    		<li{% if page.nav == 'services' %} class="active"{% endif %}><a href="{{ site.url }}/services">Services</a></li>
+    		<li{% if page.nav == 'talks' %} class="active"{% endif %}><a href="{{ site.url }}/talks">Talks</a></li>
+    		<li{% if page.nav == 'blog' %} class="active"{% endif %}><a href="{{ site.url }}/blog">Blog</a></li>
+    		<li{% if page.nav == 'contact' %} class="active"{% endif %}><a href="{{ site.url }}/contact">Contact</a></li>
+      </ul>
+    </div><!--/.nav-collapse -->
+  </div>
+</nav>
\ No newline at end of file
