diff --git a/atlas/templates/atlas/collection_case_displaysetup.html b/atlas/templates/atlas/collection_case_displaysetup.html
index 8283c7e4..7d77bf30 100644
--- a/atlas/templates/atlas/collection_case_displaysetup.html
+++ b/atlas/templates/atlas/collection_case_displaysetup.html
@@ -3,67 +3,67 @@
 
 
 {% block content %}
-{% include 'atlas/partials/_viewing_case_as_part_of_collection.html' with nav_link_view="atlas:collection_case_displaysetup" %}
-<h2>Setup default display for case</h2>
+    {% include 'atlas/partials/_viewing_case_as_part_of_collection.html' with nav_link_view="atlas:collection_case_displaysetup" %}
+    <h2>Setup default display for case</h2>
 
     <div id="root" class="dicom-viewer-root" data-images="{{casedetail.case.get_series_images_nested}}"
-        style="box-sizing: border-box; background: #222; width: 100vw; height: 800px; max-width: 1600px;"
-        data-auto-cache-stack="true" 
-        {% if casedetail.default_viewerstate %}
-           data-viewerstate={{ casedetail.default_viewerstate }} 
-        {% endif %}
-            
+         style="box-sizing: border-box; background: #222; width: 100vw; height: 800px; max-width: 1600px;"
+         data-auto-cache-stack="true"
+         {% if casedetail.default_viewerstate %}
+             data-viewerstate={{ casedetail.default_viewerstate }}
+         {% endif %}
+
     ></div>
 
-<button id="save-viewerstate" type="button" class="btn btn-primary mt-3">
-    Save Viewer State
-</button>
-<button id="reset-viewerstate" type="button" class="btn btn-secondary mt-3 ms-2">
-    Reset to Default
-</button>
-<div id="viewerstate-save-response" class="mt-2"></div>
+    <button id="save-viewerstate" type="button" class="btn btn-primary mt-3">
+        Save Viewer State
+    </button>
+    <button id="reset-viewerstate" type="button" class="btn btn-secondary mt-3 ms-2">
+        Reset to Default
+    </button>
+    <div id="viewerstate-save-response" class="mt-2"></div>
 
