diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html
index a28240ba..5d3eb9e9 100644
--- a/RIGS/templates/RIGS/event_detail.html
+++ b/RIGS/templates/RIGS/event_detail.html
@@ -5,7 +5,7 @@
 {% block content %}
     <div class="col-sm-12">
         <div class="col-sm-8">
-            <h1>N{{ object.pk|stringformat:"05d" }}</h1>
+            <h1>Event {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}</h1>
         </div>
         <div class="col-sm-4 text-right">
             <div class="btn-group btn-page">
@@ -13,7 +13,7 @@
                         class="glyphicon glyphicon-edit"></span></a>
                 <a href="{% url 'event_print' event.pk %}" class="btn btn-default"><span
                         class="glyphicon glyphicon-print"></span></a>
-                <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default"><span
+                <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
                         class="glyphicon glyphicon-duplicate"></span></a>
             </div>
         </div>
@@ -111,6 +111,8 @@
                     class="glyphicon glyphicon-edit"></span></a>
             <a href="{% url 'event_print' event.pk %}" class="btn btn-default"><span
                     class="glyphicon glyphicon-print"></span></a>
+            <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
+                    class="glyphicon glyphicon-duplicate"></span></a>
         </div>
     </div>
     <div class="col-sm-12">
@@ -133,6 +135,8 @@
                     class="glyphicon glyphicon-edit"></span></a>
             <a href="{% url 'event_print' event.pk %}" class="btn btn-default"><span
                     class="glyphicon glyphicon-print"></span></a>
+            <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
+                    class="glyphicon glyphicon-duplicate"></span></a>
         </div>
         <div>Last edited at {{ object.last_edited_at|date:"SHORT_DATETIME_FORMAT" }} by {{ object.last_edited_by }}.
         </div>
diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html
index b2e8ccad..9349463b 100644
--- a/RIGS/templates/RIGS/event_form.html
+++ b/RIGS/templates/RIGS/event_form.html
@@ -2,7 +2,8 @@
 {% load widget_tweaks %}
 {% load static %}
 {% load multiply from filters %}
-{% block title %}{% if object.pk %}Event {{ object.pk }}{% else %}New Event{% endif %}{% endblock %}
+{% block title %}{% if object.pk %}Event {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}
+    {{ object.pk }}{% endif %}{% else %}New Event{% endif %}{% endblock %}
 
 {% block css %}
     <link href="//code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css"/>
@@ -69,15 +70,25 @@
 {% endblock %}
 
 {% block content %}
-    <h2>
-        {% if object.pk %}
-            Event {{ object.pk }}
-        {% else %}
-            New Event
-        {% endif %}
-    </h2>
-    {% include 'form_errors.html' %}
     <form class="form-horizontal itemised_form" role="form" method="POST">{% csrf_token %}
+    <div class="col-sm-12">
+        <div class="col-sm-8">
+            <h2>
+                {% if object.pk %}
+                    Event N{{ object.pk|stringformat:"05d" }}
+                {% else %}
+                    New Event
+                {% endif %}
+            </h2>
+        </div>
+        <div class="col-sm-4 text-right">
+            <div class="btn-group btn-page">
+                <button type="submit" class="btn btn-default" title="Save"><span
+                        class="glyphicon glyphicon-save"></span></button>
+            </div>
+        </div>
+    </div>
+    {% include 'form_errors.html' %}
     {% render_field form.is_rig style="display: none" %}
     <input type="hidden" name="{{ form.items_json.name }}" id="{{ form.items_json.id_for_label }}"
            value="{{ form.items_json.value }}"/>
@@ -306,16 +317,16 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-sm-12">
-                        <div class="pull-right">
-                            <div class="form-group">
-                                <input type="submit" value="Submit" class="btn btn-primary"/>
-                            </div>
-                        </div>
-                    </div>
                 </div>
             </div>
         </div>
+        <div class="col-sm-12 text-right">
+            <div class="btn-group btn-page">
+                <button type="submit" class="btn btn-default" title="Save"><span
+                        class="glyphicon glyphicon-save"></span>
+                </button>
+            </div>
+        </div>
     </div>
     <!-- /.col-md-6 -->