diff --git a/db_queries.php b/db_queries.php
index 73ee2def..97aee76f 100644
--- a/db_queries.php
+++ b/db_queries.php
@@ -139,7 +139,7 @@ $token = $_SESSION['token'];
         </div>
         <!-- /.box-header -->
         <div class="box-body">
-            <table id="all-queries" class="table table-striped table-bordered" width="100%">
+            <table id="all-queries" class="table table-striped table-bordered">
                 <thead>
                     <tr>
                         <th>Time</th>
diff --git a/dns_records.php b/dns_records.php
index 4d429af4..214e429d 100644
--- a/dns_records.php
+++ b/dns_records.php
@@ -72,7 +72,7 @@
             </div>
             <!-- /.box-header -->
             <div class="box-body">
-                <table id="customDNSTable" class="table table-striped table-bordered" width="100%">
+                <table id="customDNSTable" class="table table-striped table-bordered">
                     <thead>
                     <tr>
                         <th>Domain</th>
diff --git a/groups-adlists.php b/groups-adlists.php
index ae5c98ed..5df3aefc 100644
--- a/groups-adlists.php
+++ b/groups-adlists.php
@@ -53,7 +53,7 @@
             </div>
             <!-- /.box-header -->
             <div class="box-body">
-                <table id="adlistsTable" class="table table-striped table-bordered" width="100%">
+                <table id="adlistsTable" class="table table-striped table-bordered">
                     <thead>
                     <tr>
                         <th>ID</th>
diff --git a/groups-clients.php b/groups-clients.php
index e982fea0..534ef3ae 100644
--- a/groups-clients.php
+++ b/groups-clients.php
@@ -55,15 +55,15 @@
             </div>
             <!-- /.box-header -->
             <div class="box-body">
-                <table id="clientsTable" class="table table-striped table-bordered" width="100%">
+                <table id="clientsTable" class="table table-striped table-bordered">
                     <thead>
-                    <tr>
-                        <th>ID</th>
-                        <th>IP address</th>
-                        <th>Comment</th>
-                        <th>Group assignment</th>
-                        <th>Action</th>
-                    </tr>
+                        <tr>
+                            <th>ID</th>
+                            <th>IP address</th>
+                            <th>Comment</th>
+                            <th>Group assignment</th>
+                            <th>Action</th>
+                        </tr>
                     </thead>
                 </table>
                 <button type="button" id="resetButton" class="btn btn-default btn-sm text-red hidden">Reset sorting</button>
diff --git a/groups-domains.php b/groups-domains.php
index 0c1c1ded..4a9ba3f7 100644
--- a/groups-domains.php
+++ b/groups-domains.php
@@ -118,17 +118,17 @@
             </div>
             <!-- /.box-header -->
             <div class="box-body">
-                <table id="domainsTable" class="table table-striped table-bordered" width="100%">
+                <table id="domainsTable" class="table table-striped table-bordered">
                     <thead>
-                    <tr>
-                        <th>ID</th>
-                        <th>Domain/RegEx</th>
-                        <th>Type</th>
-                        <th>Status</th>
-                        <th>Comment</th>
-                        <th>Group assignment</th>
-                        <th>Action</th>
-                    </tr>
+                        <tr>
+                            <th>ID</th>
+                            <th>Domain/RegEx</th>
+                            <th>Type</th>
+                            <th>Status</th>
+                            <th>Comment</th>
+                            <th>Group assignment</th>
+                            <th>Action</th>
+                        </tr>
                     </thead>
                 </table>
                 <button type="button" id="resetButton" class="btn btn-default btn-sm text-red hidden">Reset sorting</button>
diff --git a/groups.php b/groups.php
index e7680cfa..4b02e747 100644
--- a/groups.php
+++ b/groups.php
@@ -52,7 +52,7 @@
             </div>
             <!-- /.box-header -->
             <div class="box-body">
-                <table id="groupsTable" class="table table-striped table-bordered" width="100%">
+                <table id="groupsTable" class="table table-striped table-bordered">
                     <thead>
                     <tr>
                         <th>ID</th>
diff --git a/messages.php b/messages.php
index d941e566..3285d11b 100644
--- a/messages.php
+++ b/messages.php
@@ -19,19 +19,19 @@
         <div class="box" id="messages-list">
             <!-- /.box-header -->
             <div class="box-body">