-<script>
-document.getElementById('save-viewerstate').addEventListener('click', function() {
-    let viewerState = window.exportViewerState_root();
-    if (!viewerState) {
-        document.getElementById('viewerstate-save-response').innerHTML = "<span class='text-danger'>Viewer state could not be retrieved.</span>";
-        return;
-    }
-    fetch({% if case_number %}"{% url 'atlas:collection_case_displaysetup' casedetail.collection.pk case_number=case_number %}"{% else %}"{% url 'atlas:collection_case_displaysetup_legacy' casedetail.collection.pk casedetail.case.pk %}"{% endif %}, {
-        method: "POST",
-        headers: {
-            "Content-Type": "application/json",
-            "X-CSRFToken": "{{ csrf_token }}"
-        },
-        body: JSON.stringify({viewerstate: viewerState})
-    })
-    .then(response => response.text())
-    .then(html => {
-        document.getElementById('viewerstate-save-response').innerHTML = html;
-    })
-    .catch(error => {
-        document.getElementById('viewerstate-save-response').innerHTML = "<span class='text-danger'>Error saving viewer state.</span>";
-    });
-});
-document.getElementById('reset-viewerstate').addEventListener('click', function() {
-    fetch({% if case_number %}"{% url 'atlas:collection_case_displaysetup' casedetail.collection.pk case_number=case_number %}"{% else %}"{% url 'atlas:collection_case_displaysetup_legacy' casedetail.collection.pk casedetail.case.pk %}"{% endif %}, {
-        method: "POST",
-        headers: {
-            "Content-Type": "application/json",
-            "X-CSRFToken": "{{ csrf_token }}"
-        },
-        body: JSON.stringify({reset_viewerstate: true})
-    })
-    .then(response => response.text())
-    .then(html => {
-        document.getElementById('viewerstate-save-response').innerHTML = html;
+    <script>
+        document.getElementById('save-viewerstate').addEventListener('click', function() {
+            let viewerState = window.exportViewerState_root();
+            if (!viewerState) {
+                document.getElementById('viewerstate-save-response').innerHTML = "<span class='text-danger'>Viewer state could not be retrieved.</span>";
+                return;
+            }
+            fetch({% if case_number %}"{% url 'atlas:collection_case_displaysetup' casedetail.collection.pk case_number=case_number %}"{% else %}"{% url 'atlas:collection_case_displaysetup_legacy' casedetail.collection.pk casedetail.case.pk %}"{% endif %}, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    "X-CSRFToken": "{{ csrf_token }}"
+                },
+                body: JSON.stringify({viewerstate: viewerState})
+            })
+                .then(response => response.text())
+                .then(html => {
+                    document.getElementById('viewerstate-save-response').innerHTML = html;
+                })
+                .catch(error => {
+                    document.getElementById('viewerstate-save-response').innerHTML = "<span class='text-danger'>Error saving viewer state.</span>";
+                });
+        });
+        document.getElementById('reset-viewerstate').addEventListener('click', function() {
+            fetch({% if case_number %}"{% url 'atlas:collection_case_displaysetup' casedetail.collection.pk case_number=case_number %}"{% else %}"{% url 'atlas:collection_case_displaysetup_legacy' casedetail.collection.pk casedetail.case.pk %}"{% endif %}, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    "X-CSRFToken": "{{ csrf_token }}"
+                },
+                body: JSON.stringify({reset_viewerstate: true})
+            })
+                .then(response => response.text())
+                .then(html => {
+                    document.getElementById('viewerstate-save-response').innerHTML = html;
         // Optionally reload the page or viewer here if needed
-    })
-    .catch(error => {
-        document.getElementById('viewerstate-save-response').innerHTML = "<span class='text-danger'>Error resetting viewer state.</span>";
-    });
-});
-</script>
+                })
+                .catch(error => {
+                    document.getElementById('viewerstate-save-response').innerHTML = "<span class='text-danger'>Error resetting viewer state.</span>";
+                });
+        });
+    </script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/atlas/templates/atlas/collection_case_view_take.html b/atlas/templates/atlas/collection_case_view_take.html
index e0f11093..cb16cbae 100644
--- a/atlas/templates/atlas/collection_case_view_take.html
+++ b/atlas/templates/atlas/collection_case_view_take.html
@@ -77,7 +77,7 @@
 
     {% if collection.show_ohif_viewer_link %}
         <div>
-                {% if question_completed %}
+            {% if question_completed %}
                 <a target="_blank" href="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% if case_number %}{% url 'atlas:collection_case_dicom_json_review' collection.pk case_number=case_number %}{% else %}{% url 'atlas:collection_case_dicom_json_review_legacy' collection.pk case.pk %}{% endif %}" title="Click to open the case in the advanced viewer. This will open in a new tab/window."><button class="viewer"><i class="bi bi-collection"></i> Launch advanced viewer.</button></a>
             {% else %}
                 <a target="_blank" href="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% if case_number %}{% url 'atlas:collection_case_dicom_json' collection.pk case_number=case_number %}{% else %}{% url 'atlas:collection_case_dicom_json_legacy' collection.pk case.pk %}{% endif %}" title="Click to open the case in the advanced viewer. This will open in a new tab/window."><button class="viewer"><i class="bi bi-collection"></i> Launch advanced viewer.</button></a>
diff --git a/atlas/templates/atlas/partials/_prior_card.html b/atlas/templates/atlas/partials/_prior_card.html
index a8e18b7c..10e84a7e 100644
--- a/atlas/templates/atlas/partials/_prior_card.html
+++ b/atlas/templates/atlas/partials/_prior_card.html
@@ -24,14 +24,14 @@
                     <a href="{% url 'atlas:case_detail' case.id %}" class="btn btn-sm btn-outline-primary">View case</a>
                 </div>
 
