diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html
index b5fd1b7a..e68e73bf 100644
--- a/RIGS/templates/RIGS/event_detail.html
+++ b/RIGS/templates/RIGS/event_detail.html
@@ -151,7 +151,7 @@
                             <a href="{% url 'event_detail' pk=object.based_on.pk %}">
                                 {% if object.based_on.is_rig %}N{{ object.based_on.pk|stringformat:"05d" }}{% else %}
                                     {{ object.based_on.pk }}{% endif %}
-                                {{ object.base_on.name }} by {{ object.based_on.mic.name }}
+                                {{ object.base_on.name }} {% if object.based_on.mic %}by {{ object.based_on.mic.name }}{% endif %}
                             </a>
                         {% endif %}
                     </dd>
diff --git a/templates/base.html b/templates/base.html
index 8bf8b62c..23476432 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -144,10 +144,6 @@
             {% endif %}
         {% endblock %}
 
-        <div class="col-sm-12 text-center">
-            Reminder: Please consider carefully before booking rigs at this moment
-        </div>
-
         {% block content %}{% endblock %}
     </div>