diff --git a/jasmin_services/models/role.py b/jasmin_services/models/role.py
index cd4ea2e..4fc1a95 100644
--- a/jasmin_services/models/role.py
+++ b/jasmin_services/models/role.py
@@ -2,7 +2,6 @@
 import functools
 from datetime import date
 
-import django.apps
 import django.utils.timezone
 from django.conf import settings
 from django.contrib.auth import get_user_model
diff --git a/jasmin_services/templates/jasmin_services/includes/display_accesses.html b/jasmin_services/templates/jasmin_services/includes/display_accesses.html
index 0ce2504..09617c3 100644
--- a/jasmin_services/templates/jasmin_services/includes/display_accesses.html
+++ b/jasmin_services/templates/jasmin_services/includes/display_accesses.html
@@ -35,10 +35,10 @@
         <td>
             {% if  access.status == "EXPIRING" or access.status == "EXPIRED" %}
                 {% if access.frontend.may_apply %}
-                <a class="btn btn-warning btn-sm" href="{{ access.frontend.apply_url }}">
-                    Extend
-                </a>
-            {% endif %}
+                    <a class="btn btn-warning btn-sm" href="{{ access.frontend.apply_url }}">
+                        Extend
+                    </a>
+                {% endif %}
             {% elif access.status == "REVOKED" or access.status == "REJECTED" or access.status == "INCOMPLETE" %}
                 <button class="btn btn-warning btn-sm" type="button" data-bs-toggle="collapse" data-bs-target="#access-collapse-{{ access.frontend.id }}">
                     See Reason
@@ -62,8 +62,8 @@
                         <a class="btn btn-warning btn-sm" href="{{ access.frontend.apply_url }}">Add Info</a>
                     {% elif access.status == "REVOKED" or access.status == "REJECTED" %}
                         {% if access.frontend.may_apply %}
-                        <a class="btn btn-warning btn-sm" href="{{ access.frontend.apply_url }}">Reapply</a>
-                    {% endif %}
+                            <a class="btn btn-warning btn-sm" href="{{ access.frontend.apply_url }}">Reapply</a>
+                        {% endif %}
                     {% endif %}
                     <hr />
                 {% endif %}
@@ -81,11 +81,13 @@
                     <p>This request is awaiting consideration. You don't need to do anything.</p>
                     <hr />
                 {% endif %}
-                <p>When you submitted your application, you supplied the following information:</p>
-                {% for metadata in access.metadata.all %}
-                    <h5>{{ metadata.key }}:</h5> <p><i>{{metadata.value}}</i></p>
-                {% endfor %}
-                <hr />
+                {% block metadata %}
+                    <p>When you submitted your application, you supplied the following information:</p>
+                    {% for metadata in access.metadata.all %}
+                        <h5>{{ metadata.key }}:</h5> <p><i>{{metadata.value}}</i></p>
+                    {% endfor %}
+                    <hr />
+                {% endblock %}
             </td>
         </tr>
     {% endfor %}
diff --git a/jasmin_services/templates/jasmin_services/request_decide.html b/jasmin_services/templates/jasmin_services/request_decide.html
index d0e29c6..b20ec7b 100644
--- a/jasmin_services/templates/jasmin_services/request_decide.html
+++ b/jasmin_services/templates/jasmin_services/request_decide.html
@@ -50,45 +50,45 @@
                     <label class="col-sm-2 col-form-label" for=""id_for_email">Email Address</label>
                                                                               <div class="col-sm-10">
                                                                                                                                <p class="form-control-plaintext" id="id_for_email">
