diff --git a/templates/base.html b/templates/base.html
index c394f59c..858530bb 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -3,15 +3,15 @@
 
 <!DOCTYPE html>
 <html
-    dir="{% if LANGUAGE_BIDI %}rtl{% else %}ltr{% endif %}"
-    xml:lang="{% firstof LANGUAGE_CODE 'en' %}"
-    lang="{% firstof LANGUAGE_CODE 'en' %}">
-  <head>
+        dir="{% if LANGUAGE_BIDI %}rtl{% else %}ltr{% endif %}"
+        xml:lang="{% firstof LANGUAGE_CODE 'en' %}"
+        lang="{% firstof LANGUAGE_CODE 'en' %}">
+<head>
     <title>{% block title %}{% endblock %} | Rig Information Gathering System</title>
-    
+
     <meta name="viewport" content="initial-scale=1">
 
-	<link rel="stylesheet" type="text/css" href="{% static "css/screen.css" %}">
+    <link rel="stylesheet" type="text/css" href="{% static "css/screen.css" %}">
     {% block css %}
     {% endblock %}
 
@@ -19,133 +19,146 @@
     {% endblock %}
 
     {% block extra-head %}{% endblock %}
-  </head>
-
-  <body>
-    <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">
-    				<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="#">Rigboard</a></li>
-    						<li><a href="#">Calendar</a></li>
-    						<li><a href="#">Bookings</a></li>
-    						<li><a href="#">Other Events</a></li>
-    					</ul>
-    				</li>
-    				{% if perms.RIGS.view_vatrate or perms.RIGS.view_invoice %}
-    					<li class="dropdown">
-    						<a href="#" class="dropdown-toggle" data-toggle="dropdown">
-    							Finance<b class="caret"></b>
-    						</a>
-    						<ul class="dropdown-menu">
-    							{% if perms.RIGS.view_invoice %}
-    								<li><a href="">Invoices</a></li>
-    							{% endif %}
-    							{% if perms.RIGS.view_vatrate %}
-    								<li><a href="">VAT</a></li>
-    							{% endif %}
-    						</ul>
-    					</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">
-	    							<span class="pull-left">
-	    								<img src="{{ request.user.profile_picture }}" class="media-object" />
-	    							</span>
-	    							<div class="media-body">
-	    								<b>{{ request.user.first_name }} {{ request.user.last_name }}</b>
-	    								<p class="muted">{{ request.user.email }}</p>
-	    							</div>
-	    						</li>
-	    						<li>
-	    							<a href="{% url 'logout' %}" class="btn btn-primary pull-right">Logout</a>
-	    						</li>
-	    					</ul>
-    					{% else %}
-    						<a href="{% url "login" %}?next={{ request.build_absolute_uri }}">
-	    						<span class="icon-user"></span>
-	    						Hi guest
-	    					</a>
-    					{% endif %}
-    				</li>
-    			</ul>
-   			</div>
-    	</div>
-    </div>
+</head>
 
+<body>
+<div class="navbar navbar-fixed-top navbar-inverse hidden-print" role="navigation">
     <div class="container">
-      <div id="content" class="row">
+        <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">
+                <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="#">Rigboard</a></li>
+                        <li><a href="#">Calendar</a></li>
+                        <li><a href="#">Bookings</a></li>
+                        <li><a href="#">Other Events</a></li>
+                    </ul>
+                </li>
+                {% if perms.RIGS.view_vatrate or perms.RIGS.view_invoice %}
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                            Finance<b class="caret"></b>
+                        </a>
+                        <ul class="dropdown-menu">
+                            {% if perms.RIGS.view_invoice %}
+                                <li><a href="">Invoices</a></li>
+                            {% endif %}
+                            {% if perms.RIGS.view_vatrate %}
+                                <li><a href="">VAT</a></li>
+                            {% endif %}
+                        </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">
+	    							<span class="pull-left">
+	    								<img src="{{ request.user.profile_picture }}" class="media-object"/>
+	    							</span>
+
+                                <div class="media-body">
+                                    <b>{{ request.user.first_name }} {{ request.user.last_name }}</b>
+
+                                    <p class="muted">{{ request.user.email }}</p>
+                                </div>
+                            </li>
+                            <li>
+                                <a href="{% url 'logout' %}" class="btn btn-primary pull-right">Logout</a>
+                            </li>
+                        </ul>
+                    {% else %}
+                        <a href="{% url "login" %}?next={{ request.build_absolute_uri }}">
+                            <span class="icon-user"></span>
+                            Hi guest
+                        </a>
+                    {% endif %}
+                </li>
+            </ul>
+        </div>
+    </div>
+</div>
+
+<div class="container">
+    <div id="content" class="row">
         {% block content-header %}
