diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Localnetworks.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Localnetworks.pm
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Localnetworks.pm	2020-03-29 11:09:58.719012315 +0100
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Localnetworks.pm	2020-03-25 12:18:00.000000000 +0000
@@ -101,6 +101,9 @@
         if ($network_db) {
             @localnetworks = $network_db->get_all_by_prop( type => 'network' );
         }
+        # Load up ln_datas with values need by template
+		$ln_datas{subnet}      = $rec->prop('Mask');
+		$ln_datas{router}      = $rec->prop('Router');
         $c->stash( ln_datas => \%ln_datas, localnetworks => \@localnetworks ,ret =>\%ret);
     }
 
@@ -110,6 +113,8 @@
     	$c->stash(localnetwork=>$localnetwork);
         my $rec = $network_db->get($localnetwork) || die("Failed to get local network in db::$localnetwork");
         my $subnet = $rec->prop('Mask');
+        $ln_datas{subnet} = $subnet;
+        $ln_datas{router} = $rec->prop('Router');
         my $numhosts = hosts_on_network($localnetwork,$subnet);
         $ln_datas{localnetwork} = $localnetwork;
         $ln_datas{deletehosts} = $numhosts>0?1:0;
@@ -124,7 +129,7 @@
         $c->stash( localnetworks => \@localnetworks );
     }
 
-   $ln_datas{'trt'} = $trt;
+    $ln_datas{'trt'} = $trt;
     $c->stash( title => $title, modul => $modul, ln_datas => \%ln_datas );
     $c->render( template => 'localnetworks' );
 
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_ln_add.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_ln_add.html.ep
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_ln_add.html.ep	2020-03-29 11:10:00.301025598 +0100
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_ln_add.html.ep	2020-03-26 09:47:00.000000000 +0000
@@ -4,25 +4,29 @@
 	% my %ret;
 	% unless (length($retref)) {%ret = (ret=>"");}
 	% else {%ret = %$retref;}
+	
+	% my @vars = split(",",$ret{vars});
+	% my $var1 = @vars[0];
+	% my $var2 = @vars[1];
+	% my $var3 = @vars[2];
+	% my $var4 = @vars[3];
+	% my $var5 = @vars[4];
+	% my $var6 = @vars[5];
+
 	%if ($ret{'ret'} eq "") {
    	
 	%} elsif (index($ret{ret},"SUCCESS") != -1) {
 	   <div class='success'>
 	       <h2> Operation Status Report</h2>
-			%= $c->l($ret{ret},$ret{vars});
-		</div>
-	   %} else {
-	   <div class='error'>
-	       <h2> Operation Status Report</h2>
-			%= $c->l($ret{ret},$ret{vars});
+			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
 		</div>
+	   %} else { 
+	   <div class='sme-error'>
+	       <h2> Operation Status Report - Error</h2>
+			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+    	</div>
 	%}
-
-   
-
-	<br ><br>
-	<br ><br>
-
+	<br />
     % my $btn = l('ADD');
     % my $network_db = esmith::NetworksDB->open();
     
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_ln_del.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_ln_del.html.ep
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_ln_del.html.ep	2020-03-29 11:10:00.301025598 +0100
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_ln_del.html.ep	2020-03-25 11:56:00.000000000 +0000
@@ -1,19 +1,15 @@
 <div id='ln_del'>
 
     % my $btn = l('REMOVE');
-    % my $localnetwork = $c->param('localnetwork');
-    % my $network_db = esmith::NetworksDB->open();
-    % my $record     = $network_db->get($localnetwork);
-    % my $subnet    = $record->prop('Mask');
-    % my $router      = $record->prop('Router');
-    %#my %ln_datas = $c->stash("ln_datas");
     % my $deletehosts = $ln_datas->{deletehosts};
+    % my $subnet = $ln_datas->{subnet};
+    % my $router = $ln_datas->{router};
     
    % if ($config->{debug} == 1) {
 	<p>
 	%= dumper $c->current_route
 	%= dumper $c->stash("ret")
-    %= dumper $c->param("localnetwork");
+    %= dumper %$ln_datas
     %= dumper $deletehosts
 	</p>
     % }
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_ln_list.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_ln_list.html.ep
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_ln_list.html.ep	2020-03-29 11:10:00.301025598 +0100
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_ln_list.html.ep	2020-03-26 09:51:00.000000000 +0000
@@ -8,32 +8,42 @@
 	% unless (length($retref)) {%ret = (ret=>"");}
 	% else {%ret = %$retref;}
 
+    % if ($config->{debug} == 1) {
+	<p>
+		%= dumper "Ret:".$ret{ret};
+	</p>	
+	%}
+
+	% my @vars = split(",",$ret{vars});
+	% my $var1 = @vars[0];
+	% my $var2 = @vars[1];
+	% my $var3 = @vars[2];
+	% my $var4 = @vars[3];
+	% my $var5 = @vars[4];
+	% my $var6 = @vars[5];
+
+
 	%if ($ret{ret} eq "") {
 		%=l "ln_FIRSTPAGE_DESC"
 	%} elsif (index($ret{ret},"SUCCESS") != -1) {
 	   <div class='success'>
 	       <h2> Operation Status Report</h2>
-			% my @vars = split(",",$ret{vars});
-			% my $var1 = @vars[0];
-			% my $var2 = @vars[1];
-			% my $var3 = @vars[2];
-			% my $var4 = @vars[3];
-			% my $var5 = @vars[4];
-			% my $var6 = @vars[5];
 			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
 		</div>
 	   %} else { 
-	   <div class='error'>
-	       <h2> Operation Status Report</h2>
-			%= $c->l($ret{ret},$ret{vars})
-		</div>
+	   <div class='sme-error'>
+	       <h2> Operation Status Report - Error</h2>
+			%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+    	</div>
 	%}
-	<br ><br>
+	<br><br>
 	%= submit_button "$btn", class => 'action'
+	<br>
     % my $numlocalnetworks = @$localnetworks;
     %	if ($numlocalnetworks == 0){
         %=l 'ln_LOCAL_NETWORK_NONE'
     %	} else {
+        <br>
 		<table class="sme-border"><tbody>
 		<tr>
 				<th class='sme-border'>