diff --git a/atlas/templates/atlas/author_list.html b/atlas/templates/atlas/author_list.html
index c9f24e20..0e10b9be 100755
--- a/atlas/templates/atlas/author_list.html
+++ b/atlas/templates/atlas/author_list.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 
-{% for author in authors %}
-<p>Author: <a href="{% url 'atlas:author_detail' pk=author.pk %}">{{author.username}}</a>, </p>
-{% endfor %}
-{% endblock %}
\ No newline at end of file
+    {% for author in authors %}
+        <p>Author: <a href="{% url 'atlas:author_detail' pk=author.pk %}">{{author.username}}</a>, </p>
+    {% endfor %}
+{% endblock %}
diff --git a/atlas/templates/atlas/base.html b/atlas/templates/atlas/base.html
index 81ea8489..ca8c36fe 100755
--- a/atlas/templates/atlas/base.html
+++ b/atlas/templates/atlas/base.html
@@ -1,7 +1,7 @@
 {% extends 'base.html' %}
 
 {% block title %}
-Atlas
+    Atlas
 {% endblock %}
 
 {% block css %}
@@ -15,16 +15,16 @@ Atlas
 {% block content %}
 {% endblock %}
 {% block navigation %}
-Atlas: 
-{% if request.user.is_authenticated %}
-<a href="{% url 'atlas:case_view' %}">Cases</a> /
-<a href="{% url 'atlas:series_view' %}">Series</a> /
-<a href="{% url 'atlas:collection_view' %}">Collections</a> /
-<a href="{% url 'atlas:categories_list' %}">Categories</a> /
-<a href="{% url 'atlas:case_create' %}" title="Create a new atlas case">Create Case</a> /
-<a href="{% url 'atlas:series_create' %}" title="Create a new image series">Create Series</a>
-{% endif %}
-{% comment %} </br>
+    Atlas:
+    {% if request.user.is_authenticated %}
+        <a href="{% url 'atlas:case_view' %}">Cases</a> /
+        <a href="{% url 'atlas:series_view' %}">Series</a> /
+        <a href="{% url 'atlas:collection_view' %}">Collections</a> /
+        <a href="{% url 'atlas:categories_list' %}">Categories</a> /
+        <a href="{% url 'atlas:case_create' %}" title="Create a new atlas case">Create Case</a> /
+        <a href="{% url 'atlas:series_create' %}" title="Create a new image series">Create Series</a>
+    {% endif %}
+    {% comment %} </br>
 Questions by:
 <span id="authors-link"><a href="{% url 'atlas:author_list' %}">author</a></span> {% endcomment %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/atlas/templates/atlas/case_detail.html b/atlas/templates/atlas/case_detail.html
index 1e928f4c..1c170a17 100755
--- a/atlas/templates/atlas/case_detail.html
+++ b/atlas/templates/atlas/case_detail.html
@@ -4,21 +4,21 @@
 
 
 
-<div class="floating-header">
-    <a href="{% url 'atlas:case_update' pk=case.pk %}" title="Edit the Case">Edit</a>
-    <a href="{% url 'atlas:case_clone' pk=case.pk %}"
-        title="Clone the Case (duplicate everything but the images)">Clone</a>
-    <a href="{% url 'atlas:case_delete' pk=case.pk %}" title="Delete the Case">Delete</a>
-    <a href="#"
-        onclick="return window.create_popup_window('{% url 'feedback_create' question_type='atlas' pk=case.pk %}')"> Add
-        Note</a>
-    {% if request.user.is_superuser %}
-    <a href="{% url 'admin:atlas_case_change' case.id %}" title="Edit the Case using the admin interface">Admin Edit</a>
-    {% endif %}
-</div>
+    <div class="floating-header">
+        <a href="{% url 'atlas:case_update' pk=case.pk %}" title="Edit the Case">Edit</a>
+        <a href="{% url 'atlas:case_clone' pk=case.pk %}"
+            title="Clone the Case (duplicate everything but the images)">Clone</a>
+        <a href="{% url 'atlas:case_delete' pk=case.pk %}" title="Delete the Case">Delete</a>
+        <a href="#"
+            onclick="return window.create_popup_window('{% url 'feedback_create' question_type='atlas' pk=case.pk %}')"> Add
+            Note</a>
+        {% if request.user.is_superuser %}
+            <a href="{% url 'admin:atlas_case_change' case.id %}" title="Edit the Case using the admin interface">Admin Edit</a>
+        {% endif %}
+    </div>
     {% include 'atlas/case_display_block.html' %}
-    {% endblock %}
+{% endblock %}
 
-    {% block js %}
+{% block js %}
 
-    {% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/atlas/templates/atlas/case_display_block.html b/atlas/templates/atlas/case_display_block.html
index f7d12e7b..c09c2123 100755
--- a/atlas/templates/atlas/case_display_block.html
+++ b/atlas/templates/atlas/case_display_block.html
@@ -1,125 +1,125 @@
-<div class="atlas {% if case.scrapped %}atlas-scrapped{% endif %}">
-    <div class="date">
-        {{ case.created_date|date:"d/m/Y" }}
-    </div>
-    <div class="id">
-        ID: {{ case.id }}
-    </div>
-    <p class="pre-whitespace"><b>Title:</b> {{ case.title }}</p>
-
-    <p class="pre-whitespace"><b>Description:</b> {{ case.description }}</p>
-
-    <p>
-        <b>Presentation:</b>
-        <ul>
-            {% for presentation in case.presentation.all %}
-                <li>{{presentation.get_link}}</li>
-            {% endfor %}
-        </ul>
-    </p>
-
-    <p class="pre-whitespace"><b>History:</b> {{ case.history }}</p>
-
-    <p class="pre-whitespace"><b>Discussion:</b> {{ case.discussion }}</p>
-
-    <p class="pre-whitespace"><b>Report:</b> {{ case.report }}</p>
-
-    <div class="pre-whitespace multi-image-block"><b>Series:</b>
-        {% for series in case.series.all %}
-            <span class="series-block">
-                <span>
-                    Series {{ forloop.counter }}:
-                    <a href="{% url 'atlas:series_detail' pk=series.pk %}">
-                        {{series.get_block}}
-                    </a>
-
-                    <a href="#"
-                        onclick="return window.create_popup_window('/atlas/series/{{series.pk}}', 'Series')">Popup</a>
-                </span>
-            </span>
-        {% endfor %}
-        <a href="{% url 'atlas:series_id_create' pk=case.pk %}">Add new series</a><br />
-    </div>
-    {% comment %} <p><b>Scrapped:</b> {{ case.scrapped }} <a
-            href="{% url 'atlas:case_scrap' pk=case.pk %}">(toggle)</a> {% endcomment %}
-
-    <div class="atlas-answer">
-        <p class="pre-whitespace">
-            Condition:
-            <ul>
-                {% for con in case.condition.all %}
-                    <li>{{con.get_link}}</li>
-                {% endfor %}
-            </ul>
-            <details>
-                <summary><b>Findings</b></summary>
-                {% if case.series.all %}
-                    See individual series for more details.<br/>
-                    {% for series in case.series.all %}
-                        {% for finding in series.findings.all %}
-                            <div class="finding-box">
-                                <span>
-                                    <a href="{{series.get_absolute_url}}">Series {{series.pk}}</a>: {{series.get_examination_full}} |&nbsp;
-                                </span>
-                                {% if finding.findings.all %}
-                                    <span>
-                                        Findings: {% for f in finding.findings.all %}
-                                            {{f.get_link}},&nbsp;
-                                        {% endfor %}
-                                    </span>
-                                {% endif %}
-                                {% if finding.structures.all %}
-                                    <span>
-                                        Structure: {% for s in finding.structures.all %}
-                                            {{s.get_link}},&nbsp;
-                                        {% endfor %}
-                                    </span>
-                                {% endif %}
-                                {% if finding.description %}
-                                    <span>
-                                        Description: {{finding.description}}
-                                    </span>
-                                {% endif %}
-                            </div>
-
-                        {% endfor %}
-                    {% endfor %}
-                {% else %}
-                    No findings associated with case.
-                {% endif %}
-            </details>
-            <details open>
-                <summary><b>Differentials</b></summary>
-                <ul>
-                    {% for diff in case.differentialcase.all %}
-                        <li>{{diff.condition.get_link}} - {{diff.text}}</li>
-                    {% endfor %}
-                </ul>
-            </details>
-        </p>
-    </div>
-    Subspecialty:
-    <ul>
-        {% for sub in case.subspecialty.all %}
-            <li>{{sub.get_link}}</li>
-        {% endfor %}
-    </ul>
-    <b>Pathological Process:</b>
-    <ul>
-        {% for p in case.pathological_process.all %}
-            <li>{{p.get_link}}</li>
-        {% endfor %}
-    </ul>
-</p>
-    <p class="pre-whitespace"><b>Previous case:</b> {{ case.previous_case }}</p>
-    <p class="pre-whitespace"><b>Next case:</b> {{ case.next_case }}</p>
-<div>
-    {% include 'question_notes.html' %}
-
-</div>
-
-<p><b>Checked by:</b> {% for verified in case.verified.all %} <a
-    href="{% url 'atlas:verified_detail' pk=verified.pk %}">{{verified}}</a>, {% endfor %}</p>
-
-<p><b>Author(s):</b> {% for author in case.author.all %} <a
-    href="{% url 'atlas:author_detail' pk=author.pk %}">{{author}}</a>, {% endfor %}</p>
+<div class="atlas {% if case.scrapped %}atlas-scrapped{% endif %}">
+    <div class="date">
+        {{ case.created_date|date:"d/m/Y" }}
+    </div>
+    <div class="id">
+        ID: {{ case.id }}
+    </div>
+    <p class="pre-whitespace"><b>Title:</b> {{ case.title }}</p>
+
+    <p class="pre-whitespace"><b>Description:</b> {{ case.description }}</p>
+
+    <p>
+        <b>Presentation:</b>
+        <ul>
+            {% for presentation in case.presentation.all %}
+                <li>{{presentation.get_link}}</li>
+            {% endfor %}
+        </ul>
+    </p>
+
+    <p class="pre-whitespace"><b>History:</b> {{ case.history }}</p>
+
+    <p class="pre-whitespace"><b>Discussion:</b> {{ case.discussion }}</p>
+
+    <p class="pre-whitespace"><b>Report:</b> {{ case.report }}</p>
+
+    <div class="pre-whitespace multi-image-block"><b>Series:</b>
+        {% for series in case.series.all %}
+            <span class="series-block">
+                <span>
+                    Series {{ forloop.counter }}:
+                    <a href="{% url 'atlas:series_detail' pk=series.pk %}">
+                        {{series.get_block}}
+                    </a>
+
+                    <a href="#"
+                        onclick="return window.create_popup_window('/atlas/series/{{series.pk}}', 'Series')">Popup</a>
+                </span>
+            </span>
+        {% endfor %}
+        <a href="{% url 'atlas:series_id_create' pk=case.pk %}">Add new series</a><br />
+    </div>
+    {% comment %} <p><b>Scrapped:</b> {{ case.scrapped }} <a
+            href="{% url 'atlas:case_scrap' pk=case.pk %}">(toggle)</a> {% endcomment %}
+
+    <div class="atlas-answer">
+        <p class="pre-whitespace">
+            Condition:
+            <ul>
+                {% for con in case.condition.all %}
+                    <li>{{con.get_link}}</li>
+                {% endfor %}
+            </ul>
+            <details>
+                <summary><b>Findings</b></summary>
+                {% if case.series.all %}
+                    See individual series for more details.<br/>
+                    {% for series in case.series.all %}
+                        {% for finding in series.findings.all %}
+                            <div class="finding-box">
+                                <span>
+                                    <a href="{{series.get_absolute_url}}">Series {{series.pk}}</a>: {{series.get_examination_full}} |&nbsp;
+                                </span>
+                                {% if finding.findings.all %}
+                                    <span>
+                                        Findings: {% for f in finding.findings.all %}
+                                            {{f.get_link}},&nbsp;
+                                        {% endfor %}
+                                    </span>
+                                {% endif %}
+                                {% if finding.structures.all %}
+                                    <span>
+                                        Structure: {% for s in finding.structures.all %}
+                                            {{s.get_link}},&nbsp;
+                                        {% endfor %}
+                                    </span>
+                                {% endif %}
+                                {% if finding.description %}
+                                    <span>
+                                        Description: {{finding.description}}
+                                    </span>
+                                {% endif %}
+                            </div>
+
+                        {% endfor %}
+                    {% endfor %}
+                {% else %}
+                    No findings associated with case.
+                {% endif %}
+            </details>
+            <details open>
+                <summary><b>Differentials</b></summary>
+                <ul>
+                    {% for diff in case.differentialcase.all %}
+                        <li>{{diff.condition.get_link}} - {{diff.text}}</li>
+                    {% endfor %}
+                </ul>
+            </details>
+        </p>
+    </div>
+    Subspecialty:
+    <ul>
+        {% for sub in case.subspecialty.all %}
+            <li>{{sub.get_link}}</li>
+        {% endfor %}
+    </ul>
+    <b>Pathological Process:</b>
+    <ul>
+        {% for p in case.pathological_process.all %}
+            <li>{{p.get_link}}</li>
+        {% endfor %}
+    </ul>
+</p>
+<p class="pre-whitespace"><b>Previous case:</b> {{ case.previous_case }}</p>
+<p class="pre-whitespace"><b>Next case:</b> {{ case.next_case }}</p>
+<div>
+    {% include 'question_notes.html' %}
+
+</div>
+
+<p><b>Checked by:</b> {% for verified in case.verified.all %} <a
+    href="{% url 'atlas:verified_detail' pk=verified.pk %}">{{verified}}</a>, {% endfor %}</p>
+
+<p><b>Author(s):</b> {% for author in case.author.all %} <a
+    href="{% url 'atlas:author_detail' pk=author.pk %}">{{author}}</a>, {% endfor %}</p>
diff --git a/atlas/templates/atlas/case_form.html b/atlas/templates/atlas/case_form.html
index bf5febcd..74032194 100755
--- a/atlas/templates/atlas/case_form.html
+++ b/atlas/templates/atlas/case_form.html
@@ -4,95 +4,95 @@
 {% block css %}
 {% endblock %}
 {% block js %}
-<!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
-{{form.media}}
+    <!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
+    {{form.media}}
 
-<script type="text/javascript">
-    function showEditPopup(url) {
-        var win = window.open(url, "Edit",
-            'height=500,width=800,resizable=yes,scrollbars=yes');
-        return false;
-    }
-    function showAddPopup(triggeringLink) {
-        var name = triggeringLink.id.replace(/^add_/, '');
-        href = triggeringLink.href;
-        var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes');
-        win.focus();
-        return false;
-    }
-    function closePopup(win, newID, newRepr, id) {
-        console.log(id)
-        $(id + "_to").append('<option value=' + newID + ' title=' + newRepr + ' >' + newRepr + '</option>')
-        win.close();
-    }
+    <script type="text/javascript">
+        function showEditPopup(url) {
+            var win = window.open(url, "Edit",
+                'height=500,width=800,resizable=yes,scrollbars=yes');
+            return false;
+        }
+        function showAddPopup(triggeringLink) {
+            var name = triggeringLink.id.replace(/^add_/, '');
+            href = triggeringLink.href;
+            var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes');
+            win.focus();
+            return false;
+        }
+        function closePopup(win, newID, newRepr, id) {
+            console.log(id)
+            $(id + "_to").append('<option value=' + newID + ' title=' + newRepr + ' >' + newRepr + '</option>')
+            win.close();
+        }
 
 
-    function add_series_input_form() {
-        var form_idx = $('#id_Case_series-TOTAL_FORMS').val();
-        $('#series_formset').append($('#empty_series_form').html().replace(/__prefix__/g, form_idx));
-        $('#id_Case_series-TOTAL_FORMS').val(parseInt(form_idx) + 1);
-    }
+        function add_series_input_form() {
+            var form_idx = $('#id_Case_series-TOTAL_FORMS').val();
+            $('#series_formset').append($('#empty_series_form').html().replace(/__prefix__/g, form_idx));
+            $('#id_Case_series-TOTAL_FORMS').val(parseInt(form_idx) + 1);
+        }
 
-    function add_differential_input_form() {
-        var form_idx = $('#id_differentialcase-TOTAL_FORMS').val();
-        $('#casedifferential_formset').append($('#empty_casedifferential_form').html().replace(/__prefix__/g, form_idx));
-        $('#id_differentialcase-TOTAL_FORMS').val(parseInt(form_idx) + 1);
-    }
+        function add_differential_input_form() {
+            var form_idx = $('#id_differentialcase-TOTAL_FORMS').val();
+            $('#casedifferential_formset').append($('#empty_casedifferential_form').html().replace(/__prefix__/g, form_idx));
+            $('#id_differentialcase-TOTAL_FORMS').val(parseInt(form_idx) + 1);
+        }
 
-    $(document).ready(function () {
-        $('#add_more_series').click(() => { add_series_input_form() });
-        $('#add_more_differential').click(() => { add_differential_input_form() });
-    })
+        $(document).ready(function () {
+            $('#add_more_series').click(() => { add_series_input_form() });
+            $('#add_more_differential').click(() => { add_differential_input_form() });
+        })
 
-</script>
+    </script>
 
-<!-- {{ form.media }} -->
+    <!-- {{ form.media }} -->
 {% endblock %}
 {% block content %}
-<h2>Submit Case</h2>
-Use this form to create a atlas case. Existing associated image sets can be added using this form.
-<form action="" method="post" enctype="multipart/form-data" id="atlas-form">
-    {% csrf_token %}
+    <h2>Submit Case</h2>
+    Use this form to create a atlas case. Existing associated image sets can be added using this form.
+    <form action="" method="post" enctype="multipart/form-data" id="atlas-form">
+        {% csrf_token %}
 
-    <table>
-        {{ form.as_table }}
-    </table>
-    <h3>Series:</h3>
-    Add image sets here. These can only be added once created (they can also be added to cases on creation).
-    <input type="button" value="Add More Series" id="add_more_series">
-    <div id="series_formset">
-        {% for form in series_formset %}
-        <ul class="no-error series-formset">
-            {{form.non_field_errors}}
-            {{form.errors}}
-            {{ form.as_ul }}
+        <table>
+            {{ form.as_table }}
+        </table>
+        <h3>Series:</h3>
+        Add image sets here. These can only be added once created (they can also be added to cases on creation).
+        <input type="button" value="Add More Series" id="add_more_series">
+        <div id="series_formset">
+            {% for form in series_formset %}
+                <ul class="no-error series-formset">
+                    {{form.non_field_errors}}
+                    {{form.errors}}
+                    {{ form.as_ul }}
+                </ul>
+            {% endfor %}
+        </div>
+        {{ series_formset.management_form }}
+        <h3>Differential:</h3>
+        Add differential here.
+        <input type="button" value="Add Another Differential" id="add_more_differential">
+        <div id="casedifferential_formset">
+            {% for form in casedifferential_formset %}
+                <ul class="no-error casedifferential_formset">
+                    {{form.non_field_errors}}
+                    {{form.errors}}
+                    {{ form.as_ul }}
+                </ul>
+            {% endfor %}
+        </div>
+        {{ casedifferential_formset.management_form }}
+        <input type="submit" class="submit-button" value="Submit" name="submit">
+    </form>
+    <div id="empty_series_form" style="display:none">
+        <ul class='no_error series-formset'>
+            {{ series_formset.empty_form.as_ul }}
         </ul>
-        {% endfor %}
     </div>
-    {{ series_formset.management_form }}
-    <h3>Differential:</h3>
-    Add differential here.
-    <input type="button" value="Add Another Differential" id="add_more_differential">
-    <div id="casedifferential_formset">
-        {% for form in casedifferential_formset %}
-        <ul class="no-error casedifferential_formset">
-            {{form.non_field_errors}}
-            {{form.errors}}
-            {{ form.as_ul }}
+    <div id="empty_casedifferential_form" style="display:none">
+        <ul class='no_error casedifferential_formset'>
+            {{ casedifferential_formset.empty_form.as_ul }}
         </ul>
-        {% endfor %}
     </div>
-    {{ casedifferential_formset.management_form }}
-    <input type="submit" class="submit-button" value="Submit" name="submit">
-</form>
-<div id="empty_series_form" style="display:none">
-    <ul class='no_error series-formset'>
-        {{ series_formset.empty_form.as_ul }}
-    </ul>
-</div>
-<div id="empty_casedifferential_form" style="display:none">
-    <ul class='no_error casedifferential_formset'>
-        {{ casedifferential_formset.empty_form.as_ul }}
-    </ul>
-</div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/atlas/templates/atlas/case_view.html b/atlas/templates/atlas/case_view.html
index 802f4b9d..eca27813 100644
--- a/atlas/templates/atlas/case_view.html
+++ b/atlas/templates/atlas/case_view.html
@@ -6,16 +6,16 @@
 
 {% block content %}
 
-<div id="view-filter-options">
-    <h3>Filter Long </h3>
-<form action="" method="get">
-    {{ filter.form }}
-    <input class="btn btn-primary btn-sm mt-1 mb-1" type="submit" />
-</form>
-</div>
-{% render_table table %}
+    <div id="view-filter-options">
+        <h3>Filter Long </h3>
+        <form action="" method="get">
+            {{ filter.form }}
+            <input class="btn btn-primary btn-sm mt-1 mb-1" type="submit" />
+        </form>
+    </div>
+    {% render_table table %}
 
 {% endblock %}
 
 {% block js %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/atlas/templates/atlas/casecollection_form.html b/atlas/templates/atlas/casecollection_form.html
index 08432abd..9105d7b2 100755
--- a/atlas/templates/atlas/casecollection_form.html
+++ b/atlas/templates/atlas/casecollection_form.html
@@ -4,51 +4,51 @@
 {% block css %}
 {% endblock %}
 {% block js %}
-<!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
-{{form.media}}
+    <!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
+    {{form.media}}
 
-<script type="text/javascript">
-    function add_case_input_form() {
-        var form_idx = $('#id_casedetail_set-TOTAL_FORMS').val();
-        $('#case_formset').append($('#empty_case_form').html().replace(/__prefix__/g, form_idx));
-        $('#id_casedetail_set-TOTAL_FORMS').val(parseInt(form_idx) + 1);
-    }
+    <script type="text/javascript">
+        function add_case_input_form() {
+            var form_idx = $('#id_casedetail_set-TOTAL_FORMS').val();
+            $('#case_formset').append($('#empty_case_form').html().replace(/__prefix__/g, form_idx));
+            $('#id_casedetail_set-TOTAL_FORMS').val(parseInt(form_idx) + 1);
+        }
 
 
-    $(document).ready(function () {
-        $('#add_more_case').click(() => { add_case_input_form() });
-    })
+        $(document).ready(function () {
+            $('#add_more_case').click(() => { add_case_input_form() });
+        })
 
-</script>
-<!-- {{ form.media }} -->
+    </script>
+    <!-- {{ form.media }} -->
 {% endblock %}
 {% block content %}
-<h2>Create Collection</h2>
-Use this form to create a collection of cases
-<form action="" method="post" enctype="multipart/form-data" id="atlas-form">
-    {% csrf_token %}
+    <h2>Create Collection</h2>
+    Use this form to create a collection of cases
+    <form action="" method="post" enctype="multipart/form-data" id="atlas-form">
+        {% csrf_token %}
 
-    <table>
-        {{ form.as_table }}
-    </table>
-    <h3>Cases:</h3>
-    Add cases here. These can only be added once created (they can also be added to cases on creation).
-    <input type="button" value="Add More Cases" id="add_more_case">
-    <div id="case_formset">
-        {% for form in case_formset %}
-        <ul class="no-error case-formset">
-            {{form.non_field_errors}}
-            {{form.errors}}
-            {{ form.as_ul }}
+        <table>
+            {{ form.as_table }}
+        </table>
+        <h3>Cases:</h3>
+        Add cases here. These can only be added once created (they can also be added to cases on creation).
+        <input type="button" value="Add More Cases" id="add_more_case">
+        <div id="case_formset">
+            {% for form in case_formset %}
+                <ul class="no-error case-formset">
+                    {{form.non_field_errors}}
+                    {{form.errors}}
+                    {{ form.as_ul }}
+                </ul>
+            {% endfor %}
+        </div>
+        {{ case_formset.management_form }}
+        <input type="submit" class="submit-button" value="Submit" name="submit">
+    </form>
+    <div id="empty_case_form" style="display:none">
+        <ul class='no_error case-formset'>
+            {{ case_formset.empty_form.as_ul }}
         </ul>
-        {% endfor %}
     </div>
-    {{ case_formset.management_form }}
-    <input type="submit" class="submit-button" value="Submit" name="submit">
-</form>
-<div id="empty_case_form" style="display:none">
-    <ul class='no_error case-formset'>
-        {{ case_formset.empty_form.as_ul }}
-    </ul>
-</div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/atlas/templates/atlas/categories_list.html b/atlas/templates/atlas/categories_list.html
index bbf4c385..5fb91059 100644
--- a/atlas/templates/atlas/categories_list.html
+++ b/atlas/templates/atlas/categories_list.html
@@ -1,12 +1,12 @@
 {% extends 'atlas/base.html' %}
 
 {% block content %}
-<ul>
-    <li><a href="{% url 'atlas:condition_view' %}">Conditions</a></li>
-    <li><a href="{% url 'atlas:finding_view' %}">Findings</a></li>
-    <li><a href="{% url 'atlas:structure_view' %}">Structures</li></a>
-    <li><a href="{% url 'atlas:subspecialty_view' %}">Subspecialties</li></a>
-    <li><a href="{% url 'atlas:presentation_view' %}">Presentations</li></a>
-    <li><a href="{% url 'atlas:pathological_process_view' %}">Pathological Process</li></a>
-</ul>
-{% endblock %}
\ No newline at end of file
+    <ul>
+        <li><a href="{% url 'atlas:condition_view' %}">Conditions</a></li>
+        <li><a href="{% url 'atlas:finding_view' %}">Findings</a></li>
+        <li><a href="{% url 'atlas:structure_view' %}">Structures</li></a>
+        <li><a href="{% url 'atlas:subspecialty_view' %}">Subspecialties</li></a>
+        <li><a href="{% url 'atlas:presentation_view' %}">Presentations</li></a>
+        <li><a href="{% url 'atlas:pathological_process_view' %}">Pathological Process</li></a>
+    </ul>
+{% endblock %}
diff --git a/atlas/templates/atlas/category_detail.html b/atlas/templates/atlas/category_detail.html
index 759b55d0..a6a614ae 100755
--- a/atlas/templates/atlas/category_detail.html
+++ b/atlas/templates/atlas/category_detail.html
@@ -1,13 +1,13 @@
 {% extends 'atlas/base.html' %}
 
 {% block content %}
-{{category}}:
-<ul>
-    {% for atlas in atlas %}
-    <li><a href="{% url 'atlas:case_detail' pk=atlas.pk %}">{{atlas}}
-            [{{atlas.get_authors}}]</a></li>
+    {{category}}:
+    <ul>
+        {% for atlas in atlas %}
+            <li><a href="{% url 'atlas:case_detail' pk=atlas.pk %}">{{atlas}}
+                [{{atlas.get_authors}}]</a></li>
 
-    {% endfor %}
-</ul>
+        {% endfor %}
+    </ul>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/atlas/templates/atlas/collection_candidates.html b/atlas/templates/atlas/collection_candidates.html
index 9b00fbdf..02e2407d 100644
--- a/atlas/templates/atlas/collection_candidates.html
+++ b/atlas/templates/atlas/collection_candidates.html
@@ -1,8 +1,8 @@
 {% extends 'atlas/base.html' %}
 
 {% block content %}
-{% include 'atlas/collection_headers.html' %}
+    {% include 'atlas/collection_headers.html' %}
 
-{% include "generic/exam_cids.html" %}
+    {% include "generic/exam_cids.html" %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/atlas/templates/atlas/collection_case_view.html b/atlas/templates/atlas/collection_case_view.html
index 3b4df174..f69c318a 100644
--- a/atlas/templates/atlas/collection_case_view.html
+++ b/atlas/templates/atlas/collection_case_view.html
@@ -1,118 +1,118 @@
-{% extends 'atlas/base.html' %}
-
-{% block content %}
-<h2>Case {{case_number|add:1}}
-
-    {% if collection.show_title %}
-    : {{case.title}}
-    {% endif %}
-
-</h2>
-
-{% if collection.show_description and case.description%}
-<div>
-    Description: {{case.description}}
-</div>
-{% endif %}
-{% if collection.show_history and case.history%}
-<div>
-    Description: {{case.history}}
-</div>
-{% endif %}
-
-<div class="pre-whitespace multi-image-block">
-    {% for series in series_list %}
-    <span class="series-block">
-        <span>
-            Series {{ forloop.counter }}:
-            <a href="#" onclick='window.loadDicomViewer(window.images[{{forloop.counter0}}])'>
-                {{series.get_block}}
-            </a>
-        </span>
-    </span>
-    {% endfor %}
-</div>
-
-<div>
-    <div id="single-dicom-viewer" class="dicom-viewer" data-images="" data-annotations=''>
-    </div>
-
-</div>
-{% if collection.show_discussion and case.discussion%}
-<details>
-    <summary>
-        Discussion:
-    </summary>
-    <div>
-        {{case.discussion}}
-    </div>
-</details>
-{% endif %}
-{% if collection.show_report and case.report%}
-<details>
-    <summary>
-        Report:
-    </summary>
-    <div>
-        {{case.report}}
-    </div>
-</details>
-{% endif %}
-
-{% if take %}
-        <form method="POST" class="post-form">{% csrf_token %}
-            <div class="form-contents">
-                {% if collection.publish_results %}<fieldset disabled="disabled">{% endif %}
-                {{form}}
-                {% if collection.publish_results %}</fieldset>{% endif %}
-            </div>
-            {% if previous > -1 %}
-            <button type="submit" name="previous" class="save btn btn-default">Previous</button>
-            {% endif %}
-            {% if next %}
-            <button type="submit" name="next" class="save btn btn-default">Next</button>
-            {% else %}
-            {% if not exam.publish_results %}
-            <button type="submit" name="save" class="save btn btn-default">Save</button>
-            {% endif %}
-            {% endif %}
-
-            {% if collection.publish_results %}
-            Answer score: {{answer.score}}<br />
-            Answer feedback: {{answer.feedback|safe}}
-            {% endif %}
-            <br />
-            <button type="submit" name="finish" class="save btn btn-default">Overview</button>
-            <button type="submit" id="goto-button" value="test" name="goto" class="hide">goto</button>
-        </form>
-{% else %}
-<div>
-    {% if previous %}
-    <a href="{% url 'atlas:collection_case_view' pk=collection.pk case_number=case_number|add:-1 %}">Previous</a>
-    {% endif %}
-    {% if next %}
-    <a href="{% url 'atlas:collection_case_view' pk=collection.pk case_number=case_number|add:1 %}">Next</a>
-    {% endif %}
-</div>
-<br />
-Return to <a href='{{collection.get_absolute_url}}'>collection</a>
-
-{% endif %}
-
-{% endblock %}
-{% block js %}
-<script type="text/javascript">
-    window.images = {
-        {% for series in series_list %} 
-        {{ forloop.counter0 }}: ["{{ series.get_image_url_array_not_json }}"],
-        {% endfor %}
-    }
-
-    $(document).ready(function () {
-        setTimeout(() => {
-            window.loadDicomViewer(window.images[0])
-        }, 500);
-    })
-</script>
-
-{% endblock js %}
\ No newline at end of file
+{% extends 'atlas/base.html' %}
+
+{% block content %}
+    <h2>Case {{case_number|add:1}}
+
+        {% if collection.show_title %}
+            : {{case.title}}
+        {% endif %}
+
+    </h2>
+
+    {% if collection.show_description and case.description%}
+        <div>
+            Description: {{case.description}}
+        </div>
+    {% endif %}
+    {% if collection.show_history and case.history%}
+        <div>
+            Description: {{case.history}}
+        </div>
+    {% endif %}
+
+    <div class="pre-whitespace multi-image-block">
+        {% for series in series_list %}
+            <span class="series-block">
+                <span>
+                    Series {{ forloop.counter }}:
+                    <a href="#" onclick='window.loadDicomViewer(window.images[{{forloop.counter0}}])'>
+                        {{series.get_block}}
+                    </a>
+                </span>
+            </span>
+        {% endfor %}
+    </div>
+
+    <div>
+        <div id="single-dicom-viewer" class="dicom-viewer" data-images="" data-annotations=''>
+        </div>
+
+    </div>
+    {% if collection.show_discussion and case.discussion%}
+        <details>
+            <summary>
+                Discussion:
+            </summary>
+            <div>
+                {{case.discussion}}
+            </div>
+        </details>
+    {% endif %}
+    {% if collection.show_report and case.report%}
+        <details>
+            <summary>
+                Report:
+            </summary>
+            <div>
+                {{case.report}}
+            </div>
+        </details>
+    {% endif %}
+
+    {% if take %}
+        <form method="POST" class="post-form">{% csrf_token %}
+            <div class="form-contents">
+                {% if collection.publish_results %}<fieldset disabled="disabled">{% endif %}
+                {{form}}
+                {% if collection.publish_results %}</fieldset>{% endif %}
+            </div>
+            {% if previous > -1 %}
+                <button type="submit" name="previous" class="save btn btn-default">Previous</button>
+            {% endif %}
+            {% if next %}
+                <button type="submit" name="next" class="save btn btn-default">Next</button>
+            {% else %}
+                {% if not exam.publish_results %}
+                    <button type="submit" name="save" class="save btn btn-default">Save</button>
+                {% endif %}
+            {% endif %}
+
+            {% if collection.publish_results %}
+                Answer score: {{answer.score}}<br />
+                Answer feedback: {{answer.feedback|safe}}
+            {% endif %}
+            <br />
+            <button type="submit" name="finish" class="save btn btn-default">Overview</button>
+            <button type="submit" id="goto-button" value="test" name="goto" class="hide">goto</button>
+        </form>
+    {% else %}
+        <div>
+            {% if previous %}
+                <a href="{% url 'atlas:collection_case_view' pk=collection.pk case_number=case_number|add:-1 %}">Previous</a>
+            {% endif %}
+            {% if next %}
+                <a href="{% url 'atlas:collection_case_view' pk=collection.pk case_number=case_number|add:1 %}">Next</a>
+            {% endif %}
+        </div>
+        <br />
+        Return to <a href='{{collection.get_absolute_url}}'>collection</a>
+
+    {% endif %}
+
+{% endblock %}
+{% block js %}
+    <script type="text/javascript">
+        window.images = {
+            {% for series in series_list %}
+                {{ forloop.counter0 }}: ["{{ series.get_image_url_array_not_json }}"],
+            {% endfor %}
+        }
+
+        $(document).ready(function () {
+            setTimeout(() => {
+                window.loadDicomViewer(window.images[0])
+            }, 500);
+        })
+    </script>
+
+{% endblock js %}
diff --git a/atlas/templates/atlas/collection_detail.html b/atlas/templates/atlas/collection_detail.html
index e8c1c83b..5fe25d02 100644
--- a/atlas/templates/atlas/collection_detail.html
+++ b/atlas/templates/atlas/collection_detail.html
@@ -1,14 +1,14 @@
 {% extends 'atlas/base.html' %}
 
 {% block content %}
-{% include 'atlas/collection_headers.html' %}
-<ul>
-{% for case in collection.cases.all %}
-<li><a href="{% url 'atlas:collection_case_view' pk=collection.pk case_number=forloop.counter0 %}">Case {{forloop.counter}}</a>
-    : {{case.title}}
-</li>
-    
-{% endfor %}
-</ul>
+    {% include 'atlas/collection_headers.html' %}
+    <ul>
+        {% for case in collection.cases.all %}
+            <li><a href="{% url 'atlas:collection_case_view' pk=collection.pk case_number=forloop.counter0 %}">Case {{forloop.counter}}</a>
+                : {{case.title}}
+            </li>
 
-{% endblock %}
\ No newline at end of file
+        {% endfor %}
+    </ul>
+
+{% endblock %}
diff --git a/atlas/templates/atlas/collection_headers.html b/atlas/templates/atlas/collection_headers.html
index b962b52b..b903314e 100644
--- a/atlas/templates/atlas/collection_headers.html
+++ b/atlas/templates/atlas/collection_headers.html
@@ -1,20 +1,20 @@
 
 {% if request.user.is_authenticated %}
-Collection: {{collection.name}}-> <a href="{% url 'atlas:collection_detail' pk=collection.pk %}">Overview</a> / 
-<a href="{% url 'atlas:collection_mark_overview' collection.pk %}">Mark</a> /
-<a href="{% url 'atlas:collection_scores_cid' collection.pk %}">Scores</a> /
-<a href="{% url 'atlas:collection_candidates' collection.pk %}">Candidates</a>
-<div class="floating-header">
-    <a href="{% url 'atlas:collection_update' collection.id %}" title="Edit the Collection">Edit</a>
-    \ <a href="{% url 'atlas:collection_delete' collection.id %}" title="Delete the Collection">Delete</a>
-    {% comment %} \ <a href="{% url 'atlas:collection_clone' collection.id %}" title="Clone the Collection">Clone</a> {% endcomment %}
-{% if request.user.is_superuser %}
-    \ <a href="{% url 'admin:atlas_casecollection_change' collection.id %}" title="Edit the Collection using the admin interface">Admin Edit</a>
-{% endif %}
-</div>
+    Collection: {{collection.name}}-> <a href="{% url 'atlas:collection_detail' pk=collection.pk %}">Overview</a> /
+    <a href="{% url 'atlas:collection_mark_overview' collection.pk %}">Mark</a> /
+    <a href="{% url 'atlas:collection_scores_cid' collection.pk %}">Scores</a> /
+    <a href="{% url 'atlas:collection_candidates' collection.pk %}">Candidates</a>
+    <div class="floating-header">
+        <a href="{% url 'atlas:collection_update' collection.id %}" title="Edit the Collection">Edit</a>
+        \ <a href="{% url 'atlas:collection_delete' collection.id %}" title="Delete the Collection">Delete</a>
+        {% comment %} \ <a href="{% url 'atlas:collection_clone' collection.id %}" title="Clone the Collection">Clone</a> {% endcomment %}
+        {% if request.user.is_superuser %}
+            \ <a href="{% url 'admin:atlas_casecollection_change' collection.id %}" title="Edit the Collection using the admin interface">Admin Edit</a>
+        {% endif %}
+    </div>
 {% endif %}
 
 
 <h2>{{collection.name}}</h2>
 
-{% include 'exam_notes.html' %}
\ No newline at end of file
+{% include 'exam_notes.html' %}
diff --git a/atlas/templates/atlas/collection_index_view.html b/atlas/templates/atlas/collection_index_view.html
index 50685b32..da35ea7f 100644
--- a/atlas/templates/atlas/collection_index_view.html
+++ b/atlas/templates/atlas/collection_index_view.html
@@ -1,10 +1,10 @@
-{% extends 'atlas/base.html' %}
-
-{% block content %}
-<a href="{% url 'atlas:collection_create' %}">Create collection</a>
-<ul>
-{% for collection in collections %}
-<li><a href='{{collection.get_absolute_url}}'>{{collection.name}}</a></li>
-{% endfor %}
-</ul>
-{% endblock %}
\ No newline at end of file
+{% extends 'atlas/base.html' %}
+
+{% block content %}
+    <a href="{% url 'atlas:collection_create' %}">Create collection</a>
+    <ul>
+        {% for collection in collections %}
+            <li><a href='{{collection.get_absolute_url}}'>{{collection.name}}</a></li>
+        {% endfor %}
+    </ul>
+{% endblock %}
diff --git a/atlas/templates/atlas/collection_mark_overview.html b/atlas/templates/atlas/collection_mark_overview.html
index 589cc10e..fcea1c32 100644
--- a/atlas/templates/atlas/collection_mark_overview.html
+++ b/atlas/templates/atlas/collection_mark_overview.html
@@ -1,30 +1,30 @@
 {% extends 'atlas/base.html' %}
 
 {% block content %}
-{% include 'atlas/collection_headers.html' %}
+    {% include 'atlas/collection_headers.html' %}
 
-<div class="vstack gap-3">
-{% for case_detail, answers in case_map.items %}
-    <div class="border border-dark">
-    <h4>Case: {{case_detail.case.title}}</h4>
-    Answers 
-    <ul>
-    {% for answer in answers %}
-    <li {% if not answer.score %}class="flagged"{% endif %}>{{answer.answer}} 
-        {% if not answer.score %}
-<span class="badge rounded-pill bg-danger">Unmarked</span>
+    <div class="vstack gap-3">
+        {% for case_detail, answers in case_map.items %}
+            <div class="border border-dark">
+                <h4>Case: {{case_detail.case.title}}</h4>
+                Answers
+                <ul>
+                    {% for answer in answers %}
+                        <li {% if not answer.score %}class="flagged"{% endif %}>{{answer.answer}}
+                            {% if not answer.score %}
+                                <span class="badge rounded-pill bg-danger">Unmarked</span>
 
-    
-        {% else %}
-<span class="badge rounded-pill bg-info">Score: {{answer.score}}</span>
-        {% endif %}
-        </li>
-    {% endfor %}
-    </ul>
-<a href="{% url 'atlas:collection_mark_question' collection.pk forloop.counter0 %}">Mark</a>
-</div>
-    
-{% endfor %}
-</div>
 
-{% endblock %}
\ No newline at end of file
+                            {% else %}
+                                <span class="badge rounded-pill bg-info">Score: {{answer.score}}</span>
+                            {% endif %}
+                        </li>
+                    {% endfor %}
+                </ul>
+                <a href="{% url 'atlas:collection_mark_question' collection.pk forloop.counter0 %}">Mark</a>
+            </div>
+
+        {% endfor %}
+    </div>
+
+{% endblock %}
diff --git a/atlas/templates/atlas/collection_mark_question.html b/atlas/templates/atlas/collection_mark_question.html
index 0b49cda2..7177c500 100644
--- a/atlas/templates/atlas/collection_mark_question.html
+++ b/atlas/templates/atlas/collection_mark_question.html
@@ -3,11 +3,12 @@
 {% block content %}
     {% include 'atlas/collection_headers.html' %}
     <h3>Marking case: {{case.title}}</h3>
+    <button class="btn btn-primary" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasTop" aria-controls="offcanvasTop">View Case</button>
 
     <form method="POST" class="post-form">{% csrf_token %}
-<div class="vstack gap-3">
+        <div class="vstack gap-3">
             {% for answer, form in answer_forms %}
-    <div class="border border-dark">
+                <div class="border border-dark">
                     CID: {{answer.cid}}<br />
                     Answer: {{answer.answer}} <br />
                     Score: {{answer.score}}<br />
@@ -31,4 +32,24 @@
 
     </form>
 
+
+    <div class="offcanvas offcanvas-top" tabindex="-1" id="offcanvasTop" aria-labelledby="offcanvasTopLabel">
+        <div class="offcanvas-header">
+            <h5 id="offcanvasTopLabel">Offcanvas top</h5>
+            <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+        </div>
+        <div class="offcanvas-body">
+        {% for series in series_list %}
+            <span class="series-block">
+                <span>
+                    Series {{ forloop.counter }}:
+                    <a href="#" onclick='window.loadDicomViewer(window.images[{{forloop.counter0}}])'>
+                        {{series.get_block}}
+                    </a>
+                </span>
+            </span>
+        {% endfor %}
+        </div>
+    </div>
+
 {% endblock %}
diff --git a/atlas/templates/atlas/collection_series_viewer.html b/atlas/templates/atlas/collection_series_viewer.html
index abe05350..905c0f45 100755
--- a/atlas/templates/atlas/collection_series_viewer.html
+++ b/atlas/templates/atlas/collection_series_viewer.html
@@ -1,172 +1,172 @@
-<div>{{ series.modality}}, {{ series.examination }}, {{ series.plane }}, {{ series.contrast }}</div>
-
-
-<div id="single-dicom-viewer" class="dicom-viewer" data-images="{{ series.get_image_url_array }}" data-annotations=''>
-</div>
-
-{% if editing_finding < 1 %}
-<button id="add-finding-button">Add finding</button>
-{% endif %}
-<button id="reset-viewport-button">Reset viewport</button>
-<div id="finding-form">
-    <div class="hide" id="hidden-form">
-        <form method="post" id="series_finding_form">
-            {% csrf_token %}
-            {{series_finding_form.management_form}}
-            <div>
-                <div>Description: {{ series_finding_form.description }}</div>
-                <div>Findings: {{ series_finding_form.findings }}</div>
-                <div>Structures: {{ series_finding_form.structures }}</div>
-            </div>
-            <input type="submit" value="Submit">
-            <button id="cancel-add-finding-button">Cancel</button>
-        </form>
-    </div>
-</div>
-
-<details open>
-    <summary>Findings</summary>
-
-    {% for finding in series.findings.all %}
-    <div class="finding-box">
-        <button class="view-finding-button" data-annotationjson={{finding.annotation_json}}
-            data-viewportjson={{finding.viewport_json}} data-findingid={{finding.id}}>Click to view</button>
-        <span class="view-finding-details">
-            Finding(s): {% for f in finding.findings.all %}{{f.get_link}}{% endfor %}<br />
-            Structure(s): {% for s in finding.structures.all %}{{s.get_link}}{% endfor %}<br />
-            Description: {{finding.description}}<br />
-        </span>
-        <a href="{% url 'atlas:series_edit_finding' pk=series.pk finding_pk=finding.pk %}" class="edit-finding-link">Edit</a>
-        <a href="{% url 'atlas:delete_finding' pk=finding.pk %}" class="delete-finding-link">Delete</a>
-    </div>
-
-    {% endfor %}
-</details>
-
-
-<div>Author: {{ series.get_author_display }}</div>
-<details>
-    <summary>Image info</summary>
-    <div>
-        <a href="{% url 'atlas:series_order_dicom' pk=series.pk %}" title="orders dicom by slice location">Order dicoms
-            by slice location</a>
-        <a href="{% url 'atlas:series_order_dicom_instance' pk=series.pk %}"
-            title="orders dicom by instance number">Order dicoms by instance number</a>
-        <a href="{% url 'atlas:series_order_dicom_SeriesInstanceUID' pk=series.pk %}"
-            title="orders dicom by instance number">Order dicoms by SeriesInstanceUID</a>
-        <a href="{% url 'atlas:series_order_upload_filename' pk=series.pk %}"
-            title="orders dicom by uploaded filename">Order by uploaded filename</a>
-    </div>
-    {% for image in series.images.all %}
-    {{image.image.url}}, pos: {{image.position}}, {{image.upload_filename}} [{{image.image.size|filesizeformat}}]<br />
-    {% comment %} {{image.get_dicom_info|safe}}<br /> {% endcomment %}
-
-    {% endfor %}
-
-    <p>Total image size: {{series.get_total_image_size|filesizeformat}}</p>
-    <p><a href="{% url 'atlas:series_download' pk=series.pk %}">Download images</a></p>
-</details>
-
-
-<script>
-    $(document).ready(function () {
-        $("#add-finding-button").click(() => {
-            dicom_element = $(".cornerstone-element").get(0);
-            cornerstoneTools.globalImageIdSpecificToolStateManager.clear(dicom_element);
-            cornerstone.reset(dicom_element);
-            cornerstone.resize(dicom_element, true);
-            //$("#finding-form").empty().append(
-            //    $("#hidden-form form").clone()
-            //);
-            $("#hidden-form").show()
-
-        });
-        $("#cancel-add-finding-button").click((e) => {
-            $("#hidden-form").hide()
-            e.preventDefault();
-        });
-
-
-        $("#reset-viewport-button").click(() => {
-            dicom_element = $(".cornerstone-element").get(0);
-            //annotationjson = JSON.parse(e.currentTarget.dataset.annotationjson);
-            cornerstoneTools.globalImageIdSpecificToolStateManager.clear(dicom_element);
-            cornerstone.reset(dicom_element);
-            cornerstone.resize(dicom_element, true);
-
-        });
-
-        $(".view-finding-button").each((n, el) => {
-            $(el).click((e) => {
-                dicom_element = $(".cornerstone-element").get(0);
-                annotationjson = JSON.parse(e.currentTarget.dataset.annotationjson);
-                viewport = JSON.parse(e.currentTarget.dataset.viewportjson);
-                loadAnnotationAndViewportOnElement(annotationjson, viewport, dicom_element);
-
-
-            });
-
-        });
-
-        {% if editing_finding > 0 %}
-        $("#hidden-form").show() 
-    setTimeout(function() {
-        $(".view-finding-button[data-findingid={{editing_finding}}]").trigger("click");
-    }, 1000)
-        
-        {% endif %}
-    });
-
-    function loadAnnotationAndViewportOnElement(annotation, viewport, dicom_element) {
-        cornerstoneTools.globalImageIdSpecificToolStateManager.clear(dicom_element);
-        cornerstone.getEnabledElement(dicom_element).viewport = viewport
-        cornerstoneTools.globalImageIdSpecificToolStateManager.restoreToolState(
-            annotation);
-        console.log(annotation)
-        //cornerstone.getEnabledElement(dicom_element).toolStateManager.restoreToolState(annotationjson)
-        cornerstone.resize(dicom_element);
-
-        dicomViewer.getNextAnnotationImage(dicom_element);
-
-    }
-
-    $(document).on('submit', '#series_finding_form', function (e) {
-        dicom_element = $(".cornerstone-element").get(0);
-        c = cornerstone.getEnabledElement(dicom_element);
-        e.preventDefault();
-
-        $.ajax({
-            type: 'POST',
-            url: '{% url "atlas:add_finding" %}',
-            data: {
-                series_finding_id: {{ editing_finding }},
-                description: $('#id_description').val(),
-                series: {{ series.pk }},
-                //annotation_json: JSON.stringify(c.toolStateManager.saveToolState()),
-                annotation_json: JSON.stringify(cornerstoneTools.globalImageIdSpecificToolStateManager
-                    .saveToolState()),
-                viewport_json: JSON.stringify(c.viewport),
-                findings: JSON.stringify($('#finding-form select[name="findings"]').find(":selected")
-                    .map((i, el) => {
-                        return $(el).val()
-                    }).toArray()),
-                structures: JSON.stringify($('#finding-form select[name="structures"]').find(
-                        ":selected")
-                    .map((i, el) => {
-                        return $(el).val()
-                    }).toArray()),
-                csrfmiddlewaretoken: $('input[name=csrfmiddlewaretoken]').val(),
-                action: 'post'
-            },
-            success: function (json) {
-                $("#finding-form").empty();
-                toastr.info('Finding added.');
-                location.href='{{series.get_absolute_url}}';
-            },
-            error: function (xhr, errmsg, err) {
-                console.log(xhr.status + ": " + xhr
-                    .responseText); // provide a bit more info about the error to the console
-            }
-        });
-    });
-</script>
\ No newline at end of file
+<div>{{ series.modality}}, {{ series.examination }}, {{ series.plane }}, {{ series.contrast }}</div>
+
+
+<div id="single-dicom-viewer" class="dicom-viewer" data-images="{{ series.get_image_url_array }}" data-annotations=''>
+</div>
+
+{% if editing_finding < 1 %}
+    <button id="add-finding-button">Add finding</button>
+{% endif %}
+<button id="reset-viewport-button">Reset viewport</button>
+<div id="finding-form">
+    <div class="hide" id="hidden-form">
+        <form method="post" id="series_finding_form">
+            {% csrf_token %}
+            {{series_finding_form.management_form}}
+            <div>
+                <div>Description: {{ series_finding_form.description }}</div>
+                <div>Findings: {{ series_finding_form.findings }}</div>
+                <div>Structures: {{ series_finding_form.structures }}</div>
+            </div>
+            <input type="submit" value="Submit">
+            <button id="cancel-add-finding-button">Cancel</button>
+        </form>
+    </div>
+</div>
+
+<details open>
+    <summary>Findings</summary>
+
+    {% for finding in series.findings.all %}
+        <div class="finding-box">
+            <button class="view-finding-button" data-annotationjson={{finding.annotation_json}}
+                data-viewportjson={{finding.viewport_json}} data-findingid={{finding.id}}>Click to view</button>
+            <span class="view-finding-details">
+                Finding(s): {% for f in finding.findings.all %}{{f.get_link}}{% endfor %}<br />
+                Structure(s): {% for s in finding.structures.all %}{{s.get_link}}{% endfor %}<br />
+                Description: {{finding.description}}<br />
+            </span>
+            <a href="{% url 'atlas:series_edit_finding' pk=series.pk finding_pk=finding.pk %}" class="edit-finding-link">Edit</a>
+            <a href="{% url 'atlas:delete_finding' pk=finding.pk %}" class="delete-finding-link">Delete</a>
+        </div>
+
+    {% endfor %}
+</details>
+
+
+<div>Author: {{ series.get_author_display }}</div>
+<details>
+    <summary>Image info</summary>
+    <div>
+        <a href="{% url 'atlas:series_order_dicom' pk=series.pk %}" title="orders dicom by slice location">Order dicoms
+            by slice location</a>
+        <a href="{% url 'atlas:series_order_dicom_instance' pk=series.pk %}"
+            title="orders dicom by instance number">Order dicoms by instance number</a>
+        <a href="{% url 'atlas:series_order_dicom_SeriesInstanceUID' pk=series.pk %}"
+            title="orders dicom by instance number">Order dicoms by SeriesInstanceUID</a>
+        <a href="{% url 'atlas:series_order_upload_filename' pk=series.pk %}"
+            title="orders dicom by uploaded filename">Order by uploaded filename</a>
+    </div>
+    {% for image in series.images.all %}
+        {{image.image.url}}, pos: {{image.position}}, {{image.upload_filename}} [{{image.image.size|filesizeformat}}]<br />
+        {% comment %} {{image.get_dicom_info|safe}}<br /> {% endcomment %}
+
+    {% endfor %}
+
+    <p>Total image size: {{series.get_total_image_size|filesizeformat}}</p>
+    <p><a href="{% url 'atlas:series_download' pk=series.pk %}">Download images</a></p>
+</details>
+
+
+<script>
+    $(document).ready(function () {
+        $("#add-finding-button").click(() => {
+            dicom_element = $(".cornerstone-element").get(0);
+            cornerstoneTools.globalImageIdSpecificToolStateManager.clear(dicom_element);
+            cornerstone.reset(dicom_element);
+            cornerstone.resize(dicom_element, true);
+            //$("#finding-form").empty().append(
+            //    $("#hidden-form form").clone()
+            //);
+            $("#hidden-form").show()
+
+        });
+        $("#cancel-add-finding-button").click((e) => {
+            $("#hidden-form").hide()
+            e.preventDefault();
+        });
+
+
+        $("#reset-viewport-button").click(() => {
+            dicom_element = $(".cornerstone-element").get(0);
+            //annotationjson = JSON.parse(e.currentTarget.dataset.annotationjson);
+            cornerstoneTools.globalImageIdSpecificToolStateManager.clear(dicom_element);
+            cornerstone.reset(dicom_element);
+            cornerstone.resize(dicom_element, true);
+
+        });
+
+        $(".view-finding-button").each((n, el) => {
+            $(el).click((e) => {
+                dicom_element = $(".cornerstone-element").get(0);
+                annotationjson = JSON.parse(e.currentTarget.dataset.annotationjson);
+                viewport = JSON.parse(e.currentTarget.dataset.viewportjson);
+                loadAnnotationAndViewportOnElement(annotationjson, viewport, dicom_element);
+
+
+            });
+
+        });
+
+        {% if editing_finding > 0 %}
+            $("#hidden-form").show()
+            setTimeout(function() {
+                $(".view-finding-button[data-findingid={{editing_finding}}]").trigger("click");
+            }, 1000)
+
+        {% endif %}
+    });
+
+    function loadAnnotationAndViewportOnElement(annotation, viewport, dicom_element) {
+        cornerstoneTools.globalImageIdSpecificToolStateManager.clear(dicom_element);
+        cornerstone.getEnabledElement(dicom_element).viewport = viewport
+        cornerstoneTools.globalImageIdSpecificToolStateManager.restoreToolState(
+            annotation);
+        console.log(annotation)
+        //cornerstone.getEnabledElement(dicom_element).toolStateManager.restoreToolState(annotationjson)
+        cornerstone.resize(dicom_element);
+
+        dicomViewer.getNextAnnotationImage(dicom_element);
+
+    }
+
+    $(document).on('submit', '#series_finding_form', function (e) {
+        dicom_element = $(".cornerstone-element").get(0);
+        c = cornerstone.getEnabledElement(dicom_element);
+        e.preventDefault();
+
+        $.ajax({
+            type: 'POST',
+            url: '{% url "atlas:add_finding" %}',
+            data: {
+                series_finding_id: {{ editing_finding }},
+                description: $('#id_description').val(),
+                series: {{ series.pk }},
+                //annotation_json: JSON.stringify(c.toolStateManager.saveToolState()),
+                annotation_json: JSON.stringify(cornerstoneTools.globalImageIdSpecificToolStateManager
+                        .saveToolState()),
+                viewport_json: JSON.stringify(c.viewport),
+                findings: JSON.stringify($('#finding-form select[name="findings"]').find(":selected")
+                        .map((i, el) => {
+                        return $(el).val()
+                    }).toArray()),
+                structures: JSON.stringify($('#finding-form select[name="structures"]').find(
+                    ":selected")
+                        .map((i, el) => {
+                        return $(el).val()
+                    }).toArray()),
+                csrfmiddlewaretoken: $('input[name=csrfmiddlewaretoken]').val(),
+                action: 'post'
+            },
+            success: function (json) {
+                $("#finding-form").empty();
+                toastr.info('Finding added.');
+                location.href='{{series.get_absolute_url}}';
+            },
+            error: function (xhr, errmsg, err) {
+                console.log(xhr.status + ": " + xhr
+                        .responseText); // provide a bit more info about the error to the console
+            }
+        });
+    });
+</script>
diff --git a/atlas/templates/atlas/collection_take.html b/atlas/templates/atlas/collection_take.html
index 922f6c0d..19be6665 100644
--- a/atlas/templates/atlas/collection_take.html
+++ b/atlas/templates/atlas/collection_take.html
@@ -1,53 +1,53 @@
 {% extends 'atlas/base.html' %}
 
 {% block content %}
-<h2>{{collection.name}}
-<ul>
-</ul>
-{% if collection.collection_type == "REP" %}
-    <h2>Start: {{exam.name}}</h2>
+    <h2>{{collection.name}}
+        <ul>
+        </ul>
+        {% if collection.collection_type == "REP" %}
+            <h2>Start: {{exam.name}}</h2>
 
-    Enter your CID and passcode in the below boxes.<br />
-    <p><input id="cid-box" type="text" value="Candidate ID"></p>
-    <p><input id="passcode-box" type="text" value="Passcode"></p>
+            Enter your CID and passcode in the below boxes.<br />
+            <p><input id="cid-box" type="text" value="Candidate ID"></p>
+            <p><input id="passcode-box" type="text" value="Passcode"></p>
 
-    <button>Start</button>
+            <button>Start</button>
 
-    <script type="text/javascript">
-        $(document).ready(function () {
-            window.location.search.substr(1).split("&").forEach((item) =>
-                {
-                    s = item.split("=");
-                    if (s[0] == "cid") {
-                        $("#cid-box").val(s[1]);
+            <script type="text/javascript">
+                $(document).ready(function () {
+                    window.location.search.substr(1).split("&").forEach((item) =>
+                        {
+                            s = item.split("=");
+                            if (s[0] == "cid") {
+                                $("#cid-box").val(s[1]);
 
-                    }
-                    if (s[0] == "passcode") {
-                        $("#passcode-box").val(s[1]);
-                    }
+                            }
+                            if (s[0] == "passcode") {
+                                $("#passcode-box").val(s[1]);
+                            }
+                        });
+
+
+                    $("#cid-box, #passcode-box").keypress(function(e) {
+                        // Enter pressed?
+                        console.log(e)
+                        if(e.which == 10 || e.which == 13) {
+                            $("button").click();
+                        }
+                    });
+
+                    $("button").click(() => {
+                        let cid = $("#cid-box").val();
+                        let passcode = $("#passcode-box").val();
+
+                        if (Number.isInteger(parseInt(cid))) {
+                            window.location.replace("{% url 'atlas:collection_case_view_take' pk=collection.pk case_number=0 cid='0000000' passcode='ZZZZZZ' %}".replace("0000000", cid).replace("ZZZZZZ", passcode));
+                        } else {
+                            alert("Please enter a valid Candidate ID (CID).")
+                        }
+                    });
                 });
+            </script>
+        {% endif %}
 
-
-            $("#cid-box, #passcode-box").keypress(function(e) {
-                // Enter pressed?
-                console.log(e)
-                if(e.which == 10 || e.which == 13) {
-                    $("button").click();
-                }
-            });
-
-            $("button").click(() => {
-                let cid = $("#cid-box").val();
-                let passcode = $("#passcode-box").val();
-
-                if (Number.isInteger(parseInt(cid))) {
-                    window.location.replace("{% url 'atlas:collection_case_view_take' pk=collection.pk case_number=0 cid='0000000' passcode='ZZZZZZ' %}".replace("0000000", cid).replace("ZZZZZZ", passcode));
-                } else {
-                    alert("Please enter a valid Candidate ID (CID).")
-                }
-            });
-        });
-    </script>
-{% endif %}
-
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/atlas/templates/atlas/condition_form.html b/atlas/templates/atlas/condition_form.html
index ca5f0677..616b2da5 100755
--- a/atlas/templates/atlas/condition_form.html
+++ b/atlas/templates/atlas/condition_form.html
@@ -4,23 +4,23 @@
 {% block css %}
 {% endblock %}
 {% block js %}
-<!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
-{{form.media}}
+    <!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
+    {{form.media}}
 
-<script type="text/javascript">
-</script>
+    <script type="text/javascript">
+    </script>
 
-<!-- {{ form.media }} -->
+    <!-- {{ form.media }} -->
 {% endblock %}
 {% block content %}
-<h2>Add/Edit Condition</h2>
-Use this form to create or edit a condition.
-<form action="" method="post" enctype="multipart/form-data" id="condition-form">
-    {% csrf_token %}
+    <h2>Add/Edit Condition</h2>
+    Use this form to create or edit a condition.
+    <form action="" method="post" enctype="multipart/form-data" id="condition-form">
+        {% csrf_token %}
 
-    <table>
-        {{ form.as_table }}
-    </table>
-    <input type="submit" class="submit-button" value="Submit" name="submit">
-</form>
-{% endblock %}
\ No newline at end of file
+        <table>
+            {{ form.as_table }}
+        </table>
+        <input type="submit" class="submit-button" value="Submit" name="submit">
+    </form>
+{% endblock %}
diff --git a/atlas/templates/atlas/finding_form.html b/atlas/templates/atlas/finding_form.html
index 843f202f..5b08b62e 100755
--- a/atlas/templates/atlas/finding_form.html
+++ b/atlas/templates/atlas/finding_form.html
@@ -4,23 +4,23 @@
 {% block css %}
 {% endblock %}
 {% block js %}
-<!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
-{{form.media}}
+    <!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
+    {{form.media}}
 
-<script type="text/javascript">
-</script>
+    <script type="text/javascript">
+    </script>
 
-<!-- {{ form.media }} -->
+    <!-- {{ form.media }} -->
 {% endblock %}
 {% block content %}
-<h2>Add/Edit Finding</h2>
-Use this form to create or edit a finding.
-<form action="" method="post" enctype="multipart/form-data" id="finding-form">
-    {% csrf_token %}
+    <h2>Add/Edit Finding</h2>
+    Use this form to create or edit a finding.
+    <form action="" method="post" enctype="multipart/form-data" id="finding-form">
+        {% csrf_token %}
 
-    <table>
-        {{ form.as_table }}
-    </table>
-    <input type="submit" class="submit-button" value="Submit" name="submit">
-</form>
-{% endblock %}
\ No newline at end of file
+        <table>
+            {{ form.as_table }}
+        </table>
+        <input type="submit" class="submit-button" value="Submit" name="submit">
+    </form>
+{% endblock %}
diff --git a/atlas/templates/atlas/pathological_process_detail.html b/atlas/templates/atlas/pathological_process_detail.html
index f470f5d3..8408f97c 100755
--- a/atlas/templates/atlas/pathological_process_detail.html
+++ b/atlas/templates/atlas/pathological_process_detail.html
@@ -5,7 +5,7 @@
 
 
     <div class="floating-header">
-{% comment %}         <a href="{% url 'atlas:pathological_process_update' pk=pathological_process.pk %}" title="Edit the Condition">Edit</a>
+        {% comment %}         <a href="{% url 'atlas:pathological_process_update' pk=pathological_process.pk %}" title="Edit the Condition">Edit</a>
         <a href="{% url 'atlas:pathological_process_delete' pk=pathological_process.pk %}" title="Delete the Condition">Delete</a> {% endcomment %}
         {% if request.user.is_superuser %}
             <a href="{% url 'admin:atlas_pathologicalprocess_change' pathological_process.id %}"
diff --git a/atlas/templates/atlas/presentation_detail.html b/atlas/templates/atlas/presentation_detail.html
index a24e783e..6b314d5c 100755
--- a/atlas/templates/atlas/presentation_detail.html
+++ b/atlas/templates/atlas/presentation_detail.html
@@ -5,7 +5,7 @@
 
 
     <div class="floating-header">
-{% comment %}         <a href="{% url 'atlas:presentation_update' pk=presentation.pk %}" title="Edit the Condition">Edit</a>
+        {% comment %}         <a href="{% url 'atlas:presentation_update' pk=presentation.pk %}" title="Edit the Condition">Edit</a>
         <a href="{% url 'atlas:presentation_delete' pk=presentation.pk %}" title="Delete the Condition">Delete</a> {% endcomment %}
         {% if request.user.is_superuser %}
             <a href="{% url 'admin:atlas_presentation_change' presentation.id %}"
diff --git a/atlas/templates/atlas/series_form.html b/atlas/templates/atlas/series_form.html
index 281af33e..6b1c0d4a 100755
--- a/atlas/templates/atlas/series_form.html
+++ b/atlas/templates/atlas/series_form.html
@@ -3,118 +3,118 @@
 {% load static %}
 
 {% block js %}
-<!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
+    <!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
 
-<script type="text/javascript">
-    document.addEventListener('drop', function (e) { e.preventDefault(); }, false);
+    <script type="text/javascript">
+        document.addEventListener('drop', function (e) { e.preventDefault(); }, false);
 
-    function add_input_form() {
-        var form_idx = $('#id_images-TOTAL_FORMS').val();
-        $('#image_form_set').append($('#empty_form').html().replace(/__prefix__/g, form_idx));
-        $('#id_images-TOTAL_FORMS').val(parseInt(form_idx) + 1);
-    }
+        function add_input_form() {
+            var form_idx = $('#id_images-TOTAL_FORMS').val();
+            $('#image_form_set').append($('#empty_form').html().replace(/__prefix__/g, form_idx));
+            $('#id_images-TOTAL_FORMS').val(parseInt(form_idx) + 1);
+        }
 
 
-    $(document).ready(function () {
-        $("#add_examination").appendTo($("label[for='id_examination']"));
+        $(document).ready(function () {
+            $("#add_examination").appendTo($("label[for='id_examination']"));
 
-        dropContainer = document.getElementById("drop-container");
+            dropContainer = document.getElementById("drop-container");
 
-        dropContainer.ondragover = function (evt) {
-            evt.preventDefault();
-            evt.stopPropagation();
-        };
+            dropContainer.ondragover = function (evt) {
+                evt.preventDefault();
+                evt.stopPropagation();
+            };
 
-        dropContainer.ondragenter = function (evt) {
-            console.log("ENTER")
-            console.log(evt)
-            $(evt.target).addClass("drop-target-active")
-            evt.preventDefault();
-            evt.stopPropagation();
-        };
+            dropContainer.ondragenter = function (evt) {
+                console.log("ENTER")
+                console.log(evt)
+                $(evt.target).addClass("drop-target-active")
+                evt.preventDefault();
+                evt.stopPropagation();
+            };
 
-        dropContainer.ondragleave = function (evt) {
-            console.log("ENTER")
-            console.log(evt)
-            $(evt.target).removeClass("drop-target-active")
-            evt.preventDefault();
-            evt.stopPropagation();
-        };
+            dropContainer.ondragleave = function (evt) {
+                console.log("ENTER")
+                console.log(evt)
+                $(evt.target).removeClass("drop-target-active")
+                evt.preventDefault();
+                evt.stopPropagation();
+            };
 
-        dropContainer.ondrop = function (evt) {
-            $(evt.target).removeClass("drop-target-active");
+            dropContainer.ondrop = function (evt) {
+                $(evt.target).removeClass("drop-target-active");
 
 
-            if (evt.dataTransfer.files.length < 1) {
-                toastr.warning(`Drop failed :( try again?`);
-            } else {
-                toastr.info(`Adding ${evt.dataTransfer.files.length} files.`);
-            }
-
-            // Get all input elements
-            inputs = $("#atlas-form input[type=file][id^=id_images-]");
-            //fileInput = document.getElementById("id_images-0-image");
-
-            // Make sure we have enough input targets
-            input_diff = (evt.dataTransfer.files.length - inputs.length)
-
-            if (input_diff > 0) {
-                for (let j = 0; j < input_diff; j++) {
-                    add_input_form()
+                if (evt.dataTransfer.files.length < 1) {
+                    toastr.warning(`Drop failed :( try again?`);
+                } else {
+                    toastr.info(`Adding ${evt.dataTransfer.files.length} files.`);
                 }
 
-                // Need to make sure we include the new ones...
+                // Get all input elements
                 inputs = $("#atlas-form input[type=file][id^=id_images-]");
-            }
+                //fileInput = document.getElementById("id_images-0-image");
 
-            // Loop through each dropped file and try to assign to an
-            // input element
-            [...evt.dataTransfer.files].forEach((f) => {
-                let dT = new DataTransfer();
-                dT.clearData();
-                dT.items.add(f);
-                for (let i = 0; i < inputs.length; i++) {
-                    el = inputs.get(i)
+                // Make sure we have enough input targets
+                input_diff = (evt.dataTransfer.files.length - inputs.length)
 
-                    if (el.files.length == 0) {
-                        el.files = dT.files;
-                        //ocr(el)
-
-                        return false
+                if (input_diff > 0) {
+                    for (let j = 0; j < input_diff; j++) {
+                        add_input_form()
                     }
+
+                    // Need to make sure we include the new ones...
+                    inputs = $("#atlas-form input[type=file][id^=id_images-]");
                 }
-            })
 
-            // // If you want to use some of the dropped files
-            // const dT = new DataTransfer();
-            // dT.items.add(evt.dataTransfer.files[0]);
-            // dT.items.add(evt.dataTransfer.files[3]);
-            // fileInput.files = dT.files;
+                // Loop through each dropped file and try to assign to an
+                // input element
+                [...evt.dataTransfer.files].forEach((f) => {
+                    let dT = new DataTransfer();
+                    dT.clearData();
+                    dT.items.add(f);
+                    for (let i = 0; i < inputs.length; i++) {
+                        el = inputs.get(i)
 
-            loadDicomViewerAndFileImages();
+                        if (el.files.length == 0) {
+                            el.files = dT.files;
+                            //ocr(el)
 
-            evt.preventDefault();
-            evt.stopPropagation();
-        };
+                            return false
+                        }
+                    }
+                })
+
+                // // If you want to use some of the dropped files
+                // const dT = new DataTransfer();
+                // dT.items.add(evt.dataTransfer.files[0]);
+                // dT.items.add(evt.dataTransfer.files[3]);
+                // fileInput.files = dT.files;
+
+                loadDicomViewerAndFileImages();
+
+                evt.preventDefault();
+                evt.stopPropagation();
+            };
 
 
-        $('#add_more_images').click(() => { add_input_form() });
+            $('#add_more_images').click(() => { add_input_form() });
 
-        $("input[type=file]").on('change', function () {
-            $(this).removeClass("image-ident-warning");
-            $(this).removeClass("image-ident-ok");
-            console.log("input change1");
-            console.log("input change", this);
-            //ocr(this);
-            //LoadDicomViewer();
+            $("input[type=file]").on('change', function () {
+                $(this).removeClass("image-ident-warning");
+                $(this).removeClass("image-ident-ok");
+                console.log("input change1");
+                console.log("input change", this);
+                //ocr(this);
+                //LoadDicomViewer();
 
-        });
+            });
 
 
 
-        sortable('.sortable');
-        sortable('.sortable')[0].addEventListener('sortupdate', function (e) {
-            /*
+            sortable('.sortable');
+            sortable('.sortable')[0].addEventListener('sortupdate', function (e) {
+                /*
 
             This event is triggered when the user stops sorting and the DOM position has not yet changed.
 
@@ -125,262 +125,262 @@
             e.detail.origin.elementIndex - {Integer} Index of the element in all elements in the Sortable Container
             e.detail.origin.container - {HTMLElement} Sortable Container that element was moved out of (or copied from)
             */
-            //updateImagePositions();
+                //updateImagePositions();
 
-            $(".temp-thumb").remove()
-            loadDicomViewer();
-        });
-    });
-
-
-
-
-    function ocr(input) {
-        // Tesseract.recognize(f, "eng",{ logger: m => console.log(m) }
-        // ).then(({ data: { text } }) => {
-        //   console.log(text);
-        //   l = text.toLowerCase();
-        //   if (l.includes("accesion") || l.includes("number") || l.search(/(REF|RK9|RH8|RA9)\d+/g)) {
-        //       console.log("SHIT", this);
-        //   }
-        // })
-
-        console.log('{% static "worker.min.js" %}');
-        console.log('{{ STATIC_URL }}/tesseract-core.wasm.js %}');
-
-        const worker = Tesseract.createWorker({
-            workerPath: '{% static "worker.min.js" %}',
-            langPath: '{% static "" %}',
-            //langPath: '{{ STATIC_URL }}',
-            corePath: '{% static "tesseract-core.wasm.js" %}',
-        });
-
-        const url = URL.createObjectURL(input.files[0]);
-        let img = new Image;
-        img.src = url;
-
-        img.onload = function () {
-
-
-            width = img.width;
-
-            // const rectangle = { left: 0, top: 0, width: width, height: 10 }
-
-
-            (async () => {
-                await worker.load();
-                await worker.loadLanguage('eng');
-                await worker.initialize('eng');
-                // const { data: { text } } = await worker.recognize(input.files[0], { rectangle });
-                const { data: { text } } = await worker.recognize(input.files[0]);
-                //console.log(text);
-                l = text.toLowerCase();
-                $(`img[data-input-id='${input.id}'`).removeClass("image-ident-loading");
-                console.log(l);
-                if (l.includes("accesion") || l.includes("number") || l.search(/(ref|rk9|rh8|ra9|rbz)\d+/g) > -1) {
-                    $(input).addClass("image-ident-warning");
-                    $(`img[data-input-id='${input.id}'`).addClass("image-ident-warning");
-                } else {
-                    $(input).addClass("image-ident-ok");
-
-                }
-
-                await worker.terminate();
-            })();
-        }
-    }
-
-
-    async function loadDicomViewerAndFileImages(callback) {
-        $("#single-dicom-viewer").empty()
-        //images = []
-        //Function that returns a promise to read the file
-        const reader = (file) => {
-            return new Promise((resolve, reject) => {
-                const fileReader = new FileReader();
-                fileReader.onload = () => resolve(fileReader);
-                fileReader.readAsDataURL(file);
+                $(".temp-thumb").remove()
+                loadDicomViewer();
             });
-        }
-
-        const readFile = (file, el) => {
-            reader(file).then(reader => {
-                console.log("hello", file, el, image)
-                if ($("#id_examination").find(":selected")[0].dataset.select2Id == "2") {
-                    var byteArray = new Uint8Array(reader.result);
-                    console.log("etrxact")
-                    extractDicomStudyDescription(byteArray);
-                }
-                var image = new Image();
-                image.height = 100;
-                image.title = file.name;
-                image.src = reader.result;
-                image.className = "temp-thumb";
-                console.log("read", el);
-                $(el).parent().parent().prepend(image);
-                //images.push(reader.result);
-                loadViewer(images);
-
-            });
-        }
-
-
-
-        file_set = $("#image_form_set input[type=file]");
-
-
-
-        file_set.each(async (n, el) => {
-            console.log(el);
-            if (el.files.length > 0) {
-                filename = el.files[0].name;
-                await readFile(el.files[0], el);
-            }
-        })
-
-
-        console.log("images from files", images);
-
-
-    }
-
-    function loadViewer(images) {
-        //dicomViewer.loadCornerstone($("#single-dicom-viewer"), null, images, annotations);
-        file_set = $("#image_form_set input[type=file]");
-
-        n = 0;
-        for (let i = 0; i < file_set.length; i++) {
-            el = file_set.get(i)
-            if (el.files.length > 0) {
-                n++;
-            }
-        }
-
-        image_set = $("#image_form_set img");
-        if (n == image_set.length) {
-            const event = new CustomEvent('loadDicomViewer', { "detail": image_set });
-
-            window.dispatchEvent(event);
-            sortable('.sortable');
-            //sortable('.sortable')[0].addEventListener('sortstop', function(e) {
-            updateImagePositions();
-        }
-
-    }
-
-    function updateImagePositions() {
-        console.log("UP pos");
-
-        file_set = $("#image_form_set ul");
-
-        n = 0;
-        for (let i = 0; i < file_set.length; i++) {
-            ul = file_set.get(i);
-            console.log(ul)
-
-            file_element = $(ul).find("input[type=file]").get(0);
-
-            // If a (new) file is being uploaded we save it's name prior to it being hashed
-            if (file_element.files.length > 0) {
-                file_name = file_element.files[0].name
-                $(ul).find("input[type=text]").val(file_name);
-            }
-
-            if (file_element.files.length > 0 || $(ul).find(":contains('Currently:')")) {
-                n++;
-                $(ul).find("input[type=number]").val(n);
-            }
-        }
-
-    }
-
-    function extractDicomStudyDescription(byteArray) {
-        // We need to setup a try/catch block because parseDicom will throw an exception
-        // if you attempt to parse a non dicom part 10 file (or one that is corrupted)
-        try {
-            // parse byteArray into a DataSet object using the parseDicom library
-            var dataSet = dicomParser.parseDicom(byteArray);
-
-            // dataSet contains the parsed elements.  Each element is available via a property
-            // in the dataSet.elements object.  The property name is based on the elements group
-            // and element in the following format: xggggeeee where gggg is the group number
-            // and eeee is the element number with lowercase hex characters.
-
-            // To access the data for an element, we need to know its type and its tag.
-            // We will get the sopInstanceUid from the file which is a string and
-            // has the tag (0020,000D)
-            var study_description = dataSet.string('x00081030').toLowerCase();
-            console.log("STUDY", study_description);
-
-        $.ajax({
-            url: `{% url 'generic:examination-autocomplete' %}/${encodeURI(study_description)}`,
-            //context: document.body,
-            success: function(data){
-            console.log(data)
-            }
         });
 
-            // try to match with a study description (if not already selected)
-            if ($(`#id_examination_to option`).length < 1) {
-                option = $(`#id_examination_from option[title*='${study_description}' i]`);
 
-                if (option.length) {
-                    option.appendTo($("#id_examination_to"));
-                    toastr.success(`Examination set to ${option.attr('title')} from dicom data`);
-                } else {
-                    toastr.warning(
-                        `Unable to set examination ${study_description} from dicom data (it needs creating)`);
 
+
+        function ocr(input) {
+            // Tesseract.recognize(f, "eng",{ logger: m => console.log(m) }
+            // ).then(({ data: { text } }) => {
+            //   console.log(text);
+            //   l = text.toLowerCase();
+            //   if (l.includes("accesion") || l.includes("number") || l.search(/(REF|RK9|RH8|RA9)\d+/g)) {
+            //       console.log("SHIT", this);
+            //   }
+            // })
+
+            console.log('{% static "worker.min.js" %}');
+            console.log('{{ STATIC_URL }}/tesseract-core.wasm.js %}');
+
+            const worker = Tesseract.createWorker({
+                workerPath: '{% static "worker.min.js" %}',
+                langPath: '{% static "" %}',
+                //langPath: '{{ STATIC_URL }}',
+                corePath: '{% static "tesseract-core.wasm.js" %}',
+            });
+
+            const url = URL.createObjectURL(input.files[0]);
+            let img = new Image;
+            img.src = url;
+
+            img.onload = function () {
+
+
+                width = img.width;
+
+                // const rectangle = { left: 0, top: 0, width: width, height: 10 }
+
+
+                (async () => {
+                    await worker.load();
+                    await worker.loadLanguage('eng');
+                    await worker.initialize('eng');
+                    // const { data: { text } } = await worker.recognize(input.files[0], { rectangle });
+                    const { data: { text } } = await worker.recognize(input.files[0]);
+                    //console.log(text);
+                    l = text.toLowerCase();
+                    $(`img[data-input-id='${input.id}'`).removeClass("image-ident-loading");
+                    console.log(l);
+                    if (l.includes("accesion") || l.includes("number") || l.search(/(ref|rk9|rh8|ra9|rbz)\d+/g) > -1) {
+                        $(input).addClass("image-ident-warning");
+                        $(`img[data-input-id='${input.id}'`).addClass("image-ident-warning");
+                    } else {
+                        $(input).addClass("image-ident-ok");
+
+                    }
+
+                    await worker.terminate();
+                })();
+            }
+        }
+
+
+        async function loadDicomViewerAndFileImages(callback) {
+            $("#single-dicom-viewer").empty()
+            //images = []
+            //Function that returns a promise to read the file
+            const reader = (file) => {
+                return new Promise((resolve, reject) => {
+                    const fileReader = new FileReader();
+                    fileReader.onload = () => resolve(fileReader);
+                    fileReader.readAsDataURL(file);
+                });
+            }
+
+            const readFile = (file, el) => {
+                reader(file).then(reader => {
+                    console.log("hello", file, el, image)
+                    if ($("#id_examination").find(":selected")[0].dataset.select2Id == "2") {
+                        var byteArray = new Uint8Array(reader.result);
+                        console.log("etrxact")
+                        extractDicomStudyDescription(byteArray);
+                    }
+                    var image = new Image();
+                    image.height = 100;
+                    image.title = file.name;
+                    image.src = reader.result;
+                    image.className = "temp-thumb";
+                    console.log("read", el);
+                    $(el).parent().parent().prepend(image);
+                    //images.push(reader.result);
+                    loadViewer(images);
+
+                });
+            }
+
+
+
+            file_set = $("#image_form_set input[type=file]");
+
+
+
+            file_set.each(async (n, el) => {
+                console.log(el);
+                if (el.files.length > 0) {
+                    filename = el.files[0].name;
+                    await readFile(el.files[0], el);
+                }
+            })
+
+
+            console.log("images from files", images);
+
+
+        }
+
+        function loadViewer(images) {
+            //dicomViewer.loadCornerstone($("#single-dicom-viewer"), null, images, annotations);
+            file_set = $("#image_form_set input[type=file]");
+
+            n = 0;
+            for (let i = 0; i < file_set.length; i++) {
+                el = file_set.get(i)
+                if (el.files.length > 0) {
+                    n++;
                 }
             }
 
-        } catch (err) {
-            console.log(err);
-        }
-    }
-</script>
+            image_set = $("#image_form_set img");
+            if (n == image_set.length) {
+                const event = new CustomEvent('loadDicomViewer', { "detail": image_set });
 
-{{ form.media }}
+                window.dispatchEvent(event);
+                sortable('.sortable');
+                //sortable('.sortable')[0].addEventListener('sortstop', function(e) {
+                updateImagePositions();
+            }
+
+        }
+
+        function updateImagePositions() {
+            console.log("UP pos");
+
+            file_set = $("#image_form_set ul");
+
+            n = 0;
+            for (let i = 0; i < file_set.length; i++) {
+                ul = file_set.get(i);
+                console.log(ul)
+
+                file_element = $(ul).find("input[type=file]").get(0);
+
+                // If a (new) file is being uploaded we save it's name prior to it being hashed
+                if (file_element.files.length > 0) {
+                    file_name = file_element.files[0].name
+                    $(ul).find("input[type=text]").val(file_name);
+                }
+
+                if (file_element.files.length > 0 || $(ul).find(":contains('Currently:')")) {
+                    n++;
+                    $(ul).find("input[type=number]").val(n);
+                }
+            }
+
+        }
+
+        function extractDicomStudyDescription(byteArray) {
+            // We need to setup a try/catch block because parseDicom will throw an exception
+            // if you attempt to parse a non dicom part 10 file (or one that is corrupted)
+            try {
+                // parse byteArray into a DataSet object using the parseDicom library
+                var dataSet = dicomParser.parseDicom(byteArray);
+
+                // dataSet contains the parsed elements.  Each element is available via a property
+                // in the dataSet.elements object.  The property name is based on the elements group
+                // and element in the following format: xggggeeee where gggg is the group number
+                // and eeee is the element number with lowercase hex characters.
+
+                // To access the data for an element, we need to know its type and its tag.
+                // We will get the sopInstanceUid from the file which is a string and
+                // has the tag (0020,000D)
+                var study_description = dataSet.string('x00081030').toLowerCase();
+                console.log("STUDY", study_description);
+
+                $.ajax({
+                    url: `{% url 'generic:examination-autocomplete' %}/${encodeURI(study_description)}`,
+                    //context: document.body,
+                    success: function(data){
+                        console.log(data)
+                    }
+                });
+
+                // try to match with a study description (if not already selected)
+                if ($(`#id_examination_to option`).length < 1) {
+                    option = $(`#id_examination_from option[title*='${study_description}' i]`);
+
+                    if (option.length) {
+                        option.appendTo($("#id_examination_to"));
+                        toastr.success(`Examination set to ${option.attr('title')} from dicom data`);
+                    } else {
+                        toastr.warning(
+                            `Unable to set examination ${study_description} from dicom data (it needs creating)`);
+
+                    }
+                }
+
+            } catch (err) {
+                console.log(err);
+            }
+        }
+    </script>
+
+    {{ form.media }}
 {% endblock %}
 {% block content %}
-<h2>Add Series</h2>
-This form will create a image set that can be associated with a atlas question. If the question has already been created
-it can be linked below.
-<form action="" method="post" enctype="multipart/form-data" id="atlas-form">
-    {% csrf_token %}
-    <a href="/generic/examination/create" id="add_examination" class="add-popup"
-        onclick="return showAddPopup(this);"><img src="{% static '/img/icon-addlink.svg' %}"></a>
-    <table>
-        {{ form.as_table }}
-    </table>
+    <h2>Add Series</h2>
+    This form will create a image set that can be associated with a atlas question. If the question has already been created
+    it can be linked below.
+    <form action="" method="post" enctype="multipart/form-data" id="atlas-form">
+        {% csrf_token %}
+        <a href="/generic/examination/create" id="add_examination" class="add-popup"
+            onclick="return showAddPopup(this);"><img src="{% static '/img/icon-addlink.svg' %}"></a>
+        <table>
+            {{ form.as_table }}
+        </table>
 
-    <h3>Images:</h3>
-    <input type="button" value="Add More Images" id="add_more_images">
-    <div id="drop-container" class="">Drop images here (or use the buttons below). Dropping images here will overwrite
-        existing images in the series. When drag and dropping make sure to drag the first image or the order will not be
-        maintained. Note: dicom images are often not exported in order (although their order can be automatically
-        detected once uploaded)
-        <div id="single-dicom-viewer" class="dicom-viewer" data-images="" data-annotations=''></div>
-        <div id="drop-filenames"></div>
-    </div>
-    <div id="image_form_set" class="sortable">
-        {% for form in image_formset %}
-        <ul class="no-error image-formset">
-            {{form.non_field_errors}}
-            {{form.errors}}
-            {{ form.as_ul }}
+        <h3>Images:</h3>
+        <input type="button" value="Add More Images" id="add_more_images">
+        <div id="drop-container" class="">Drop images here (or use the buttons below). Dropping images here will overwrite
+            existing images in the series. When drag and dropping make sure to drag the first image or the order will not be
+            maintained. Note: dicom images are often not exported in order (although their order can be automatically
+            detected once uploaded)
+            <div id="single-dicom-viewer" class="dicom-viewer" data-images="" data-annotations=''></div>
+            <div id="drop-filenames"></div>
+        </div>
+        <div id="image_form_set" class="sortable">
+            {% for form in image_formset %}
+                <ul class="no-error image-formset">
+                    {{form.non_field_errors}}
+                    {{form.errors}}
+                    {{ form.as_ul }}
+                </ul>
+            {% endfor %}
+        </div>
+        {{ image_formset.management_form }}
+        <input type="submit" class="submit-button" value="Submit" name="submit">
+    </form>
+    <div id="empty_form" style="display:none">
+        <ul class='no_error image-formset'>
+            {{ image_formset.empty_form.as_ul }}
         </ul>
-        {% endfor %}
     </div>
-    {{ image_formset.management_form }}
-    <input type="submit" class="submit-button" value="Submit" name="submit">
-</form>
-<div id="empty_form" style="display:none">
-    <ul class='no_error image-formset'>
-        {{ image_formset.empty_form.as_ul }}
-    </ul>
-</div>
-<div id="images">
+    <div id="images">
 
-</div>
-{% endblock %}
\ No newline at end of file
+    </div>
+{% endblock %}
diff --git a/atlas/templates/atlas/series_viewer.html b/atlas/templates/atlas/series_viewer.html
index 3510e47d..a9db70dd 100755
--- a/atlas/templates/atlas/series_viewer.html
+++ b/atlas/templates/atlas/series_viewer.html
@@ -2,19 +2,19 @@
 <div>Description: {{series.description}}</div>
 
 {% if series.case %}
-Associated case:
-{% for case in series.case.all %}
-<a href="{% url 'atlas:case_detail' pk=case.pk %}">{{case}}</a>
-{% endfor %}
+    Associated case:
+    {% for case in series.case.all %}
+        <a href="{% url 'atlas:case_detail' pk=case.pk %}">{{case}}</a>
+    {% endfor %}
 {% else %}
-This series is not associated with any cases.
+    This series is not associated with any cases.
 {% endif %}
 
 <div id="single-dicom-viewer" class="dicom-viewer" data-images="{{ series.get_image_url_array }}" data-annotations=''>
 </div>
 
 {% if editing_finding < 1 %}
-<button id="add-finding-button">Add finding</button>
+    <button id="add-finding-button">Add finding</button>
 {% endif %}
 <button id="reset-viewport-button">Reset viewport</button>
 <div id="finding-form">
@@ -37,17 +37,17 @@ This series is not associated with any cases.
     <summary>Findings</summary>
 
     {% for finding in series.findings.all %}
-    <div class="finding-box">
-        <button class="view-finding-button" data-annotationjson={{finding.annotation_json}}
-            data-viewportjson={{finding.viewport_json}} data-findingid={{finding.id}}>Click to view</button>
-        <span class="view-finding-details">
-            Finding(s): {% for f in finding.findings.all %}{{f.get_link}}{% endfor %}<br />
-            Structure(s): {% for s in finding.structures.all %}{{s.get_link}}{% endfor %}<br />
-            Description: {{finding.description}}<br />
-        </span>
-        <a href="{% url 'atlas:series_edit_finding' pk=series.pk finding_pk=finding.pk %}" class="edit-finding-link">Edit</a>
-        <a href="{% url 'atlas:delete_finding' pk=finding.pk %}" class="delete-finding-link">Delete</a>
-    </div>
+        <div class="finding-box">
+            <button class="view-finding-button" data-annotationjson={{finding.annotation_json}}
+                data-viewportjson={{finding.viewport_json}} data-findingid={{finding.id}}>Click to view</button>
+            <span class="view-finding-details">
+                Finding(s): {% for f in finding.findings.all %}{{f.get_link}}{% endfor %}<br />
+                Structure(s): {% for s in finding.structures.all %}{{s.get_link}}{% endfor %}<br />
+                Description: {{finding.description}}<br />
+            </span>
+            <a href="{% url 'atlas:series_edit_finding' pk=series.pk finding_pk=finding.pk %}" class="edit-finding-link">Edit</a>
+            <a href="{% url 'atlas:delete_finding' pk=finding.pk %}" class="delete-finding-link">Delete</a>
+        </div>
 
     {% endfor %}
 </details>
@@ -67,8 +67,8 @@ This series is not associated with any cases.
             title="orders dicom by uploaded filename">Order by uploaded filename</a>
     </div>
     {% for image in series.images.all %}
-    {{image.image.url}}, pos: {{image.position}}, {{image.upload_filename}} [{{image.image.size|filesizeformat}}]<br />
-    {% comment %} {{image.get_dicom_info|safe}}<br /> {% endcomment %}
+        {{image.image.url}}, pos: {{image.position}}, {{image.upload_filename}} [{{image.image.size|filesizeformat}}]<br />
+        {% comment %} {{image.get_dicom_info|safe}}<br /> {% endcomment %}
 
     {% endfor %}
 
@@ -118,11 +118,11 @@ This series is not associated with any cases.
         });
 
         {% if editing_finding > 0 %}
-        $("#hidden-form").show() 
-    setTimeout(function() {
-        $(".view-finding-button[data-findingid={{editing_finding}}]").trigger("click");
-    }, 1000)
-        
+            $("#hidden-form").show()
+            setTimeout(function() {
+                $(".view-finding-button[data-findingid={{editing_finding}}]").trigger("click");
+            }, 1000)
+
         {% endif %}
     });
 
@@ -153,15 +153,15 @@ This series is not associated with any cases.
                 series: {{ series.pk }},
                 //annotation_json: JSON.stringify(c.toolStateManager.saveToolState()),
                 annotation_json: JSON.stringify(cornerstoneTools.globalImageIdSpecificToolStateManager
-                    .saveToolState()),
+                        .saveToolState()),
                 viewport_json: JSON.stringify(c.viewport),
                 findings: JSON.stringify($('#finding-form select[name="findings"]').find(":selected")
-                    .map((i, el) => {
+                        .map((i, el) => {
                         return $(el).val()
                     }).toArray()),
                 structures: JSON.stringify($('#finding-form select[name="structures"]').find(
-                        ":selected")
-                    .map((i, el) => {
+                    ":selected")
+                        .map((i, el) => {
                         return $(el).val()
                     }).toArray()),
                 csrfmiddlewaretoken: $('input[name=csrfmiddlewaretoken]').val(),
@@ -174,8 +174,8 @@ This series is not associated with any cases.
             },
             error: function (xhr, errmsg, err) {
                 console.log(xhr.status + ": " + xhr
-                    .responseText); // provide a bit more info about the error to the console
+                        .responseText); // provide a bit more info about the error to the console
             }
         });
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/atlas/templates/atlas/structure_form.html b/atlas/templates/atlas/structure_form.html
index 4b63c509..0645bf40 100755
--- a/atlas/templates/atlas/structure_form.html
+++ b/atlas/templates/atlas/structure_form.html
@@ -4,23 +4,23 @@
 {% block css %}
 {% endblock %}
 {% block js %}
-<!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
-{{form.media}}
+    <!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
+    {{form.media}}
 
-<script type="text/javascript">
-</script>
+    <script type="text/javascript">
+    </script>
 
-<!-- {{ form.media }} -->
+    <!-- {{ form.media }} -->
 {% endblock %}
 {% block content %}
-<h2>Add/Edit Structure</h2>
-Use this form to create or edit a structure.
-<form action="" method="post" enctype="multipart/form-data" id="structure-form">
-    {% csrf_token %}
+    <h2>Add/Edit Structure</h2>
+    Use this form to create or edit a structure.
+    <form action="" method="post" enctype="multipart/form-data" id="structure-form">
+        {% csrf_token %}
 
-    <table>
-        {{ form.as_table }}
-    </table>
-    <input type="submit" class="submit-button" value="Submit" name="submit">
-</form>
-{% endblock %}
\ No newline at end of file
+        <table>
+            {{ form.as_table }}
+        </table>
+        <input type="submit" class="submit-button" value="Submit" name="submit">
+    </form>
+{% endblock %}
diff --git a/atlas/views.py b/atlas/views.py
index 9f778208..69c5514a 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -1170,11 +1170,14 @@ def collection_mark_question(request, pk, case_number):
             form = CidReportAnswerMarkForm(instance=answer, prefix=answer.pk)
             answer_forms.append((answer, form))
 
+    series_list = case.series.all().prefetch_related("images", "examination", "plane")
+
     return render(
         request,
         "atlas/collection_mark_question.html",
         {
             "collection": collection,
+            "series_list": series_list,
             "answers": answers,
             "case_detail": case_detail,
             "case": case,