-          {% if error %}<div class="error">{{ error }}</div>{% endif %}
-          {% if info %}<div class="info">{{ info }}</div>{% endif %}
-          {% if messages %}
-            {% for message in messages %}
-              <div class="info">{{ message }}</div>
-            {% endfor %}
-          {% endif %}
+            {% if error %}
+                <div class="error">{{ error }}</div>{% endif %}
+            {% if info %}
+                <div class="info">{{ info }}</div>{% endif %}
+            {% if messages %}
+                {% for message in messages %}
+                    <div class="info">{{ message }}</div>
+                {% endfor %}
+            {% endif %}
         {% endblock %}
 
         {% block content %}{% endblock %}
-      </div>
-
-      <div id="sidebar" class="column">
-        {% block sidebar %}
-        {% endblock %}
-      </div>
     </div>
 
-    <div class="modal fade" id="modal"></div>
+    <div id="sidebar" class="column">
+    {% block sidebar %}
+        {% endblock %}
+    </div>
+</div>
 
-	<script src="//code.jquery.com/jquery-latest.min.js"></script>
-	<script>
-		Date.prototype.getISOString = function() {
-			var yyyy = this.getFullYear().toString();
-			var mm = (this.getMonth()+1).toString(); // getMonth() is zero-based
-			var dd  = this.getDate().toString();
-			return yyyy + '-' + (mm[1]?mm:"0"+mm[0]) + '-' + (dd[1]?dd:"0"+dd[0]); // padding
-		};
-	</script>
-	<script src="{% static "js/jquery.cookie.js" %}"></script>
-	<script src="{% static "js/alert.js" %}"></script>
-	<script src="{% static "js/collapse.js" %}"></script>
-	<script>
-		$('.navbar-collapse').addClass('collapse')
-	</script>
-	<script src="{% static "js/dropdown.js" %}"></script>
-    <script src="{% static "js/modal.js" %}"></script>
-    <script>
-        jQuery(document).ready(function() {
-            jQuery(document).on('click', '.modal-href', function(e) {
-                e.preventDefault()
-                jQuery('#modal').load(jQuery(this).attr('href'), function(e) {
-                    jQuery('#modal').modal();
-                });
+<div class="modal fade" id="modal"></div>
+
+<script src="//code.jquery.com/jquery-latest.min.js"></script>
+<script>
+    Date.prototype.getISOString = function () {
+        var yyyy = this.getFullYear().toString();
+        var mm = (this.getMonth() + 1).toString(); // getMonth() is zero-based
+        var dd = this.getDate().toString();
+        return yyyy + '-' + (mm[1] ? mm : "0" + mm[0]) + '-' + (dd[1] ? dd : "0" + dd[0]); // padding
+    };
+</script>
+<script src="{% static "js/jquery.cookie.js" %}"></script>
+<script src="{% static "js/alert.js" %}"></script>
+<script src="{% static "js/collapse.js" %}"></script>
+<script>
+    $('.navbar-collapse').addClass('collapse')
+</script>
+<script src="{% static "js/dropdown.js" %}"></script>
+<script src="{% static "js/modal.js" %}"></script>
+<script>
+    jQuery(document).ready(function () {
+        jQuery(document).on('click', '.modal-href', function (e) {
+            e.preventDefault()
+            jQuery('#modal').load(jQuery(this).attr('href'), function (e) {
+                jQuery('#modal').modal();
             });
         });
-    </script>
-    {% block js %}
-    {% endblock %}
-  </body>
+    });
+</script>
+{% block js %}
+{% endblock %}
+</body>
 </html>
