diff --git a/groups-adlists.php b/groups-adlists.php
index ae5c98ed..e43f76a3 100644
--- a/groups-adlists.php
+++ b/groups-adlists.php
@@ -73,6 +73,8 @@
     </div>
 </div>
 
+<script src="scripts/vendor/bootstrap-select.min.js"></script>
+<script src="scripts/vendor/bootstrap-toggle.min.js"></script>
 <script src="scripts/pi-hole/js/utils.js"></script>
 <script src="scripts/pi-hole/js/groups-adlists.js"></script>
 
diff --git a/groups-clients.php b/groups-clients.php
index e982fea0..e7c6bea6 100644
--- a/groups-clients.php
+++ b/groups-clients.php
@@ -74,6 +74,8 @@
     </div>
 </div>
 
+<script src="scripts/vendor/bootstrap-select.min.js"></script>
+<script src="scripts/vendor/bootstrap-toggle.min.js"></script>
 <script src="scripts/pi-hole/js/ip-address-sorting.js"></script>
 <script src="scripts/pi-hole/js/utils.js"></script>
 <script src="scripts/pi-hole/js/groups-clients.js"></script>
diff --git a/groups-domains.php b/groups-domains.php
index a1afd314..3d23b723 100644
--- a/groups-domains.php
+++ b/groups-domains.php
@@ -139,6 +139,8 @@
     </div>
 </div>
 
+<script src="scripts/vendor/bootstrap-select.min.js"></script>
+<script src="scripts/vendor/bootstrap-toggle.min.js"></script>
 <script src="scripts/pi-hole/js/utils.js"></script>
 <script src="scripts/pi-hole/js/groups-domains.js"></script>
 
diff --git a/groups.php b/groups.php
index e7680cfa..3ced6a87 100644
--- a/groups.php
+++ b/groups.php
@@ -71,6 +71,8 @@
     </div>
 </div>
 
+<script src="scripts/vendor/bootstrap-select.min.js"></script>
+<script src="scripts/vendor/bootstrap-toggle.min.js"></script>
 <script src="scripts/pi-hole/js/utils.js"></script>
 <script src="scripts/pi-hole/js/groups.js"></script>
 
diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index a76602dd..02f1ed45 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -208,7 +208,7 @@
     <link rel="stylesheet" href="style/vendor/AdminLTE.min.css">
     <link rel="stylesheet" href="style/vendor/animate.min.css">
 
-<?php if(in_array($scriptname, array("groups.php", "groups-clients.php", "groups-domains.php", "groups-adlists.php"))){ ?>
+<?php if (in_array($scriptname, array("groups.php", "groups-adlists.php", "groups-clients.php", "groups-domains.php"))){ ?>
     <link rel="stylesheet" href="style/vendor/bootstrap-select.min.css">
     <link rel="stylesheet" href="style/vendor/bootstrap-toggle.min.css">
 <?php } ?>
@@ -222,12 +222,6 @@
     <script src="style/vendor/bootstrap/js/bootstrap.min.js"></script>
     <script src="scripts/vendor/adminlte.min.js"></script>
     <script src="scripts/vendor/bootstrap-notify.min.js"></script>
-
-<?php if(in_array($scriptname, array("groups.php", "groups-clients.php", "groups-domains.php", "groups-adlists.php"))){ ?>
-    <script src="scripts/vendor/bootstrap-select.min.js"></script>
-    <script src="scripts/vendor/bootstrap-toggle.min.js"></script>
-<?php } ?>
-
     <script src="scripts/vendor/datatables.min.js"></script>
     <script src="scripts/vendor/moment.min.js"></script>
     <script src="scripts/vendor/Chart.min.js"></script>
@@ -499,7 +493,7 @@ if($auth) {
                     </a>
                 </li>
                 <!-- Group Management -->
-                <li class="treeview<?php if(in_array($scriptname, array("groups.php", "groups-clients.php", "groups-domains.php", "groups-adlists.php"))){ ?> active<?php } ?>">
+                <li class="treeview<?php if (in_array($scriptname, array("groups.php", "groups-adlists.php", "groups-clients.php", "groups-domains.php"))){ ?> active<?php } ?>">
                   <a href="#">
                     <i class="fa fa-users-cog"></i> <span>Group Management</span>
                     <span class="pull-right-container">
@@ -575,7 +569,7 @@ if($auth) {
                     </a>
                 </li>
                 <!-- Tools -->
-                <li class="treeview<?php if(in_array($scriptname, array("messages.php", "gravity.php", "queryads.php", "auditlog.php", "taillog.php", "taillog-FTL.php", "debug.php", "network.php"))){ ?> active<?php } ?>">
+                <li class="treeview<?php if (in_array($scriptname, array("messages.php", "gravity.php", "queryads.php", "auditlog.php", "taillog.php", "taillog-FTL.php", "debug.php", "network.php"))){ ?> active<?php } ?>">
                   <a href="#">
                     <i class="fa fa-folder"></i> <span>Tools</span>
                     <span class="pull-right-container">