diff --git a/templates/base.html b/templates/base.html
index 18a45ccf..5b2fe994 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -31,107 +31,7 @@
 
 <body>
 {% include "analytics.html" %}
-<div class="navbar navbar-fixed-top navbar-inverse hidden-print" role="navigation">
-    <div class="container">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                <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="/">RIGS</a>
-        </div>
-        <div class="navbar-collapse">
-            <ul class="nav navbar-nav">
-                {% if user.is_authenticated %}
-                    <li><a href="/">Home</a></li>
-                    <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Rigboard<b class="caret"></b></a>
-                        <ul class="dropdown-menu">
-                            <li><a href="{% url 'rigboard' %}"><span class="glyphicon glyphicon-list"></span>
-                                Rigboard</a></li>
-                            <li><a href="{% url 'event_archive' %}"><span class="glyphicon glyphicon-book"></span>
-                                Archive</a></li>
-                            <li><a href="{% url 'web_calendar' %}"><span class="glyphicon glyphicon-calendar"></span>
-                                Calendar</a></li>
-                            {% if perms.RIGS.view_event %}
-                                <li><a href="{% url 'activity_table' %}"><span
-                                        class="glyphicon glyphicon-random"></span> Recent Changes</a></li>
-                            {% endif %}
-                            {% if perms.RIGS.add_event %}
-                                <li><a href="{% url 'event_create' %}"><span class="glyphicon glyphicon-plus"></span>
-                                    New Event</a></li>
-                            {% endif %}
-
-                        </ul>
-                    </li>
-                {% endif %}
-                {% if perms.RIGS.view_invoice %}
-                    <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Invoices<b class="caret"></b></a>
-                        <ul class="dropdown-menu">
-                            {% if perms.RIGS.add_invoice %}
-                                <li><a href="{% url 'invoice_waiting' %}"><span
-                                        class="glyphicon glyphicon-briefcase text-danger"></span> Waiting</a></li>
-                            {% endif %}
-                            <li><a href="{% url 'invoice_list' %}"><span class="glyphicon glyphicon-gbp text-warning"></span> Outstanding</a>
-                            </li>
-                            <li><a href="{% url 'invoice_archive' %}"><span class="glyphicon glyphicon-book"></span>
-                                Archive</a></li>
-                        </ul>
-                    </li>
-                {% endif %}
-                {% if perms.RIGS.view_person %}
-                    <li><a href="{% url 'person_list' %}">People</a></li>
-                {% endif %}
-                {% if perms.RIGS.view_organisation %}
-                    <li><a href="{% url 'organisation_list' %}">Organisations</a></li>
-                {% endif %}
-                {% if perms.RIGS.view_venue %}
-                    <li><a href="{% url 'venue_list' %}">Venues</a></li>
-                {% endif %}
-
-            </ul>
-            <ul class="nav navbar-nav navbar-right">
-                <li class="dropdown">
-                    {% if user.is_authenticated %}
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                            <span class="glyphicon glyphicon-user"></span>
-                            Hi {{ user.first_name }}
-                            <b class="caret"></b>
-                        </a>
-                        <ul class="dropdown-menu nav media-list pull-right" id="userdropdown">
-                            <li class="media">
-                                <a href="{% url 'profile_detail' %}">
-                                    <div class="media-left">
-                                        <img src="{{ request.user.profile_picture }}" class="media-object"/>
-                                    </div>
-
-                                    <div class="media-body">
-                                        <b>{{ request.user.first_name }} {{ request.user.last_name }}</b>
-
-                                        <p class="muted">{{ request.user.email }}</p>
-                                    </div>
-                                </a>
-                            </li>
-                            <li>
-                                <div class="col-sm-12 text-right">
-                                    <a href="{% url 'logout' %}" class="btn btn-primary">Logout</a>
-                                </div>
-                            </li>
-                        </ul>
-                    {% else %}
-                        <a href="{% url "login" %}">
-                            <span class="icon-user"></span>
-                            Login
-                        </a>
-                    {% endif %}
-                </li>
-            </ul>
-        </div>
-    </div>
-</div>
+{% include "navbar.html" %}
 
 <div class="container">
     <div id="content" class="row">
