--- a/cms/app-client/app/templates/application.hbs	Fri Nov 06 16:48:37 2015 +0100
+++ b/cms/app-client/app/templates/application.hbs	Fri Nov 06 17:02:08 2015 +0100
@@ -1,5 +1,12 @@
-{{render 'header-nav'}}
-
 <div class="container">
+  {{link-to 'Corpus' 'index' class='navbar-brand'}}
+  <ul class="nav nav-tabs">
+    {{#link-to 'first-page' tagName="li"}}
+      {{link-to 'First Page' 'first-page'}}
+    {{/link-to}}
+    {{#link-to 'second-page' tagName="li"}}
+      {{link-to 'Second Page' 'second-page'}}
+    {{/link-to}}
+  </ul>
   {{outlet}}
 </div>

--- a/cms/app-client/app/templates/header-nav.hbs	Fri Nov 06 16:48:37 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<nav class="navbar navbar-default" role="navigation">
-  <div class="container-fluid">
-
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse"
-              data-target="#header_nav_collapse">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <span class="logo">{{link-to 'Corpus' 'index' class='navbar-brand'}} </span>
-    </div>
-
-    <div class="collapse navbar-collapse" id="header_nav_collapse">
-      <ul class="nav navbar-nav">
-        <li>
-          {{link-to 'First Page' 'first-page'}}
-        </li>
-        <li>
-          {{link-to 'Second-page' 'second-page'}}
-        </li>
-      </ul>
-    </div>
-
-  </div>
-</nav>