diff --git a/auditlog.php b/auditlog.php
index cb3db9af..86ebb685 100644
--- a/auditlog.php
+++ b/auditlog.php
@@ -82,8 +82,9 @@
     </div>
   </div>
 </div>
+
+<script src="scripts/pi-hole/js/auditlog.js"></script>
+
 <?php
     require "scripts/pi-hole/php/footer.php";
 ?>
-
-<script src="scripts/pi-hole/js/auditlog.js"></script>
diff --git a/db_graph.php b/db_graph.php
index 2642bf14..6bc207eb 100644
--- a/db_graph.php
+++ b/db_graph.php
@@ -62,10 +62,10 @@ $token = $_SESSION['token'];
     </div>
 </div>
 
-<?php
-    require "scripts/pi-hole/php/footer.php";
-?>
-
 <script src="scripts/vendor/moment.min.js"></script>
 <script src="scripts/vendor/daterangepicker.js"></script>
 <script src="scripts/pi-hole/js/db_graph.js"></script>
+
+<?php
+    require "scripts/pi-hole/php/footer.php";
+?>
diff --git a/db_lists.php b/db_lists.php
index c0e39408..64517548 100644
--- a/db_lists.php
+++ b/db_lists.php
@@ -138,10 +138,10 @@ else
     <!-- /.col -->
 </div>
 
-<?php
-    require "scripts/pi-hole/php/footer.php";
-?>
-
 <script src="scripts/vendor/moment.min.js"></script>
 <script src="scripts/vendor/daterangepicker.js"></script>
 <script src="scripts/pi-hole/js/db_lists.js"></script>
+
+<?php
+    require "scripts/pi-hole/php/footer.php";
+?>
diff --git a/db_queries.php b/db_queries.php
index ddb633f2..635d87ae 100644
--- a/db_queries.php
+++ b/db_queries.php
@@ -176,11 +176,10 @@ $token = $_SESSION['token'];
 </div>
 <!-- /.row -->
 
+<script src="scripts/vendor/moment.min.js"></script>
+<script src="scripts/vendor/daterangepicker.js"></script>
+<script src="scripts/pi-hole/js/db_queries.js"></script>
 
 <?php
     require "scripts/pi-hole/php/footer.php";
 ?>
-
-<script src="scripts/vendor/moment.min.js"></script>
-<script src="scripts/vendor/daterangepicker.js"></script>
-<script src="scripts/pi-hole/js/db_queries.js"></script>
diff --git a/debug.php b/debug.php
index 20ffa7c8..9840331f 100644
--- a/debug.php
+++ b/debug.php
@@ -17,9 +17,8 @@
 <button class="btn btn-lg btn-primary btn-block" id="debugBtn">Generate debug log</button>
 <pre id="output" style="width: 100%; height: 100%;" hidden="true"></pre>
 
+<script src="scripts/pi-hole/js/debug.js"></script>
+
 <?php
     require "scripts/pi-hole/php/footer.php";
 ?>
-
-
-<script src="scripts/pi-hole/js/debug.js"></script>
diff --git a/gravity.php b/gravity.php
index 1b1bd3bb..d86be424 100644
--- a/gravity.php
+++ b/gravity.php
@@ -25,9 +25,8 @@
 <button class="btn btn-lg btn-primary btn-block" id="gravityBtn">Update</button>
 <pre id="output" style="width: 100%; height: 100%;" hidden="true"></pre>
 
+<script src="scripts/pi-hole/js/gravity.js"></script>
+
 <?php
     require "scripts/pi-hole/php/footer.php";
 ?>
-
-
-<script src="scripts/pi-hole/js/gravity.js"></script>
diff --git a/index.php b/index.php
index b2a66a4b..e090a445 100644
--- a/index.php
+++ b/index.php
@@ -348,8 +348,9 @@ else
 </div>
 <!-- /.row -->
 <?php } ?>
+
+<script src="scripts/pi-hole/js/index.js"></script>
+
 <?php
     require "scripts/pi-hole/php/footer.php";
 ?>
-
-<script src="scripts/pi-hole/js/index.js"></script>
diff --git a/list.php b/list.php
index da0a373c..75b14a92 100644
--- a/list.php
+++ b/list.php
@@ -75,8 +75,8 @@ function getFullName() {
 <ul class="list-group" id="list-regex"></ul>
 <?php } ?>
 
+<script src="scripts/pi-hole/js/list.js"></script>
+
 <?php
 require "scripts/pi-hole/php/footer.php";
 ?>
-
-<script src="scripts/pi-hole/js/list.js"></script>
diff --git a/queries.php b/queries.php
index 8e7133d0..51c543e6 100644
--- a/queries.php
+++ b/queries.php
@@ -165,9 +165,9 @@ if(strlen($showing) > 0)
 </div>
 <!-- /.row -->
 
