diff --git a/RIGS/templates/RIGS/event_table.html b/RIGS/templates/RIGS/event_table.html
index 49e4ec6f..38b437ff 100644
--- a/RIGS/templates/RIGS/event_table.html
+++ b/RIGS/templates/RIGS/event_table.html
@@ -33,7 +33,7 @@
                 </td>
                 <td>
                     <h4>
-                        <a href="{% url 'event_detail' event.pk %}">{{ event.name }}</a>
+                        <a {% if perms.RIGS.view_event %}href="{% url 'event_detail' event.pk %}" {% endif %}>{{ event.name }}</a>
                         {% if event.venue %}
                             <small>at {{ event.venue }}</small>
                         {% endif %}
diff --git a/RIGS/templates/RIGS/index.html b/RIGS/templates/RIGS/index.html
index 3097e92c..a99dfa18 100644
--- a/RIGS/templates/RIGS/index.html
+++ b/RIGS/templates/RIGS/index.html
@@ -10,7 +10,7 @@
         </p>
     </div>
     <div class="row">
-    <div class="col-sm-6">
+    <div class="col-sm-{% if perms.RIGS.view_event %}6{% else %}12{% endif %}">
         
         <div class="panel panel-default">
             <div class="panel-heading">
@@ -19,7 +19,7 @@
             <div class="list-group">
                     <a class="list-group-item" href="{% url 'rigboard' %}"><span class="glyphicon glyphicon-list"></span> Rigboard</a>
                     <a class="list-group-item" href="{% url 'web_calendar' %}"><span class="glyphicon glyphicon-calendar"></span> Calendar</a>
-                    <a class="list-group-item" href="{% url 'event_create' %}"><span class="glyphicon glyphicon-plus"></span> New Event</a>
+                    {% if perms.RIGS.add_event %}<a class="list-group-item" href="{% url 'event_create' %}"><span class="glyphicon glyphicon-plus"></span> New Event</a>{% endif %}
 
                     <div class="list-group-item default"></div>
 
@@ -68,9 +68,11 @@
             </div>
         </div>
     </div>
+    {% if perms.RIGS.view_event %}
     <div class="col-sm-6" >
         {% include 'RIGS/activity_feed.html' %}    
         
     </div>
+    {% endif %}
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/RIGS/templates/RIGS/rigboard.html b/RIGS/templates/RIGS/rigboard.html
index 07d26bfc..9292e304 100644
--- a/RIGS/templates/RIGS/rigboard.html
+++ b/RIGS/templates/RIGS/rigboard.html
@@ -8,11 +8,14 @@
             <div class="row">
                 <div class="col-sm-10">
                     <h3>Rigboard</h3>
-                </div>
+                </div> 
+                {% if perms.RIGS.add_event %}
                 <div class="col-sm-2">
                     <a href="{% url 'event_create' %}" class="btn btn-default pull-right">New <span
                             class="glyphicon glyphicon-plus"></span></a>
                 </div>
+                {% endif %}
+                
                 {% comment %}
                 {# Bring search back at a later date #}
                 <div class="col-sm-3 col-sm-offset-9">
diff --git a/templates/base.html b/templates/base.html
index d128549e..5c8e9ce6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -42,6 +42,7 @@
         </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>
@@ -49,10 +50,16 @@
                         <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>
-                        <li><a href="{% url 'activity_table' %}"><span class="glyphicon glyphicon-random"></span> Recent Changes</a></li>
-                        <li><a href="{% url 'event_create' %}"><span class="glyphicon glyphicon-plus"></span> New Event</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>
@@ -106,7 +113,7 @@
                     {% else %}
                         <a href="{% url "login" %}?next={{ request.path }}">
                             <span class="icon-user"></span>
-                            Hi guest
+                            Login
                         </a>
                     {% endif %}
                 </li>