diff --git a/debug.php b/debug.php
index ccb139c7..db721cad 100644
--- a/debug.php
+++ b/debug.php
@@ -14,7 +14,7 @@
 
 <p><input type="checkbox" id="upload"> Upload debug log and provide token once finished</p>
 <p>Once you click this button a debug log will be generated and can automatically be uploaded if we detect a working internet connection.</p>
-<button class="btn btn-lg btn-primary btn-block" id="debugBtn">Generate debug log</button>
+<button type="button" id="debugBtn" class="btn btn-lg btn-primary btn-block">Generate debug log</button>
 <pre id="output" style="width: 100%; height: 100%;" hidden="true"></pre>
 
 <script src="scripts/pi-hole/js/debug.js"></script>
diff --git a/dns_records.php b/dns_records.php
index 0ff0e2f4..d95e7739 100644
--- a/dns_records.php
+++ b/dns_records.php
@@ -39,7 +39,7 @@
                 </div>
             </div>
             <div class="box-footer clearfix">
-                <button id="btnAdd" class="btn btn-primary pull-right">Add</button>
+                <button type="button" id="btnAdd" class="btn btn-primary pull-right">Add</button>
             </div>
         </div>
     </div>
diff --git a/gravity.php b/gravity.php
index b73cf514..4ae73ebb 100644
--- a/gravity.php
+++ b/gravity.php
@@ -22,7 +22,7 @@
     Success!
 </div>
 
-<button class="btn btn-lg btn-primary btn-block" id="gravityBtn">Update</button>
+<button type="button" id="gravityBtn" class="btn btn-lg btn-primary btn-block">Update</button>
 <pre id="output" style="width: 100%; height: 100%;" hidden="true"></pre>
 
 <script src="scripts/pi-hole/js/gravity.js"></script>
diff --git a/groups-adlists.php b/groups-adlists.php
index aef8f884..d6f93238 100644
--- a/groups-adlists.php
+++ b/groups-adlists.php
@@ -38,7 +38,7 @@
             </div>
             <div class="box-footer clearfix">
                 <strong>Hint:</strong>&nbsp;Please run <code>pihole -g</code> or update your gravity list <a href="gravity.php">online</a> after modifying your adlists.
-                <button id="btnAdd" class="btn btn-primary pull-right">Add</button>
+                <button type="button" id="btnAdd" class="btn btn-primary pull-right">Add</button>
             </div>
         </div>
     </div>
diff --git a/groups-clients.php b/groups-clients.php
index d16445af..6888ccc9 100644
--- a/groups-clients.php
+++ b/groups-clients.php
@@ -40,7 +40,7 @@
                 </div>
             </div>
             <div class="box-footer clearfix">
-                <button id="btnAdd" class="btn btn-primary pull-right">Add</button>
+                <button type="button" id="btnAdd" class="btn btn-primary pull-right">Add</button>
             </div>
         </div>
     </div>
diff --git a/groups.php b/groups.php
index aeddf336..6367a2cc 100644
--- a/groups.php
+++ b/groups.php
@@ -37,7 +37,7 @@
                 </div>
             </div>
             <div class="box-footer clearfix">
-                <button id="btnAdd" class="btn btn-primary pull-right">Add</button>
+                <button type="button" id="btnAdd" class="btn btn-primary pull-right">Add</button>
             </div>
         </div>
     </div>
diff --git a/queries.php b/queries.php
index 20c65305..6779be74 100644
--- a/queries.php
+++ b/queries.php
@@ -83,15 +83,6 @@ if(strlen($showing) > 0)
 <!-- Send PHP info to JS -->
 <div id="token" hidden><?php echo $token ?></div>
 
-
-<!--
-<div class="row">
-    <div class="col-md-12">
-        <button class="btn btn-info margin-bottom pull-right">Refresh Data</button>
-    </div>
-</div>
--->
-
 <!-- Alert Modal -->
 <div id="alertModal" class="modal fade" role="dialog" data-backdrop="static" data-keyboard="false">
     <div class="vertical-alignment-helper">
diff --git a/queryads.php b/queryads.php
index 62ea890b..344e5ae7 100644
--- a/queryads.php
+++ b/queryads.php
@@ -16,8 +16,8 @@
     <input id="domain" type="url" class="form-control" placeholder="Domain to look for (example.com or sub.example.com)" autocomplete="off" spellcheck="false" autocapitalize="none" autocorrect="off">
 	<input id="quiet" type="hidden" value="no">
     <span class="input-group-btn">
