diff --git a/root/usr/share/smanager/themes/default/templates/bugreport.html.ep b/root/usr/share/smanager/themes/default/templates/bugreport.html.ep
index 8b745c6..5aceec2 100644
--- a/root/usr/share/smanager/themes/default/templates/bugreport.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/bugreport.html.ep
@@ -13,11 +13,10 @@
     
     <h1><%= $title %></h1>
     <!--br><%= $modul %><br-->
-    <p>
 
-    <p><b>
+    <b>
     %=l ('bugr_DO_NOT_PANIC')
-    </b></p>
+    </b>
     <p>
     %=l ('bugr_SME_EXPERIENCE')
     </p><p>
@@ -49,7 +48,7 @@
     %=l ('bugr_YUM_REPOS')
     </li><br></ul>
     %=l ('bugr_PRIVACY')
-    </p><p>
+    </p>
 
     <% my $btn = l('bugr_CREATE_REPORT'); %>
 
@@ -57,7 +56,7 @@
         %= submit_button "$btn", class => 'action'
     % end    
 
-    </p><p><b>
+    <p><b>
     %=l ('bugr_DONATING')
     </b><br><br>
     %=l ('bugr_AWARE_SME')
@@ -66,6 +65,7 @@
     </b><br><br>
     %=l ('bugr_CONSIDER_DONATING')
     <br><br>
+    </p>
 
     %= link_to 'https://wiki.koozali.org/Donate' => begin
 	%= image '/images/btn_donateCC_LG.gif'
@@ -76,8 +76,7 @@
 
     <br>
     %=l ('bugr_THANK_YOU')
-    </p>
 
 </div>
 
-%end
+%end
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/default/templates/bugreport2.html.ep b/root/usr/share/smanager/themes/default/templates/bugreport2.html.ep
index 71eedb7..de882f7 100644
--- a/root/usr/share/smanager/themes/default/templates/bugreport2.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/bugreport2.html.ep
@@ -15,7 +15,6 @@
 
     <br><%= $modul %><br>
 
-    <p>
     <% my $btn = l('bugr_Download this report'); %>
 
     %= form_for 'bugreportD' => (method => 'POST') => begin
@@ -25,4 +24,4 @@
 
 </div>
 
-%end
+%end
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/default/templates/datetime.html.ep b/root/usr/share/smanager/themes/default/templates/datetime.html.ep
index ebe1553..4e0f459 100644
--- a/root/usr/share/smanager/themes/default/templates/datetime.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/datetime.html.ep
@@ -45,6 +45,7 @@
 		%= $dat_datas->{now_string}
 		</b>
 		</p>
+		<p>
 		<br>
 		<span class=label>
 		%=l 'dat_NTP_SERVER'
@@ -121,4 +122,4 @@
     % end    
 
 </div>
-%end
+%end
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/default/templates/directory.html.ep b/root/usr/share/smanager/themes/default/templates/directory.html.ep
index d2e03fe..3aa9db3 100644
--- a/root/usr/share/smanager/themes/default/templates/directory.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/directory.html.ep
@@ -44,25 +44,25 @@
 	</span><span class=data>
 	%= text_field 'department' =>  $dir_datas->{department}, class => 'input'
 	</span>
-	</p>
+	</p><p>
 	<span class=label>
 	%=l 'dir_COMPANY', class => 'label'
 	</span><span class=data>
 	%= text_field 'company', $dir_datas->{company}, class => 'input'
 	</span>
-	</p>
+	</p><p>
 	<span class=label>
 	%=l 'dir_STREET', class => 'label'
 	</span><span class=data>
 	%= text_field 'street' =>  $dir_datas->{street}, class => 'input'
 	</span>
-	</p>
+	</p><p>
 	<span class=label>
 	%=l 'dir_CITY', class => 'label'
 	</span><span class=data>
 	%= text_field 'city', $dir_datas->{city}, class => 'input'
 	</span>
-	</p>
+	</p><p>
 	<span class=label>
 	%=l 'dir_PHONENUMBER', class => 'label'
 	</span><span class=data>
@@ -85,4 +85,4 @@
     % end    
 
 </div>
-%end
+%end
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep
index 40f39b4..cd66808 100644
--- a/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep
@@ -46,19 +46,34 @@
             %= t td => (class => 'sme-border') => $domain->{'Content'}
             %= t td => (class => 'sme-border') => l('dom_' . $domain->{'Nameservers'})
 
