diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep
--- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep	2024-02-07 15:51:08.265451430 +0000
+++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep	2024-02-07 15:43:00.000000000 +0000
@@ -57,13 +57,13 @@
 			<tr>
 			<td>
 				%= button_to $c->l('dhcpd_CONNECTED_IP') => '/dhcpd1', onclick=>"showSpinnerLeases()", id=>"scanLeases"
-				<button class ="btn btn-primary spinnerButtonOverlay"  type = "submit" id="load" style="display:true">
+				<button class ="btn btn-primary spinnerButtonOverlay"  type = "submit" id="load" style="display:none">
 				  Scanning  <!--%= $c->l('dhcpd_CONNECTED_IP')-->
 				  <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
 				</button>
 			</td><td>	
 				%= button_to $c->l('dhcpd_SCAN_YOUR_NETWORK') => '/dhcpd3', onclick=>"showSpinnerNetwork()", id=>"scanNetwork"
-				<button class ="btn btn-primary spinnerButtonOverlay"  type = "submit" id="loadingNetwork" style="display:true">
+				<button class ="btn btn-primary spinnerButtonOverlay"  type = "submit" id="loadingNetwork" style="display:none">
 				  Scanning  <!--%= $c->l('dhcpd_CONNECTED_IP')-->
 				  <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
 				</button>
@@ -181,8 +181,8 @@
 </div>
 
 %= javascript begin
-  document.getElementById("load").style.display="none";
-  document.getElementById("loadingNetwork").style.display="none";
+  if (document.getElementById("load")){document.getElementById("load").style.display="none";}
+  if (document.getElementById("loadingNetwork")){document.getElementById("loadingNetwork").style.display="none";}
 
   function showSpinnerLeases(){
 	  document.getElementById("scanLeases").style.display="none";
diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_leases.html.ep smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_leases.html.ep
--- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_leases.html.ep	2024-02-07 15:51:08.266451461 +0000
+++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_leases.html.ep	2024-02-07 15:49:00.000000000 +0000
@@ -26,7 +26,7 @@
 		%= submit_button "$btn", class => 'action'
     % end
     <br>
-	<table class="sme-border table-sort"><thead>
+	<table class="sme-border TableSort"><thead>
 		<tr>
 			<th class='sme-border'>
 				%=l 'dhcpd_IP'
diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_scan.html.ep smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_scan.html.ep
--- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_scan.html.ep	2024-02-07 15:51:08.266451461 +0000
+++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_scan.html.ep	2024-02-07 15:49:00.000000000 +0000
@@ -10,7 +10,7 @@
 	</tr>
 	
     </table>   	
-    <table class="sme-border table-sort"><thead>
+    <table class="sme-border TableSort"><thead>
 		<tr>
 			<th class='sme-border'>
 				%=l 'dhcpd_NETWORK_NAME'