diff --git a/breccia_mapper/templates/base.html b/breccia_mapper/templates/base.html
index 3d2ddc0..b69fd7b 100644
--- a/breccia_mapper/templates/base.html
+++ b/breccia_mapper/templates/base.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 {% load bootstrap4 %}
 {% if 'use_i18n'|bootstrap_setting %}
-    {% load i18n %}
-    {% get_current_language as LANGUAGE_CODE %}
+{% load i18n %}
+{% get_current_language as LANGUAGE_CODE %}
 {% endif %}
 <html lang="{{ LANGUAGE_CODE|default:'en_us' }}">
 
@@ -25,28 +25,29 @@
           crossorigin="anonymous" />
 
     {% load staticfiles %}
-    <link rel="stylesheet"
-          href="{% static 'css/global.css' %}">
+    <link rel="stylesheet" href="{% static 'css/global.css' %}">
 
     {% if 'javascript_in_head'|bootstrap_setting %}
-        {% if 'include_jquery'|bootstrap_setting %}
-            {# jQuery JavaScript if it is in head #}
-            {% bootstrap_jquery jquery='include_jquery'|bootstrap_setting %}
-        {% endif %}
-
-        {# Bootstrap JavaScript if it is in head #}
-        {% bootstrap_javascript %}
+    {% if 'include_jquery'|bootstrap_setting %}
+    {# jQuery JavaScript if it is in head #}
+    {% bootstrap_jquery jquery='include_jquery'|bootstrap_setting %}
     {% endif %}
 
-    {{ form.media.css }}
+    {# Bootstrap JavaScript if it is in head #}
+    {% bootstrap_javascript %}
+    {% endif %}
+
+    {% if form %}
+        {{ form.media.css }}
+    {% endif %}
 
     {% block extra_head %}{% endblock %}
 
 </head>
 
 <body>
-<div class="content" style="display: flex; flex-direction: column">
-    {% block navbar %}
+    <div class="content" style="display: flex; flex-direction: column">
+        {% block navbar %}
         <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
             <div class="container">
                 <a href="{% url 'index' %}" class="navbar-brand">
@@ -78,107 +79,110 @@
                         </li>
 
                         {% if request.user.is_superuser %}
-                            <li class="nav-item">
-                                <a href="{% url 'export:index' %}" class="nav-link">Export</a>
-                            </li>
+                        <li class="nav-item">
+                            <a href="{% url 'export:index' %}" class="nav-link">Export</a>
+                        </li>
 
-                            <li class="nav-item">
-                                <a href="{% url 'admin:index' %}" class="nav-link">Admin</a>
-                            </li>
+                        <li class="nav-item">
+                            <a href="{% url 'admin:index' %}" class="nav-link">Admin</a>
+                        </li>
                         {% endif %}
                     </ul>
 
                     <ul class="navbar-nav mt-2 mt-lg-0 ml-auto">
                         {% if request.user.is_authenticated %}
-                            <li class="nav-item">
-                                {% if request.user.person %}
-                                    <a href="{% url 'people:person.profile' %}" class="nav-link">
-                                        <i class="fas fa-user-circle"></i>
-                                        {{ request.user }}
-                                    </a>
+                        <li class="nav-item">
+                            {% if request.user.person %}
+                            <a href="{% url 'people:person.profile' %}" class="nav-link">
+                                <i class="fas fa-user-circle"></i>
+                                {{ request.user }}
+                            </a>
 
-                                {% else %}
-                                    <a href="{% url 'people:person.create' %}?user" class="nav-link">
-                                        <i class="fas fa-user-circle"></i>
-                                        {{ request.user }}
-                                    </a>
+                            {% else %}
+                            <a href="{% url 'people:person.create' %}?user" class="nav-link">
+                                <i class="fas fa-user-circle"></i>
+                                {{ request.user }}
+                            </a>
 
-                                {% endif %}
-                            </li>
+                            {% endif %}
+                        </li>
 
-                            <li class="nav-item">
-                                <a href="{% url 'logout' %}" class="nav-link">
-                                    <i class="fas fa-sign-out-alt"></i>
-                                    Log Out
-                                </a>
-                            </li>
+                        <li class="nav-item">
+                            <a href="{% url 'logout' %}" class="nav-link">
+                                <i class="fas fa-sign-out-alt"></i>
+                                Log Out
+                            </a>
+                        </li>
 
                         {% else %}
-                            <li class="nav-item">
-                                <a href="{% url 'login' %}" class="nav-link">
-                                    <i class="fas fa-sign-in-alt"></i>
-                                    Log In
-                                </a>
-                            </li>
+                        <li class="nav-item">
+                            <a href="{% url 'login' %}" class="nav-link">
+                                <i class="fas fa-sign-in-alt"></i>
+                                Log In
+                            </a>
+                        </li>
 
                         {% endif %}
                     </ul>
                 </div>
             </div>
         </nav>
-    {% endblock %}
+        {% endblock %}
 
-    {# Global banner if config.NOTICE_TEXT is set using Constance #}
-    {% if config.NOTICE_TEXT %}
+        {# Global banner if config.NOTICE_TEXT is set using Constance #}
+        {% if config.NOTICE_TEXT %}
         <div class="alert {{ config.NOTICE_CLASS }} rounded-0 mb-3" role="alert">
             <h4 class="alert-heading text-center mb-0">{{ config.NOTICE_TEXT }}</h4>
         </div>
-    {% endif %}
+        {% endif %}
 
-    {% if request.user.is_authenticated and not request.user.has_person %}
+        {% if request.user.is_authenticated and not request.user.has_person %}
         <div class="alert alert-info rounded-0" role="alert">
             <p class="text-center mb-0">
-                Your profile is currently blank.  Please fill in your details so you can be part of the network.
+                Your profile is currently blank.
+                Please fill in your details so you can be part of the network.
 
                 <a class="btn btn-success"
                    href="{% url 'people:person.create' %}?user">Profile</a>
             </p>
         </div>
-    {% endif %}
+        {% endif %}
 
-    {% block before_content %}{% endblock %}
+        {% block before_content %}{% endblock %}
 
-    <main class="container">
-        {# Display Django messages as Bootstrap alerts #}
-        {% bootstrap_messages %}
+        <main class="container">
+            {# Display Django messages as Bootstrap alerts #}
+            {% bootstrap_messages %}
 
-        {% block content %}{% endblock %}
-    </main>
+            {% block content %}{% endblock %}
+        </main>
 
-    <div class="container">
-        {% block after_content %}{% endblock %}
+        <div class="container">
+            {% block after_content %}{% endblock %}
+        </div>
     </div>
-</div>
 
-<footer class="footer bg-light">
-    <div class="container">
-        <span class="text-muted">{{ settings.PROJECT_LONG_NAME }}</span>
-    </div>
-</footer>
+    <footer class="footer bg-light">
+        <div class="container">
+            <span class="text-muted">{{ settings.PROJECT_LONG_NAME }}</span>
+        </div>
+    </footer>
 
-{% if not 'javascript_in_head'|bootstrap_setting %}
+    {% if not 'javascript_in_head'|bootstrap_setting %}
     {% if 'include_jquery'|bootstrap_setting %}
-        {# jQuery JavaScript if it is in body #}
-        {% bootstrap_jquery jquery='include_jquery'|bootstrap_setting %}
+    {# jQuery JavaScript if it is in body #}
+    {% bootstrap_jquery jquery='include_jquery'|bootstrap_setting %}
     {% endif %}
 
     {# Bootstrap JavaScript if it is in body #}
     {% bootstrap_javascript %}
-{% endif %}
+    {% endif %}
 
-{{ form.media.js }}
+    {% if form %}
+        {{ form.media.js }}
+    {% endif %}
 
-{% block extra_script %}{% endblock %}
+    {% block extra_script %}{% endblock %}
 </body>
 
 </html>