diff --git a/templates/navbar.html b/templates/navbar.html
new file mode 100644
index 00000000..8eaa6e5d
--- /dev/null
+++ b/templates/navbar.html
@@ -0,0 +1,101 @@
+<div class="navbar navbar-fixed-top navbar-inverse hidden-print" role="navigation">
+    <div class="container">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                <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="/">RIGS</a>
+        </div>
+        <div class="navbar-collapse">
+            <ul class="nav navbar-nav">
+                {% if user.is_authenticated %}
+                    <li><a href="/">Home</a></li>
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Rigboard<b class="caret"></b></a>
+                        <ul class="dropdown-menu">
+                            <li><a href="{% url 'rigboard' %}"><span class="glyphicon glyphicon-list"></span>
+                                Rigboard</a></li>
+                            <li><a href="{% url 'event_archive' %}"><span class="glyphicon glyphicon-book"></span>
+                                Archive</a></li>
+                            <li><a href="{% url 'web_calendar' %}"><span class="glyphicon glyphicon-calendar"></span>
+                                Calendar</a></li>
+                            {% if perms.RIGS.view_event %}
+                                <li><a href="{% url 'activity_table' %}"><span
+                                        class="glyphicon glyphicon-random"></span> Recent Changes</a></li>
+                            {% endif %}
+                            {% if perms.RIGS.add_event %}
+                                <li><a href="{% url 'event_create' %}"><span class="glyphicon glyphicon-plus"></span>
+                                    New Event</a></li>
+                            {% endif %}
+
+                        </ul>
+                    </li>
+                {% endif %}
+                {% if perms.RIGS.view_invoice %}
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Invoices<b class="caret"></b></a>
+                        <ul class="dropdown-menu">
+                            {% if perms.RIGS.add_invoice %}
+                                <li><a href="{% url 'invoice_waiting' %}"><span
+                                        class="glyphicon glyphicon-briefcase text-danger"></span> Waiting</a></li>
+                            {% endif %}
+                            <li><a href="{% url 'invoice_list' %}"><span class="glyphicon glyphicon-gbp text-warning"></span> Outstanding</a>
+                            </li>
+                            <li><a href="{% url 'invoice_archive' %}"><span class="glyphicon glyphicon-book"></span>
+                                Archive</a></li>
+                        </ul>
+                    </li>
+                {% endif %}
+                {% if perms.RIGS.view_person %}
+                    <li><a href="{% url 'person_list' %}">People</a></li>
+                {% endif %}
+                {% if perms.RIGS.view_organisation %}
+                    <li><a href="{% url 'organisation_list' %}">Organisations</a></li>
+                {% endif %}
+                {% if perms.RIGS.view_venue %}
+                    <li><a href="{% url 'venue_list' %}">Venues</a></li>
+                {% endif %}
+
+            </ul>
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    {% if user.is_authenticated %}
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                            <span class="glyphicon glyphicon-user"></span>
+                            Hi {{ user.first_name }}
+                            <b class="caret"></b>
+                        </a>
+                        <ul class="dropdown-menu nav media-list pull-right" id="userdropdown">
+                            <li class="media">
+                                <a href="{% url 'profile_detail' %}">
+                                    <div class="media-left">
+                                        <img src="{{ request.user.profile_picture }}" class="media-object"/>
+                                    </div>
+
+                                    <div class="media-body">
+                                        <b>{{ request.user.first_name }} {{ request.user.last_name }}</b>
+
+                                        <p class="muted">{{ request.user.email }}</p>
+                                    </div>
+                                </a>
+                            </li>
+                            <li>
+                                <div class="col-sm-12 text-right">
+                                    <a href="{% url 'logout' %}" class="btn btn-primary">Logout</a>
+                                </div>
+                            </li>
+                        </ul>
+                    {% else %}
+                        <a href="{% url "login" %}">
+                            <span class="icon-user"></span>
+                            Login
+                        </a>
+                    {% endif %}
+                </li>
+            </ul>
+        </div>
+    </div>
+</div>
