diff --git a/templates/base.html b/templates/base.html
index c9ec78d3..9c24e7f7 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -86,15 +86,20 @@
         <span id="atlas-link" class="top-bar-link">
             <a href="{% url 'atlas:index' %}">Atlas</a>
         </span>
+        {% if perms.generic.can_add_cid_user %}
         <span id="candidate-link" class="top-bar-link">
             <a href="{% url 'generic:manage_cids' %}">Candidates</a>
         </span>
         {% endif %}
+        {% endif %}
         {% if request.user.is_staff %}
         <span id="admin-link" class="top-bar-link">
             <a href="{% url 'admin:index' %}">Admin</a>
         </span>
         {% endif %}
+        <span id="index-link" class="top-bar-link">
+            <a href="{% url 'home' %}">Home</a>
+        </span>
     </div>
     <div class="content container">
         {% block navigation %}
diff --git a/templates/index.html b/templates/index.html
index e4fa03c5..cbff6444 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,33 +1,35 @@
 {% extends 'base.html' %}
 
 {% block content %}
-    <div class="anatomy">
-        <h1>PENRA Courses</h1>
-        {% if not request.user.is_authenticated %}
-            <a href="{% url 'login'%}">Log in</a><br/>
-            <a href="{% url 'password_reset'%}">Reset password</a>
-        {% else %}
-            <a href="{% url 'atlas:index'%}">Atlas</a>
-            <a href="{% url 'anatomy:index'%}">Anatomy</a>
-            <a href="{% url 'physics:index'%}">Physics</a>
-            <a href="{% url 'rapids:index'%}">Rapids</a>
-            <a href="{% url 'longs:index'%}">Longs</a>
-            <a href="{% url 'sbas:index'%}">SBAs</a>
-        {% endif %}
-        {% if request.user.is_staff %}<a href="{% url 'admin:index'%}">Admin</a>{% endif %}
-    </div>
-        {% if request.user.is_authenticated %}
     <p>
+        <div class="anatomy">
+            <h1>PENRA Courses</h1>
+            {% if not request.user.is_authenticated %}
+                <a href="{% url 'login'%}">Log in</a><br/>
+                <a href="{% url 'password_reset'%}">Reset password</a>
+            {% else %}
+{% comment %}                 <a href="{% url 'atlas:index'%}">Atlas</a>
+                <a href="{% url 'anatomy:index'%}">Anatomy</a>
+                <a href="{% url 'physics:index'%}">Physics</a>
+                <a href="{% url 'rapids:index'%}">Rapids</a>
+                <a href="{% url 'longs:index'%}">Longs</a>
+                <a href="{% url 'sbas:index'%}">SBAs</a> {% endcomment %}
+            {% endif %}
+            {% if request.user.is_staff %}<a href="{% url 'admin:index'%}">Admin</a>{% endif %}
+        </div>
+    </p>
+    {% if request.user.is_authenticated %}
+        <p>
             <a href="{% url 'user_scores'%}">Your Exams</a>
 
-    </p>
-        {% endif %}
+        </p>
+    {% endif %}
 
 
     <p><a href="http://www.penracourses.org.uk/rts">RTS is available here</a></p>
     <div>
         {% if request.user.is_staff %}
-        Manage users <a href="{% url 'generic:manage_cids'%}">here</a>
+            Manage users <a href="{% url 'generic:manage_cids'%}">here</a>
         {% endif %}
     </div>
 {% endblock %}