-        <button id="btnSearch" class="btn btn-default" type="button">Search partial match</button>
-        <button id="btnSearchExact" class="btn btn-default" type="button">Search exact match</button>
+        <button type="button" id="btnSearch" class="btn btn-default">Search partial match</button>
+        <button type="button" id="btnSearchExact" class="btn btn-default">Search exact match</button>
     </span>
 </div>
 
diff --git a/scripts/pi-hole/js/auditlog.js b/scripts/pi-hole/js/auditlog.js
index 05189d6b..00e02107 100644
--- a/scripts/pi-hole/js/auditlog.js
+++ b/scripts/pi-hole/js/auditlog.js
@@ -45,7 +45,10 @@ function updateTopLists() {
             url +
             "</td> <td>" +
             data.top_queries[domain] +
-            '</td> <td> <button type="button" class="btn btn-default btn-sm text-red"><i class="fa fa-ban"></i> Blacklist</button> <button class="btn btn-default btn-sm text-orange"><i class="fa fa-balance-scale"></i> Audit</button> </td> </tr> '
+            "</td> <td>" +
+            '<button type="button" class="btn btn-default btn-sm text-red"><i class="fa fa-ban"></i> Blacklist</button>' +
+            '<button type="button" class="btn btn-default btn-sm text-orange"><i class="fa fa-balance-scale"></i> Audit</button>' +
+            "</td> </tr> "
         );
       }
     }
@@ -67,7 +70,9 @@ function updateTopLists() {
               url +
               "</td> <td>" +
               data.top_ads[domain] +
-              '</td> <td> <button type="button" class="btn btn-default btn-sm text-orange"><i class="fa fa-balance-scale"></i> Audit</button> </td> </tr> '
+              "</td> <td>" +
+              '<button type="button" class="btn btn-default btn-sm text-orange"><i class="fa fa-balance-scale"></i> Audit</button>' +
+              "</td> </tr> "
           );
         } else {
           url = '<a href="queries.php?domain=' + printdomain + '">' + printdomain + "</a>";
@@ -76,7 +81,10 @@ function updateTopLists() {
               url +
               "</td> <td>" +
               data.top_ads[domain] +
-              '</td> <td> <button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button> <button class="btn btn-default btn-sm text-orange"><i class="fa fa-balance-scale"></i> Audit</button> </td> </tr> '
+              "</td> <td>" +
+              '<button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button>' +
+              '<button type="button" class="btn btn-default btn-sm text-orange"><i class="fa fa-balance-scale"></i> Audit</button>' +
+              "</td> </tr> "
           );
         }
       }
