diff --git a/rapids/templates/rapids/exam_overview.html b/rapids/templates/rapids/exam_overview.html
index 70a57228..b33fc6c0 100644
--- a/rapids/templates/rapids/exam_overview.html
+++ b/rapids/templates/rapids/exam_overview.html
@@ -1,5 +1,4 @@
 {% extends 'rapids/exams.html' %}
-{% extends 'exam_overview_js.html' %}
 
 {% block content %}
 
@@ -85,4 +84,5 @@
         <button id='button-closed-access' data-posturl="{% url 'rapids:exam_json_edit' pk=exam.pk %}">Make questions closed access</button>
 
     </div>
+{% includes 'exam_overview_js.html' %}
 {% endblock %}
diff --git a/templates/exam_overview_js.html b/templates/exam_overview_js.html
index 5651733b..08180358 100644
--- a/templates/exam_overview_js.html
+++ b/templates/exam_overview_js.html
@@ -1,19 +1,18 @@
-{% block js %}
-    <script type="text/javascript">
-        $(document).ready(function () {
-            // send request to change the is_private state on customSwitches toggle
-            $("#exam-active-switch").on("change", function (evt) {
-                $.ajax({
-                    url: evt.currentTarget.dataset.posturl,
-                    data: {
-                        csrfmiddlewaretoken: "{{ csrf_token }}",
-                        active: this.checked // true if checked else false
-                    },
-                    type: "POST",
-                    dataType: "json",
-                })
+<script type="text/javascript">
+    $(document).ready(function () {
+        // send request to change the is_private state on customSwitches toggle
+        $("#exam-active-switch").on("change", function (evt) {
+            $.ajax({
+                url: evt.currentTarget.dataset.posturl,
+                data: {
+                    csrfmiddlewaretoken: "{{ csrf_token }}",
+                    active: this.checked // true if checked else false
+                },
+                type: "POST",
+                dataType: "json",
+            })
                 // $.ajax().done(), $.ajax().fail(), $ajax().always() are upto you. Add/change accordingly
-                    .done(function (data) {
+                .done(function (data) {
                     console.log(data);
 
                     if (data.status == "success") {
@@ -22,22 +21,22 @@
                     // show some message according to the response.
                     // For eg. A message box showing that the status has been changed
                 })
-                    .always(function () {
+                .always(function () {
                     console.log('[Done]');
                 })
+        })
+        $("#exam-publish-results-switch").on("change", function (evt) {
+            $.ajax({
+                url: evt.currentTarget.dataset.posturl,
+                data: {
+                    csrfmiddlewaretoken: "{{ csrf_token }}",
+                    publish_results: this.checked // true if checked else false
+                },
+                type: "POST",
+                dataType: "json",
             })
-            $("#exam-publish-results-switch").on("change", function (evt) {
-                $.ajax({
-                    url: evt.currentTarget.dataset.posturl,
-                    data: {
-                        csrfmiddlewaretoken: "{{ csrf_token }}",
-                        publish_results: this.checked // true if checked else false
-                    },
-                    type: "POST",
-                    dataType: "json",
-                })
                 // $.ajax().done(), $.ajax().fail(), $ajax().always() are upto you. Add/change accordingly
-                    .done(function (data) {
+                .done(function (data) {
                     console.log(data);
 
                     if (data.status == "success") {
@@ -46,22 +45,22 @@
                     // show some message according to the response.
                     // For eg. A message box showing that the status has been changed
                 })
-                    .always(function () {
+                .always(function () {
                     console.log('[Done]');
                 })
+        })
+        $("#button-open-access").click(function (evt) {
+            $.ajax({
+                url: evt.currentTarget.dataset.posturl,
+                data: {
+                    csrfmiddlewaretoken: "{{ csrf_token }}",
+                    set_open_access: true,
+                },
+                type: "POST",
+                dataType: "json",
             })
-            $("#button-open-access").click(function (evt) {
-                $.ajax({
-                    url: evt.currentTarget.dataset.posturl,
-                    data: {
-                        csrfmiddlewaretoken: "{{ csrf_token }}",
-                        set_open_access: true,
-                    },
-                    type: "POST",
-                    dataType: "json",
-                })
                 // $.ajax().done(), $.ajax().fail(), $ajax().always() are upto you. Add/change accordingly
-                    .done(function (data) {
+                .done(function (data) {
                     console.log(data);
 
                     if (data.status == "success") {
@@ -71,25 +70,25 @@
                         toastr.info(data.status);
                     }
                 })
-                    .fail((e) => {
+                .fail((e) => {
                     toastr.warning(`Error, ${e}`);
                 })
-                    .always(function () {
+                .always(function () {
                     console.log('[Done]');
                 })
+        })
+        $("#button-closed-access").click(function (evt) {
+            $.ajax({
+                url: evt.currentTarget.dataset.posturl,
+                data: {
+                    csrfmiddlewaretoken: "{{ csrf_token }}",
+                    set_open_access: false,
+                },
+                type: "POST",
+                dataType: "json",
             })
-            $("#button-closed-access").click(function (evt) {
-                $.ajax({
-                    url: evt.currentTarget.dataset.posturl,
-                    data: {
-                        csrfmiddlewaretoken: "{{ csrf_token }}",
-                        set_open_access: false,
-                    },
-                    type: "POST",
-                    dataType: "json",
-                })
                 // $.ajax().done(), $.ajax().fail(), $ajax().always() are upto you. Add/change accordingly
-                    .done(function (data) {
+                .done(function (data) {
                     console.log(data);
 
                     if (data.status == "success") {
@@ -99,49 +98,47 @@
                         toastr.info(data.status);
                     }
                 })
-                    .fail((e) => {
+                .fail((e) => {
                     toastr.warning(`Error, ${e}`);
                 })
-                    .always(function () {
+                .always(function () {
                     console.log('[Done]');
                 })
-            })
-            $("#button-edit-order").click(function (evt) {
-                $(this).remove();
-                sortable('.sortable');
+        })
+        $("#button-edit-order").click(function (evt) {
+            $(this).remove();
+            sortable('.sortable');
 
-                $("#full-question-list").append($(
-                    "<button title='click and drag questions to change order'>Save exam order</button>"
-                ).click(() => {
-                    new_order = [];
-                    $("#full-question-list li").each((n, el) => {
-                        new_order.push(el.dataset.question_pk)
-                    })
-                    $.ajax({
-                        url: evt.currentTarget.dataset.posturl,
-                        data: {
-                            csrfmiddlewaretoken: "{{ csrf_token }}",
-                            set_exam_order: JSON.stringify(new_order),
-                        },
-                        type: "POST",
-                        dataType: "json",
-                    })
+            $("#full-question-list").append($(
+                "<button title='click and drag questions to change order'>Save exam order</button>"
+            ).click(() => {
+                new_order = [];
+                $("#full-question-list li").each((n, el) => {
+                    new_order.push(el.dataset.question_pk)
+                })
+                $.ajax({
+                    url: evt.currentTarget.dataset.posturl,
+                    data: {
+                        csrfmiddlewaretoken: "{{ csrf_token }}",
+                        set_exam_order: JSON.stringify(new_order),
+                    },
+                    type: "POST",
+                    dataType: "json",
+                })
                     // $.ajax().done(), $.ajax().fail(), $ajax().always() are upto you. Add/change accordingly
-                        .done(function (data) {
+                    .done(function (data) {
                         console.log(data);
 
                         if (data.status == "success") {
                             toastr.info('Exam order changed.')
                         }
                     })
-                        .always(function () {
+                    .always(function () {
                         console.log('[Done]');
                     })
-                }));
-            });
-
-
+            }));
         });
-    </script>
-{% endblock js %}
-    
\ No newline at end of file
+
+
+    });
+</script>
\ No newline at end of file