-                                {% if not added %}
-                                        <form class="row g-2"
-                                                    {% if case_number %}
-                                                        hx-post="{% url 'atlas:collection_case_priors' collection.id case_number=case_number %}"
-                                                    {% else %}
-                                                        hx-post="{% url 'atlas:collection_case_priors_legacy' collection.id casedetail.case.pk %}"
-                                                    {% endif %}
-                                                    hx-target="#prior-card-{{case.id}}" hx-swap="outerHTML">
+                {% if not added %}
+                    <form class="row g-2"
+                          {% if case_number %}
+                              hx-post="{% url 'atlas:collection_case_priors' collection.id case_number=case_number %}"
+                          {% else %}
+                              hx-post="{% url 'atlas:collection_case_priors_legacy' collection.id casedetail.case.pk %}"
+                          {% endif %}
+                          hx-target="#prior-card-{{case.id}}" hx-swap="outerHTML">
                         {% csrf_token %}
                         <input type="hidden" name="prior_case_id" value="{{case.id}}" />
                         <div class="col-12">
@@ -49,13 +49,13 @@
                         </div>
                     </form>
                 {% else %}
-                                        <form
-                                                {% if case_number %}
-                                                    hx-post="{% url 'atlas:collection_case_priors' collection.id case_number=case_number %}"
-                                                {% else %}
-                                                    hx-post="{% url 'atlas:collection_case_priors_legacy' collection.id casedetail.case.pk %}"
-                                                {% endif %}
-                                                hx-target="#prior-card-{{case.id}}" hx-swap="outerHTML">
+                    <form
+                        {% if case_number %}
+                            hx-post="{% url 'atlas:collection_case_priors' collection.id case_number=case_number %}"
+                        {% else %}
+                            hx-post="{% url 'atlas:collection_case_priors_legacy' collection.id casedetail.case.pk %}"
+                        {% endif %}
+                        hx-target="#prior-card-{{case.id}}" hx-swap="outerHTML">
                         {% csrf_token %}
                         <input type="hidden" name="remove" value="{{case.id}}" />
                         <div class="mb-2 small text-muted">Current relation: <strong>{{relation}}</strong></div>
diff --git a/atlas/templates/atlas/partials/casedetails_management_links.html b/atlas/templates/atlas/partials/casedetails_management_links.html
index 24aecf31..48776660 100644
--- a/atlas/templates/atlas/partials/casedetails_management_links.html
+++ b/atlas/templates/atlas/partials/casedetails_management_links.html
@@ -1,14 +1,14 @@
     <div class="btn-group btn-group-sm me-2" role="group" aria-label="management-actions">
-        <a class="btn btn-outline-secondary" href="{% url 'atlas:collection_case_displaysetup' casedetail.collection.pk casedetail.get_case_index %}" title="Setup default display">
+        <a class="btn btn-outline-secondary" href="{% url 'atlas:collection_case_displaysetup_legacy' casedetail.collection.pk casedetail.case.pk %}" title="Setup default display">
             <i class="bi bi-display"></i>
         </a>
 
-        <a class="btn btn-outline-secondary" href="{% url 'atlas:collection_case_details' casedetail.collection.pk casedetail.get_case_index %}" title="Case details">
+        <a class="btn btn-outline-secondary" href="{% url 'atlas:collection_case_details_legacy' casedetail.collection.pk casedetail.case.pk %}" title="Case details">
             <i class="bi bi-info-square"></i>
         </a>
 
         {% if collection.collection_type == "QUE" %}
-            <a class="btn btn-outline-secondary" href='{% url "atlas:collection_case_questions" casedetail.collection.pk casedetail.get_case_index %}' title="Manage questions">
+            <a class="btn btn-outline-secondary" href='{% url "atlas:collection_case_questions_legacy" casedetail.collection.pk casedetail.case.pk %}' title="Manage questions">
                 {% if casedetail.question_schema %}
                     <i class="bi bi-question-square text-success"></i>
                 {% else %}