-                <table id="messagesTable" class="table table-striped table-bordered" width="100%">
+                <table id="messagesTable" class="table table-striped table-bordered">
                     <thead>
-                    <tr>
-                        <th>ID</th>
-                        <th>Time</th>
-                        <th>Type</th>
-                        <th>Message</th>
-                        <th>Data1</th>
-                        <th>Data2</th>
-                        <th>Data3</th>
-                        <th>Data4</th>
-                        <th>Data5</th>
-                    </tr>
+                        <tr>
+                            <th>ID</th>
+                            <th>Time</th>
+                            <th>Type</th>
+                            <th>Message</th>
+                            <th>Data1</th>
+                            <th>Data2</th>
+                            <th>Data3</th>
+                            <th>Data4</th>
+                            <th>Data5</th>
+                        </tr>
                     </thead>
                 </table>
             </div>
diff --git a/network.php b/network.php
index 400eb6da..2b4cb312 100644
--- a/network.php
+++ b/network.php
@@ -29,7 +29,7 @@ $token = $_SESSION['token'];
         </div>
         <!-- /.box-header -->
         <div class="box-body">
-            <table id="network-entries" class="table table-striped table-bordered" width="100%">
+            <table id="network-entries" class="table table-striped table-bordered">
                 <thead>
                     <tr>
                         <th>IP address</th>
@@ -56,15 +56,15 @@ $token = $_SESSION['token'];
                 </tfoot>
             </table>
             <label>Background color: Last query from this device seen ...</label>
-        <table width="100%">
-          <tr class="text-center">
-            <td class="network-recent" width="15%">just now</td>
-            <td class="network-gradient" width="30%">... to ...</td>
-            <td class="network-old" width="15%">24 hours ago</td>
-            <td class="network-older" width="20%">&gt; 24 hours ago</td>
-            <td class="network-never" width="20%">Device does not use Pi-hole</td>
-          </tr>
-        </table>
+            <table class="table text-center">
+                <tr>
+                    <td class="network-recent" width="15%">just now</td>
+                    <td class="network-gradient" width="30%">... to ...</td>
+                    <td class="network-old" width="15%">24 hours ago</td>
+                    <td class="network-older" width="20%">&gt; 24 hours ago</td>
+                    <td class="network-never" width="20%">Device does not use Pi-hole</td>
+                </tr>
+            </table>
         </div>
         <!-- /.box-body -->
       </div>
diff --git a/queries.php b/queries.php
index 6152e135..5eb4e8f6 100644
--- a/queries.php
+++ b/queries.php
@@ -122,7 +122,7 @@ if(strlen($showing) > 0)
         </div>
         <!-- /.box-header -->
         <div class="box-body">
-            <table id="all-queries" class="table table-striped table-bordered" width="100%">
+            <table id="all-queries" class="table table-striped table-bordered">
                 <thead>
                     <tr>
                         <th>Time</th>
diff --git a/settings.php b/settings.php
index 6d76f02a..6c9f98d6 100644
--- a/settings.php
+++ b/settings.php
@@ -699,7 +699,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "adlists", "
                                         <div class="row">
                                             <div class="col-md-12">
                                                 <label>Currently active DHCP leases</label>
-                                                <table id="DHCPLeasesTable" class="table table-striped table-bordered nowrap" width="100%">
+                                                <table id="DHCPLeasesTable" class="table table-striped table-bordered nowrap">
                                                     <thead>
                                                         <tr>
                                                             <th>MAC address</th>
@@ -728,14 +728,14 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "adlists", "
                                             </div>
                                             <div class="col-md-12">
                                                 <label>Static DHCP leases configuration</label>
-                                                <table id="DHCPStaticLeasesTable" class="table table-striped table-bordered nowrap" width="100%">
+                                                <table id="DHCPStaticLeasesTable" class="table table-striped table-bordered nowrap">
                                                     <thead>
-                                                    <tr>
-                                                        <th>MAC address</th>
-                                                        <th>IP address</th>
-                                                        <th>Hostname</th>
-                                                        <td></td>
-                                                    </tr>
+                                                        <tr>
+                                                            <th>MAC address</th>
+                                                            <th>IP address</th>
+                                                            <th>Hostname</th>
+                                                            <td></td>
+                                                        </tr>
                                                     </thead>
                                                     <tbody>
                                                         <?php foreach ($dhcp_static_leases as $lease) { ?>