diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm
--- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm	2023-12-19 09:44:56.678590486 +0000
+++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm	2024-01-16 08:38:00.000000000 +0000
@@ -144,7 +144,7 @@
     $dhcp_data{trt} = $trt;
     $dhcp_data{"first"} = '';
 	# ..... get scan results into dhcp_data
-	dhcp_data{"scanresults"} = get_scan_results($c);
+	$dhcp_data{"scanresults"} = get_scan_results($c);
     $c->stash( title => $title, modul => $modul, dhcp_data => \%dhcp_data );
     $c->render( template => 'dhcpd' );
 }
@@ -332,10 +332,10 @@
 	my $c = shift;
     my $ret = delete_all_leases($c);
 	if ($ret == 'ok') { 
-		dhcp_data{"success"}="dhcpd_SUCCESSFULLY_SAVED_SETTINGS";
+		$dhcp_data{"success"}="dhcpd_SUCCESSFULLY_SAVED_SETTINGS";
 		do_leases($c);
 	}	
-	else {dhcp_data{"error"}=$ret;}
+	else {$dhcp_data{"error"}=$ret;}
     return ;
 }
 
@@ -352,10 +352,10 @@
     # else return "ok"
     my $ret = delete_lease($c);
 	if ($ret == 'ok') { 
-		dhcp_data{"success"}="dhcpd_SUCCESSFULLY_SAVED_SETTINGS";
+		$dhcp_data{"success"}="dhcpd_SUCCESSFULLY_SAVED_SETTINGS";
 		do_leases($c);
 	}	
-	else {dhcp_data{"error"}=$ret;}
+	else {$dhcp_data{"error"}=$ret;}
     return ;
 }
 
@@ -536,4 +536,4 @@
 
 1;
 
-	
\ No newline at end of file
+	
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	2023-12-19 09:44:56.680590493 +0000
+++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep	2023-12-19 11:12:00.000000000 +0000
@@ -63,9 +63,12 @@
 		</button>
 		</td><td>
 		%= button_to $c->l('dhcpd_SCAN_YOUR_NETWORK') => '/dhcpd3'
-		</td><td>
-		%= button_to $c->l('dhcpd_GLOBAL_WINPOPUP') => '/dhcpd2'
+		</td>
+		<!--
 		<td>
+		%= button_to $c->l('dhcpd_GLOBAL_WINPOPUP') => '/dhcpd2'
+		</td>
+		-->
 		</tr>
 		</table>   
 		<hr /> 
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	2023-12-19 09:44:56.681590497 +0000
+++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_leases.html.ep	2024-01-16 12:32:00.000000000 +0000
@@ -26,7 +26,7 @@
 		%= submit_button "$btn", class => 'action'
     % end
     <br>
-	<table class="sme-border table-sort"><tbody>
+	<table class="sme-border table-sort"><thead>
 		<tr>
 			<th class='sme-border'>
 				%=l 'dhcpd_IP'
@@ -50,6 +50,8 @@
 				%=l 'dhcpd_ACTION'
 			</th>
 		</tr>
+		</thead>
+		<tbody>
         % foreach my $ip (@$leases) {
         <tr>
 			%= t td => (class => 'sme-border') => $ip->{ip}
@@ -66,9 +68,12 @@
 			%= t td => (class => 'sme-border') => $ip->{mac}
 			<td class = 'sme-border'>		
 				<a href="/smanager/dhcpd6?trt=DEL&ip=<%= $ip->{ip}%>" onclick="Remove_lease_confirm(event,'<%=$c->l('dhcpd_REMOVE_A_DHCP_LEASE_ACTION')%>',this);"><center><%=l 'dhcpd_REMOVE'%></center></a>
-			</td><td class = 'sme-border'>
+			</td>
+			<!--
+			<td class = 'sme-border'>
 				<a href="/smanager/dhcpd8?trt=WIN&ip=<%= $ip->{ip}%>" onclick="Winpop_confirm(event,'<%=$c->l('dhcpd_SENDING_A_WINPOPUP')%>',this);"><center><%=l 'dhcpd_WINPOPUP_ACTION'%></center></a>
 			</td>
+			-->
 		</tr>
 		%} 
 		</tbody>
@@ -110,4 +115,4 @@
 	%end
 
 
-</div>
\ No newline at end of file
+</div>