-                                                                                                                                                   {{ pending.access.user.email }}
-                                                                                                                                                   </p>
-                                                                                                                                                   </div>
-                                                                                                                                                   </div>
-                                                                                                                                                   <div class="row mb-3">
-                                                                                                                                                      <label class="col-sm-2 col-form-label" for="id_for_institution">Institution</label>
-                                                                                                                                                          <div class="col-sm-10">
-                                                                                                                                                               <p class="form-control-plaintext" id="id_for_institution">
-                                                                                                                                                         {{ pending.access.user.institution }}
-                                                                                                                                                         </p>
-                                                                                                                                                         </div>
-                                                                                                                                                         </div>
-                                                                                                                                                         <div class="row mb-3">
-                                                                                                                                                            <label class="col-sm-2 col-form-label" for="id_for_discipline">Discipline</label>
-                                                                                                                                                         <div class="col-sm-10">
-                                                                                                                                                              <p class="form-control-plaintext" id="id_for_discipline">
-                                                                                                                                                        {{ pending.access.user.discipline }}
-                                                                                                                                                        </p>
-                                                                                                                                                        </div>
-                                                                                                                                                        </div>
-                                                                                                                                                        <div class="row mb-3">
-                                                                                                                                                           <label class="col-sm-2 col-form-label" for="id_for_degree">Degree</label>
-                                                                                                                                                     <div class="col-sm-10">
-                                                                                                                                                          <p class="form-control-plaintext" id="id_for_degree">
-                                                                                                                                                    {{ pending.access.user.degree|default:"N/A" }}
-                                                                                                                                                    </p>
-                                                                                                                                                    </div>
-                                                                                                                                                    </div>
+                                                                                                                                                                                                             {{ pending.access.user.email }}
+                                                                                                                                                                                                             </p>
+                                                                                                                                                                                                             </div>
+                                                                                                                                                                                                             </div>
+                                                                                                                                                                                                             <div class="row mb-3">
+                                                                                                                                                                                                   <label class="col-sm-2 col-form-label" for="id_for_institution">Institution</label>
+                                                                                                                                                                                                                                                <div class="col-sm-10">
+                                                                                                                                                                                                           <p class="form-control-plaintext" id="id_for_institution">
+                                                                                                                                                                                                                                                   {{ pending.access.user.institution }}
+                                                                                                                                                                                                                                                   </p>
+                                                                                                                                                                                                                                                   </div>
+                                                                                                                                                                                                                                                   </div>
+                                                                                                                                                                                                                                                   <div class="row mb-3">
+                                                                                                                                                                                                         <label class="col-sm-2 col-form-label" for="id_for_discipline">Discipline</label>
+                                                                                                                                                                                                                                                     <div class="col-sm-10">
+                                                                                                                                                                                                          <p class="form-control-plaintext" id="id_for_discipline">
+                                                                                                                                                                                                                                                 {{ pending.access.user.discipline }}
+                                                                                                                                                                                                                                                 </p>
+                                                                                                                                                                                                                                                 </div>
+                                                                                                                                                                                                                                                 </div>
+                                                                                                                                                                                                                                                 <div class="row mb-3">
+                                                                                                                                                                                                        <label class="col-sm-2 col-form-label" for="id_for_degree">Degree</label>
+                                                                                                                                                                                                                                                <div class="col-sm-10">
+                                                                                                                                                                                                      <p class="form-control-plaintext" id="id_for_degree">
+                                                                                                                                                                                                                                         {{ pending.access.user.degree|default:"N/A" }}
+                                                                                                                                                                                                                                         </p>
+                                                                                                                                                                                                                                         </div>
+                                                                                                                                                                                                                                         </div>
 
-                                                                                                                                                    {% if rejected %}
-                                                                                                                                                        <div class="row mb-3">
-                                                                                                                                                               <label class="col-sm-2 col-form-label" for="reason-accordion">Previous Rejections</label>
-                                                                                                                                                                    <div class="col-sm-10">
-                                                                                                                                                                         <div class="accordion" id="reason-accordion">
-                                                                                                                                                        {% for req in rejected %}
-                                                                                                                                                            <div class="accordion-item">
-                                                                                                                                                                         <h4 class="accordion-header" id="acc-heading-{{ forloop.counter }}">
-                                                                                                                                                                                                        <button class="accordion-button bg-warning text-white"
-                                                                                                                                                                                                                                       type="button"
+                                                                                                                                                                                                                                         {% if rejected %}
+                                                                                                                                                                                                                                             <div class="row mb-3">
+                                                                                                                                                                                                            <label class="col-sm-2 col-form-label" for="reason-accordion">Previous Rejections</label>
+                                                                                                                                                                                                                                                           <div class="col-sm-10">
+                                                                                                                                                                                                                         <div class="accordion" id="reason-accordion">
+                                                                                                                                                                                                                                                    {% for req in rejected %}
+                                                                                                                                                                                                                                                        <div class="accordion-item">
+                                                                                                                                                                                                                          <h4 class="accordion-header" id="acc-heading-{{ forloop.counter }}">
+                                                                                                                                                                                                                                                                               <button class="accordion-button bg-warning text-white"
+                                                                                                                                                                                                                                                                                                 type="button"
                                                 data-bs-toggle="collapse"
                                                             data-bs-target="#acc-collapse-{{ forloop.counter }}"
                                                                                        {% if forloop.last %}aria-expanded="true"{% endif %}