+<script src="scripts/vendor/moment.min.js"></script>
+<script src="scripts/pi-hole/js/queries.js"></script>
+
 <?php
     require "scripts/pi-hole/php/footer.php";
 ?>
-
-<script src="scripts/vendor/moment.min.js"></script>
-<script src="scripts/pi-hole/js/queries.js"></script>
diff --git a/queryads.php b/queryads.php
index 0fe5850c..3c14765b 100644
--- a/queryads.php
+++ b/queryads.php
@@ -23,9 +23,8 @@
 
 <pre id="output" style="width: 100%; height: 100%;" hidden="true"></pre>
 
+<script src="scripts/pi-hole/js/queryads.js"></script>
+
 <?php
     require "scripts/pi-hole/php/footer.php";
 ?>
-
-
-<script src="scripts/pi-hole/js/queryads.js"></script>
diff --git a/scripts/pi-hole/php/footer.php b/scripts/pi-hole/php/footer.php
index 43cc2041..06687e99 100644
--- a/scripts/pi-hole/php/footer.php
+++ b/scripts/pi-hole/php/footer.php
@@ -66,16 +66,6 @@
     </footer>
 </div>
 <!-- ./wrapper -->
-<script src="scripts/vendor/jquery.min.js"></script>
-<script src="scripts/vendor/jquery-ui.min.js"></script>
-<script src="style/vendor/bootstrap/js/bootstrap.min.js"></script>
-<script src="scripts/vendor/app.min.js"></script>
-
-<script src="scripts/vendor/jquery.dataTables.min.js"></script>
-<script src="scripts/vendor/dataTables.bootstrap.min.js"></script>
-<script src="scripts/vendor/Chart.bundle.min.js"></script>
-
 <script src="scripts/pi-hole/js/footer.js"></script>
-
 </body>
 </html>
diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index ed5bf0ba..c4c99e71 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -220,6 +220,16 @@ if($auth) {
 }
 ?>
 <script src="scripts/pi-hole/js/header.js"></script>
+
+<script src="scripts/vendor/jquery.min.js"></script>
+<script src="scripts/vendor/jquery-ui.min.js"></script>
+<script src="style/vendor/bootstrap/js/bootstrap.min.js"></script>
+<script src="scripts/vendor/app.min.js"></script>
+
+<script src="scripts/vendor/jquery.dataTables.min.js"></script>
+<script src="scripts/vendor/dataTables.bootstrap.min.js"></script>
+<script src="scripts/vendor/Chart.bundle.min.js"></script>
+
 <!-- Send token to JS -->
 <div id="token" hidden><?php if($auth) echo $token; ?></div>
 <div id="enableTimer" hidden><?php if(file_exists("../custom_disable_timer")){ echo file_get_contents("../custom_disable_timer"); } ?></div>
diff --git a/settings.php b/settings.php
index b9cf25c2..fca9a3cd 100644
--- a/settings.php
+++ b/settings.php
@@ -1383,11 +1383,11 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
     </div>
 </div>
 
-<?php
-require "scripts/pi-hole/php/footer.php";
-?>
-
 <script src="scripts/vendor/jquery.inputmask.js"></script>
 <script src="scripts/vendor/jquery.inputmask.extensions.js"></script>
 <script src="scripts/vendor/jquery.confirm.min.js"></script>
 <script src="scripts/pi-hole/js/settings.js"></script>
+
+<?php
+require "scripts/pi-hole/php/footer.php";
+?>
diff --git a/taillog-FTL.php b/taillog-FTL.php
index 53b454ad..fd40f223 100644
--- a/taillog-FTL.php
+++ b/taillog-FTL.php
@@ -16,9 +16,8 @@
 <pre id="output" style="width: 100%; height: 100%; max-height:650px; overflow-y:scroll;"></pre>
 <div class="checkbox"><label><input type="checkbox" name="active" checked id="chk2"> Automatic scrolling on update</label></div>
 
+<script src="scripts/pi-hole/js/taillog-FTL.js"></script>
+
 <?php
     require "scripts/pi-hole/php/footer.php";
 ?>
-
-
-<script src="scripts/pi-hole/js/taillog-FTL.js"></script>
diff --git a/taillog.php b/taillog.php
index 895cba56..a03c45dc 100644
--- a/taillog.php
+++ b/taillog.php
@@ -16,9 +16,8 @@
 <pre id="output" style="width: 100%; height: 100%; max-height:650px; overflow-y:scroll;"></pre>
 <div class="checkbox"><label><input type="checkbox" name="active" checked id="chk2"> Automatic scrolling on update</label></div>
 
+<script src="scripts/pi-hole/js/taillog.js"></script>
+
 <?php
     require "scripts/pi-hole/php/footer.php";
 ?>
-
-
-<script src="scripts/pi-hole/js/taillog.js"></script>