diff --git a/atlas/urls.py b/atlas/urls.py
index 00197e45..8bc4cc74 100755
--- a/atlas/urls.py
+++ b/atlas/urls.py
@@ -174,7 +174,7 @@ urlpatterns = [
     ),
     # Backwards-compatible redirect from legacy case_id-style URLs
     path(
-        "collection/<int:exam_id>/case/<int:case_id>/details",
+        "collection/<int:exam_id>/case/id/<int:case_id>/details",
         views.redirect_collection_case_details_by_id,
         name="collection_case_details_legacy",
     ),
@@ -184,7 +184,7 @@ urlpatterns = [
         name="collection_case_questions",
     ),
     path(
-        "collection/<int:exam_id>/case/<int:case_id>/questions",
+        "collection/<int:exam_id>/case/id/<int:case_id>/questions",
         views.redirect_collection_case_questions_by_id,
         name="collection_case_questions_legacy",
     ),
@@ -194,7 +194,7 @@ urlpatterns = [
         name="collection_case_priors",
     ),
     path(
-        "collection/<int:exam_id>/case/<int:case_id>/priors",
+        "collection/<int:exam_id>/case/id/<int:case_id>/priors",
         views.redirect_collection_case_priors_by_id,
         name="collection_case_priors_legacy",
     ),
@@ -204,7 +204,7 @@ urlpatterns = [
         name="collection_case_dicom_json",
     ),
     path(
-        "collection/<int:exam_id>/case/<int:case_id>/dicom_json",
+        "collection/<int:exam_id>/case/id/<int:case_id>/dicom_json",
         views.redirect_collection_case_dicom_json_by_id,
         name="collection_case_dicom_json_legacy",
     ),
@@ -214,7 +214,7 @@ urlpatterns = [
         name="collection_case_dicom_json_review",
     ),
     path(
-        "collection/<int:exam_id>/case/<int:case_id>/dicom_json/review",
+        "collection/<int:exam_id>/case/id/<int:case_id>/dicom_json/review",
         views.redirect_collection_case_dicom_json_review_by_id,
         name="collection_case_dicom_json_review_legacy",
     ),
@@ -300,7 +300,7 @@ urlpatterns = [
     ),
     # legacy path that used case PK; redirect to canonical case_number URL
     path(
-        "collection/<int:pk>/<int:case_id>",
+        "collection/<int:pk>/id/<int:case_id>",
         views.redirect_collection_case_view_by_id,
         name="collection_case_view_legacy",
     ),
@@ -310,7 +310,7 @@ urlpatterns = [
         name="collection_case_displaysetup",
     ),
     path(
-        "collection/<int:collection_id>/<int:case_id>/display_setup",
+        "collection/<int:collection_id>/id/<int:case_id>/display_setup",
         views.redirect_collection_case_displaysetup_by_id,
         name="collection_case_displaysetup_legacy",
     ),
@@ -320,7 +320,7 @@ urlpatterns = [
         name="collection_case_view_take",
     ),
     path(
-        "collection/<int:pk>/<int:case_id>/take/<int:cid>/<str:passcode>",
+        "collection/<int:pk>/id/<int:case_id>/take/<int:cid>/<str:passcode>",
         views.redirect_collection_case_view_take_by_id,
         name="collection_case_view_take_legacy",
     ),
@@ -330,7 +330,7 @@ urlpatterns = [
         name="collection_case_view_take_user",
     ),
     path(
-        "collection/<int:pk>/<int:case_id>/take/",
+        "collection/<int:pk>/id/<int:case_id>/take/",
         views.redirect_collection_case_view_take_user_by_id,
         name="collection_case_view_take_user_legacy",
     ),
@@ -340,7 +340,7 @@ urlpatterns = [
         name="collection_case_view_take_user_answers",
     ),
     path(
-        "collection/<int:pk>/<int:case_id>/take/answers",
+        "collection/<int:pk>/id/<int:case_id>/take/answers",
         views.redirect_collection_case_view_take_user_answers_by_id,
         name="collection_case_view_take_user_answers_legacy",
     ),