@@ -119,81 +119,81 @@ <h5>Reason for rejection (internal)</h5>
                                                                                                                            {% endif %}
                                                                                                                            {% if grant.revoked %}
                                                                                                                                <div class="form-group">
-                                                                                                                                                            <div class="col-sm-10 col-md-offset-3">
-                                                                                                                                               <aside class="danger">
-                                                                                                                                                 <header>Previous access revoked</header>
-                                                                                                                                                 {{ grant.user_reason|markdown }}
-                                                                                                                                                 {% if grant.internal_reason %}
-                                                                                                                                                     <hr>
-                                                                                                                                                     {{ grant.internal_reason|markdown }}
-                                                                                                                                                 {% endif %}
-                                                                                                                                                 </aside>
-                                                                                                                                                 </div>
-                                                                                                                                                 </div>
-                                                                                                                                             {% elif grant.expired %}
-                                                                                                                                                 <div class="form-group">
-                                                                                                                                      <div class="col-sm-10 col-md-offset-3">
-                                                                                                                                               <aside class="danger">
-                                                                                                                                                 <header>Previous access expired</header>
-                                                                                                                                                 <p>Expired on {{ grant.expires }}</p>
-                                                                                                                                                 </aside>
-                                                                                                                                                 </div>
-                                                                                                                                                 </div>
-                                                                                                                                             {% elif grant.expiring %}
-                                                                                                                                                 <div class="form-group">
-                                                                                                                                      <div class="col-sm-10 col-md-offset-3">
-                                                                                                                                               <aside class="warning">
-                                                                                                                                                  <header>Current access expiring</header>
-                                                                                                                                                  <p>Expires on {{ grant.expires }}</p>
-                                                                                                                                                  </aside>
-                                                                                                                                                  </div>
-                                                                                                                                                  </div>
-                                                                                                                                              {% endif %}
-
-                                                                                                                                              {% block extra_context %}{% endblock %}
-
-                                                                                                                                              {% for datum in pending.metadata.all %}
-                                                                                                                                                  <div class="row mb-3">
-                                                                                                                                     <label class="col-sm-2 col-form-label" for="id_{{ datum.key }}">{{ datum.key|pretty_name }}</label>
-                                                                                                                                                                      <div class="col-sm-10">
-                                                                                                                                                                           <p class="form-control-plaintext" id="id_{{ datum.key }}" style="white-space: pre-wrap;">{{ datum.value }}</p>
+                                                                                                                                                                                     <div class="col-sm-10 col-md-offset-3">
+                                                                                                                                                                                                                                 <aside class="danger">
+                                                                                                                                                                                                   <header>Previous access revoked</header>
+                                                                                                                                                                                                   {{ grant.user_reason|markdown }}
+                                                                                                                                                                                                   {% if grant.internal_reason %}
+                                                                                                                                                                                                       <hr>
+                                                                                                                                                                                                       {{ grant.internal_reason|markdown }}
+                                                                                                                                                                                                   {% endif %}
+                                                                                                                                                                                                   </aside>
+                                                                                                                                                                                                   </div>
+                                                                                                                                                                                                   </div>
+                                                                                                                                                                                               {% elif grant.expired %}
+                                                                                                                                                                                                   <div class="form-group">
+                                                                                                                                                                                                       <div class="col-sm-10 col-md-offset-3">
+                                                                                                                                                                                                           <aside class="danger">
+                                                                                                                                                                                                   <header>Previous access expired</header>
+                                                                                                                                                                                                   <p>Expired on {{ grant.expires }}</p>
+                                                                                                                                                                                                   </aside>
+                                                                                                                                                                                                   </div>
+                                                                                                                                                                                                   </div>
+                                                                                                                                                                                               {% elif grant.expiring %}
+                                                                                                                                                                                                   <div class="form-group">
+                                                                                                                                                                                                       <div class="col-sm-10 col-md-offset-3">
+                                                                                                                                                                                                           <aside class="warning">
+                                                                                                                                                                                                    <header>Current access expiring</header>
+                                                                                                                                                                                                    <p>Expires on {{ grant.expires }}</p>
+                                                                                                                                                                                                    </aside>
                                                                                                                                                                                                     </div>
                                                                                                                                                                                                     </div>