-		% 	    my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class='sme-modify-button' title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>"; 
-
-		%	    my $removable = ($domain->{Removable} || 'yes');
-		%	    my $actionRemove = '&nbsp;';
-
-		%	    if ($removable eq 'yes')  { 
-		% 		$actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class='sme-remove-button' title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>"; 
-		%	    }
-
-				<td class='sme-border' style="min-width:15em">
-					<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
-				</td>
-			</tr>
+		%# 	my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class='sme-modify-button' title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>"; 
+			%my $modify_text = l('MODIFY');  # Localized text
+			%my $csrf_token = "TOKEN";  # CSRF token for security
+			%my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
+			%my $actionModify = qq{
+			%	<button type='button' class='sme-modify-button' title='$modify_text' 
+			%		onclick="window.location.href='domains2?CsrfDef=$csrf_token&trt=UPD&Domain=$domain_name'">
+			%		$modify_text
+			%	</button>
+			%};
+			%my $removable = ($domain->{Removable} || 'yes');
+			%my $actionRemove = '&nbsp;';
+			%if ($removable eq 'yes')  { 
+					%my $remove_text = l('REMOVE');  # Localized text
+					%my $csrf_token = "TOKEN";  # CSRF token for security
+					%my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
+					%$actionRemove = qq{
+						%	<button type='button' class='sme-remove-button' title='$remove_text' 
+						%		onclick="window.location.href='domains2?CsrfDef=$csrf_token&trt=DEL&Domain=$domain_name'">
+						%		$remove_text
+						%	</button>
+					%};
+				%#		$actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class='sme-remove-button' title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>"; 
+			%};
+			<td class='sme-border' style="min-width:15em">
+				<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
+			</td>
+		</tr>
 	%	}
 
 	</tbody>
@@ -102,4 +117,4 @@
 
 
 
-</div>
+</div>
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/default/templates/printers.html.ep b/root/usr/share/smanager/themes/default/templates/printers.html.ep
index dd9b278..d55e732 100644
--- a/root/usr/share/smanager/themes/default/templates/printers.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/printers.html.ep
@@ -12,8 +12,8 @@
 
     % if ( stash 'error' ) {
     	<br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
-	</div>
+			%= $c->render_to_string(inline => stash 'error') 
+		</div>
     %}
 
     <h1><%= $title%></h1>
@@ -29,5 +29,4 @@
 	    %}
 
 </div>
-%end
-
+%end
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep b/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep
index a7b2185..55161ba 100644
--- a/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep
@@ -52,12 +52,11 @@
 
 	<hr class='sectionbar' />
 
-	</p>
     %}
 
 	<!-- percequ include 'partials/_rma_pptp' -->
 
-	<p><h2>
+	<h2>
 	%= $c->l('rma_VALIDFROM_TITLE', $c->l('rma_REMOTE_MANAGEMENT'));
 	</h2><br>
 	%=l 'rma_VALIDFROM_DESC'
@@ -86,7 +85,7 @@
             %= t td => (class => 'sme-border') => $net
             %= t td => (class => 'sme-border') => $mask
             %= t td => (class => 'sme-border') => $numhosts
-            <td class='sme-border'><input type='checkbox' name='Remove_nets' value='<%= $net.'/'.$mask %>'> </td>
+            <td class='sme-border'><input type='checkbox' name='Remote_nets' value='<%= $net.'/'.$mask %>'> </td>
     	</tr>
     %    }
 
@@ -102,9 +101,6 @@
         %= l('rma_NO_ENTRIES_YET');
 	</b>
     %}
-	</p>
-
-	<p>
 	%=l 'rma_DESC_VALID_FROM_ENTRIES'
 	<br><br>
 	<span class=label>
@@ -118,11 +114,10 @@
 	</span><span class=data>
 	%= text_field 'ValidFromMask', class => 'input'
 	</span>
-	</p>
 
 	<hr class='sectionbar' />
 
-	<p><h2>
+	<h2>
 	%=l 'rma_TITLE_SSH'
 	</h2><br>
 	%=l 'rma_DESC_SSH'
@@ -158,11 +153,10 @@
 	%= text_field 'SshTCPPort', class => 'input'
 	</span>
 	<br>
-	</p>
 
 	<hr class='sectionbar' />
 
-	<p><h2>
+	<h2>
 	%=l 'rma_TITLE_FTP_ACCESS'
 	</h2><br>
 	%= $c->render_to_string(inline => $c->l('rma_DESC_FTP_ACCESS'));
@@ -186,11 +180,9 @@
 	%= select_field 'FtpPasswordAccess' => $c->passwordLogin_list(), class => 'input'
 	</span>
 	<br>
-	</p>
 
     % my $mode = $c->get_telnet_mode();
     % if ( $mode ne 'off') {
-	<p>
 	<hr class='sectionbar' />
 
 	<h2>
@@ -210,16 +202,13 @@
 	</span>
 	<br>
 
-	</p>
     %}
 
-	<p>
 	<br>
 	%= submit_button "$btn", class => 'action'
-	</p>
 
     % end
 
 </div>
 
-% end
+% end
\ No newline at end of file