diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep
index 896517c..b229b24 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_add.html.ep
@@ -7,20 +7,6 @@
 
     <br>
 
-    % if ($ret{'ret'} eq "") {
-
-    % } elsif (index($ret{ret},"SUCCESS") != -1) {
-       <div class="">
-           <!--<h2> Operation Status Report</h2>-->
-            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
-        </div>
-    % } else {
-       <div class="">
-           <!--<h2> Operation Status Report - Error</h2>-->
-            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
-        </div>
-    % }
-
    % if (config->{debug} == 1) {
     <pre>
         <%= dumper $c->current_route %>
@@ -28,6 +14,24 @@
     </pre>
     % }
 
+    % if ($ret{'ret'} eq "") {
+        <div>
+            <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
+        </div>
+    % } elsif (index($ret{ret},"SUCCESS") != -1) {
+       <div>
+           <!--<h2> Operation Status Report</h2>-->
+            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
+        </div>
+    % } else {
+       <div class="text-danger">
+           <!--<h2> Operation Status Report - Error</h2>-->
+            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
+        </div>
+    % }
+
+    <br>
+
     <h2><%= l "pf_CREATE_RULE" %></h2>
 
       <form action="/smanager/portforwardingb" method="POST">
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep
index 7fcd306..5dcea83 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep
@@ -1,11 +1,5 @@
 <div>
 
-
-
-    <form action="/smanager/portforwardinga" method="POST">
-
-    <br>
-
     % my $retref = $c->stash("ret");
     % my %ret = $retref ? %$retref : (ret => "");
     % my @vars = split(/,/, $ret{vars} // '');
@@ -14,24 +8,25 @@
     % my $numtcpforwards = @$tcpforwards;
     % my $numudpforwards = @$udpforwards;
 
-	% if ($c->app->config->{debug}) {
-	<pre>
-		%= dumper { ret_data => \%ret }
-	</pre>
-	% }
+    % if ($c->app->config->{debug}) {
+        <pre>
+            <%= dumper { ret_data => \%ret } %>
+        </pre>
+    % }
 
     % if ($ret{ret} eq "") {
-        <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
-
+        <div>
+            <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
+        </div>
     % } elsif (index($ret{ret},"SUCCESS") != -1) {
-        <br>
-       <div>
+
+        <div>
            <h2> Operation Status Report</h2>
             <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
         </div>
-       % } else {
+    % } else {
         <br>
-       <div class="text-danger">
+        <div class="text-danger">
            <h2> Operation Status Report - Error</h2>
            <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
         </div>
@@ -39,6 +34,8 @@
 
     <br>
 
+    <form action="/smanager/portforwardinga" method="POST">
+
     % my $btn = l('pf_CREATE_RULE');
 
     <div class="row g-3 align-items-center">
@@ -49,16 +46,16 @@
 
     </form>
 
-
+    <br>
 
     % if ($empty) {
             <br>
             <%= l 'pf_NO_FORWARDS' %>
     % } else {
-            <br>
-            <%= l 'pf_SHOW_FORWARDS' %>
-            <br><br>
-            <table class="table table-bordered">
+        <br>
+        <%= l 'pf_SHOW_FORWARDS' %>
+        <br><br>
+        <table class="table table-bordered">
             <thead>
             <tr>
                 <th><%= l 'pf_LABEL_PROTOCOL' %></th>
@@ -103,12 +100,12 @@
 
                                 <td class="text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
                             </tr>
+                            % }
+                        % }
                     % }
                 % }
-            % }
-        % }
-        </tbody>
-    </table>
+            </tbody>
+        </table>
     <%= hidden_field 'trt' => $pf_datas->{trt} %>
 
 </div>