-                                                                                                                                                                                                {% endfor %}
+                                                                                                                                                                                                {% endif %}
+
+                                                                                                                                                                                                {% block extra_context %}{% endblock %}
+
+                                                                                                                                                                                                {% for datum in pending.metadata.all %}
+                                                                                                                                                                                                    <div class="row mb-3">
+                                                                                                                                                                                                      <label class="col-sm-2 col-form-label" for="id_{{ datum.key }}">{{ datum.key|pretty_name }}</label>
+                                                                                                                                                                                                                                   <div class="col-sm-10">
+                                                                                                                                                                                                                           <p class="form-control-plaintext" id="id_{{ datum.key }}" style="white-space: pre-wrap;">{{ datum.value }}</p>
+                                                                                                                                                                                                                                                                                                  </div>
+                                                                                                                                                                                                                                                                                                  </div>
+                                                                                                                                                                                                                                                                                              {% endfor %}
 
-                                                                                                                                                                                                {% bootstrap_form form layout='horizontal' %}
+                                                                                                                                                                                                                                                                                              {% bootstrap_form form layout='horizontal' %}
 
-                                                                                                                                                                                                <div class="row justify-content-end">
-                                                                                                                                                                                                              <div class="col-sm-10">
-                                                                                                                                <button name="submitted" type="submit" class="btn btn-primary" autocomplete="off">Make decision</button>
-                                                                                                                                                                                 </div>
-                                                                                                                                                                                 </div>
-                                                                                                                                                                                 </form>
-                                                                                                                                                                                 </div>
-                                                                                                                                                                                 <div class="col-md-3">
-                                                                                                                                                                                    <div class="card">
-                                                                                                    <div class="card-header">Other approvers</div>
-                                                                                                           <div class="card-body">
-                                                                                                                    {% if approvers %}
-                                                                                                                        <ul class="list-group">
-                                                                                                                          {% for user in approvers %}
-                                                                                                                              <li class="list-group-item"><code>{{ user.username }}</code></li>
-                                                                                                                                           {% endfor %}
-                                                                                                                                           </ul>
-                                                                                                                                       {% else %}
-                                                                                                                                           You are the only approver for this service.
-                                                                                                                                       {% endif %}
-                                                                                                                                       </div>
-                                                                                                                                       </div>
-                                                                                                                                       </div>
-                                                                                                                                       </div>
-                                                                                                                   {% endblock %}
+                                                                                                                                                                                                                                                                                              <div class="row justify-content-end">
+                                                                                                                                                                                                                                                               <div class="col-sm-10">
+                                                                                                                                                                                                                                                               <button name="submitted" type="submit" class="btn btn-primary" autocomplete="off">Make decision</button>
+                                                                                                                                                                                                                                            </div>
+                                                                                                                                                                                                                                            </div>
+                                                                                                                                                                                                                                            </form>
+                                                                                                                                                                                                                                            </div>
+                                                                                                                                                                                                                                            <div class="col-md-3">
+                                                                                                                                                                                                                                 <div class="card">
+                                                                                                                                                                                                                                <div class="card-header">Other approvers</div>
+                                                                                                                                                       <div class="card-body">
+                                                                                                                                                            {% if approvers %}
+                                                                                                                                                                <ul class="list-group">
+                                                                                                                                                                             {% for user in approvers %}
+                                                                                                                                                                                 <li class="list-group-item"><code>{{ user.username }}</code></li>
+                                                                                                                                                                                        {% endfor %}
+                                                                                                                                                                                        </ul>
+                                                                                                                                                                                    {% else %}
+                                                                                                                                                                                        You are the only approver for this service.
+                                                                                                                                                                                    {% endif %}
+                                                                                                                                                                                    </div>
+                                                                                                                                                                                    </div>
+                                                                                                                                                                                    </div>
+                                                                                                                                                                                    </div>
+                                                                                                                                                                {% endblock %}
 