diff --git a/scripts/pi-hole/js/customdns.js b/scripts/pi-hole/js/customdns.js
index 7f7d2343..9887d2bc 100644
--- a/scripts/pi-hole/js/customdns.js
+++ b/scripts/pi-hole/js/customdns.js
@@ -47,7 +47,7 @@ $(document).ready(function () {
         targets: 2,
         render: function (data, type, row) {
           return (
-            '<button class="btn btn-danger btn-xs deleteCustomDNS" type="button" data-domain=\'' +
+            '<button type="button" class="btn btn-danger btn-xs deleteCustomDNS" data-domain=\'' +
             row[0] +
             "' data-ip='" +
             row[1] +
diff --git a/scripts/pi-hole/js/groups-adlists.js b/scripts/pi-hole/js/groups-adlists.js
index 87c17a11..87a7292f 100644
--- a/scripts/pi-hole/js/groups-adlists.js
+++ b/scripts/pi-hole/js/groups-adlists.js
@@ -155,7 +155,7 @@ function initTable() {
       var ApplyBtn = "#btn_apply_" + data.id;
 
       var button =
-        '<button class="btn btn-danger btn-xs" type="button" id="deleteAdlist_' +
+        '<button type="button" class="btn btn-danger btn-xs" id="deleteAdlist_' +
         data.id +
         '">' +
         '<span class="far fa-trash-alt"></span>' +
diff --git a/scripts/pi-hole/js/groups-clients.js b/scripts/pi-hole/js/groups-clients.js
index 4fa4c681..49da0613 100644
--- a/scripts/pi-hole/js/groups-clients.js
+++ b/scripts/pi-hole/js/groups-clients.js
@@ -191,7 +191,7 @@ function initTable() {
       var ApplyBtn = "#btn_apply_" + data.id;
 
       var button =
-        '<button class="btn btn-danger btn-xs" type="button" id="deleteClient_' +
+        '<button type="button" class="btn btn-danger btn-xs" id="deleteClient_' +
         data.id +
         '">' +
         '<span class="far fa-trash-alt"></span>' +
diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/pi-hole/js/groups-domains.js
index fc7f836b..ebacb62d 100644
--- a/scripts/pi-hole/js/groups-domains.js
+++ b/scripts/pi-hole/js/groups-domains.js
@@ -232,7 +232,7 @@ function initTable() {
       }
 
       var button =
-        '<button class="btn btn-danger btn-xs" type="button" id="deleteDomain_' +
+        '<button type="button" class="btn btn-danger btn-xs" id="deleteDomain_' +
         data.id +
         '">' +
         '<span class="far fa-trash-alt"></span>' +
diff --git a/scripts/pi-hole/js/groups.js b/scripts/pi-hole/js/groups.js
index 7031cbd3..5ca900e5 100644
--- a/scripts/pi-hole/js/groups.js
+++ b/scripts/pi-hole/js/groups.js
@@ -69,7 +69,7 @@ $(document).ready(function () {
       $("td:eq(3)", row).empty();
       if (data.id !== 0) {
         var button =
-          '<button class="btn btn-danger btn-xs" type="button" id="deleteGroup_' +
+          '<button type="button" class="btn btn-danger btn-xs" id="deleteGroup_' +
           data.id +
           '">' +
           '<span class="far fa-trash-alt"></span>' +
diff --git a/scripts/pi-hole/php/footer.php b/scripts/pi-hole/php/footer.php
index 1908933d..b7fad544 100644
--- a/scripts/pi-hole/php/footer.php
+++ b/scripts/pi-hole/php/footer.php
@@ -32,7 +32,7 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                    <button id="pihole-disable-custom" type="button" class="btn btn-primary" data-dismiss="modal">Submit</button>
+                    <button type="button" id="pihole-disable-custom" class="btn btn-primary" data-dismiss="modal">Submit</button>
                 </div>
             </div>
         </div>
diff --git a/settings.php b/settings.php
index a7378fa3..a6e69056 100644
--- a/settings.php
+++ b/settings.php
@@ -539,7 +539,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                             <td id="IP" data-order="<?php echo bin2hex(inet_pton($lease["IP"])); ?>"><?php echo $lease["IP"]; ?></td>
                                                             <td id="HOST"><?php echo $lease["host"]; ?></td>
                                                             <td>
-                                                                <button class="btn btn-warning btn-xs" type="button" id="button" data-static="alert">
+                                                                <button type="button" id="button" class="btn btn-warning btn-xs" data-static="alert">
                                                                     <span class="fas fas fa-file-import"></span>
                                                                 </button>
                                                             </td>
@@ -568,7 +568,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                             <td data-order="<?php echo bin2hex(inet_pton($lease["IP"])); ?>"><?php echo $lease["IP"]; ?></td>
                                                             <td><?php echo $lease["host"]; ?></td>
                                                             <td><?php if (strlen($lease["hwaddr"]) > 0) { ?>
-                                                                <button class="btn btn-danger btn-xs" type="submit" name="removestatic"
+                                                                <button type="button" class="btn btn-danger btn-xs" name="removestatic"
                                                                         value="<?php echo $lease["hwaddr"]; ?>">
                                                                     <span class="far fa-trash-alt"></span>
                                                                 </button>
@@ -583,7 +583,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
                                                             <td><input type="text" name="AddIP" autocomplete="off" spellcheck="false" autocapitalize="none" autocorrect="off"></td>
                                                             <td><input type="text" name="AddHostname" value="" autocomplete="off" spellcheck="false" autocapitalize="none" autocorrect="off"></td>
                                                             <td>
-                                                                <button class="btn btn-success btn-xs" type="submit" name="addstatic">
+                                                                <button type="submit" class="btn btn-success btn-xs" name="addstatic">
                                                                     <span class="fas fa-plus"></span>
                                                                 </button>
                                                             </td>