-                                                                                                                   {% block stylesheets_page %}
-                                                                                                                       <link rel="stylesheet" href="{% artefact "vendor/css/easymde.min.css" %}">
-                                                                                                                                                      {% endblock %}
+                                                                                                                                                                {% block stylesheets_page %}
+                                                                                                                                                                    <link rel="stylesheet" href="{% artefact "vendor/css/easymde.min.css" %}">
+                                                                                                                                                                                                       {% endblock %}
 
-                                                                                                                                                      {% block js_page %}
-                                                                                                                                                          <script src="{% artefact "vendor/js/easymde.min.js" %}"></script>
-                                                                                                                                                          <script src="{% static "jasmin_services/js/request_decide.js" %}"></script>
-                                                                                                                                              {% endblock %}
+                                                                                                                                                                                                       {% block js_page %}
+                                                                                                                                                                                                           <script src="{% artefact "vendor/js/easymde.min.js" %}"></script>
+                                                                                                                                                                                                                            <script src="{% static "jasmin_services/js/request_decide.js" %}"></script>
+                                                                                                                                                                                                                                  {% endblock %}
diff --git a/jasmin_services/templates/jasmin_services/role_apply.html b/jasmin_services/templates/jasmin_services/role_apply.html
index fadc64a..47d20a1 100644
--- a/jasmin_services/templates/jasmin_services/role_apply.html
+++ b/jasmin_services/templates/jasmin_services/role_apply.html
@@ -14,26 +14,26 @@
         {% csrf_token %}
 
         {% block service_identity %}
-        <div class="form-group">
-            <div class="row">
-                <label class="col-4 text-right control-label" for="id_service"><b>Service</b></label>
-                <div class="col">
-                    <p class="form-control-static" id="id_service">
-                        <code>{{ role.service }}</code>
-                    </p>
+            <div class="form-group">
+                <div class="row">
+                    <label class="col-4 text-right control-label" for="id_service"><b>Service</b></label>
+                    <div class="col">
+                        <p class="form-control-static" id="id_service">
+                            <code>{{ role.service }}</code>
+                        </p>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="form-group">
-            <div class="row">
-                <label class="col-4 text-right control-label" for="id_role"><b>Role</b></label>
-                <div class="col">
-                    <p class="form-control-static" id="id_role">
-                        <code>{{ role.name }}</code>
-                    </p>
+            <div class="form-group">
+                <div class="row">
+                    <label class="col-4 text-right control-label" for="id_role"><b>Role</b></label>
+                    <div class="col">
+                        <p class="form-control-static" id="id_role">
+                            <code>{{ role.name }}</code>
+                        </p>
+                    </div>
                 </div>
             </div>
-        </div>
         {% endblock service_identity %}
         {% if req or grant %}
             <div class="row">
diff --git a/jasmin_services/templatetags/service_tags.py b/jasmin_services/templatetags/service_tags.py
index 563bc17..cb37d83 100644
--- a/jasmin_services/templatetags/service_tags.py
+++ b/jasmin_services/templatetags/service_tags.py
@@ -4,13 +4,6 @@
 
 __author__ = "Matt Pryor"
 __copyright__ = "Copyright 2015 UK Science and Technology Facilities Council"
-
-import itertools
-import random
-import string
-
-import django.conf
-import django.urls
 from django import template
 
 from ..models import Request, RequestState
diff --git a/jasmin_services/views/service_details.py b/jasmin_services/views/service_details.py
index 69c00c9..7f90ab5 100644
--- a/jasmin_services/views/service_details.py
+++ b/jasmin_services/views/service_details.py
@@ -5,8 +5,7 @@
 
 import django.views.generic
 import jasmin_metadata.models
-from django.conf import settings
-from django.db.models import OuterRef, Q, Subquery
+from django.db.models import Q
 
 from .. import models
 from . import common, mixins