diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_configure.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_configure.html.ep
index c68b2c1..2de39f4 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_configure.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_configure.html.ep
@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_restore.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_restore.html.ep
index 28969a5..534db1a 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_restore.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_restore.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure.html.ep
index f77b903..0b2056f 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure1.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure1.html.ep
index 2a59186..389d409 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure1.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure1.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore.html.ep
index f079e30..7b3afe9 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore1.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore1.html.ep
index 70451a0..d7126d9 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore1.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore1.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore.html.ep
index 1ef3814..2cbd0a7 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore1.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore1.html.ep
index b2c6569..32460d0 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore1.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore1.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore2.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore2.html.ep
index 3a16d39..a7a22b3 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore2.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore2.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify.html.ep
index 874456b..e8be57f 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - backup - verify";
 % content_for 'module' => begin
 
-<div>
+<div  class="card-body">
+
     % if (config->{debug} == 1) {
         <p>
         %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify1.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify1.html.ep
index b354e05..b64cbf5 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify1.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify1.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - backup - verify";
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/backup.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/backup.html.ep
index 119a424..b976dfb 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/backup.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/backup.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/bugreport.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/bugreport.html.ep
index fdeafdc..4d40a4f 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/bugreport.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/bugreport.html.ep
@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/bugreport2.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/bugreport2.html.ep
index 01595e1..283a6af 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/bugreport2.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/bugreport2.html.ep
@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep
index 9f05ad5..47bbd45 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep
@@ -1,7 +1,9 @@
 % layout 'AdminLTE', title => "Sme server 2 - clamav";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
+
     %if (config->{debug} == 1) {
     <p>(DBG)route: <%= $c->current_route %><br>
     (DBG)FsS stat: <%= $clm_datas->{FilesystemScan}%> <br>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/csrf_400.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/csrf_400.html.ep
index 039dc87..effd968 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/csrf_400.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/csrf_400.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - err 400";
 
 % content_for 'module' => begin
-<div>
+
+<div  class="card-body">
     <div class="text-danger">
     %= l 'CSRF_VALIDATION_FAILURE'
     </div>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep
index fa54deb..8c3d2d0 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - datetime";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/default.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/default.html.ep
index 6ecf3e5..3835d9e 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/default.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/default.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div  class="card-body">
+
     <p><%= $title %></p>
     <%= $modul %>
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep
index 67f08f3..82cecd4 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - directory";
 
 % content_for 'module' => begin
-<div>
+
+<div  class="card-body">
 
     %if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep
index 1cd2da6..0a3035c 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - domains";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep
index f9d79ff..b1ba402 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - emailaccess";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/emaildeliver.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/emaildeliver.html.ep
index d845454..93202d3 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emaildeliver.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emaildeliver.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - emaildeliver";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/emailfilter.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/emailfilter.html.ep
index c0d5cd8..1d6ef35 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emailfilter.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailfilter.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - emailfilter";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body"
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/emailreceive.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/emailreceive.html.ep
index 28f8a5c..f7b6870 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emailreceive.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailreceive.html.ep
@@ -5,7 +5,7 @@
 % use constant FALSE => 0;
 % use constant TRUE  => 1;
 
-<div>
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep
index 10abd1b..395a19c 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep
@@ -5,9 +5,9 @@
 % use constant FALSE => 0;
 % use constant TRUE  => 1;
 
-<div>
+<div class="card-body">
 
-    % if (config->{debug} == TRUE) {
+    % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
     %= dumper $mai_datas
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/embedded.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/embedded.html.ep
index c3c49bb..8c0e28c 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/embedded.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/embedded.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
         <p>
             %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/exception_development.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/exception_development.html.ep
index 866589b..ce73cea 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/exception_development.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/exception_development.html.ep
@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
     <p>
     <br>dev<br>
         Oups !!! 
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/groups.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/groups.html.ep
index f44aa3c..0fb94fb 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/groups.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/groups.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - groups";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/hostentries.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/hostentries.html.ep
index 8fba3f5..70daf51 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/hostentries.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/hostentries.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - hostentries";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep
index 4cfa958..3959b66 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - ibays";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/initial.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/initial.html.ep
index f543499..388c399 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/initial.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/initial.html.ep
@@ -8,7 +8,7 @@
     </p>
     % }
 
-<div>
+<div class="card-body">
 
     % if ( stash 'error' ) {
         <br>
@@ -18,11 +18,10 @@
     % }
 
     <h3><%= $title %> </h3> 
-<!--     <h3>template: initial.html.ep</h3> -->
-<!--     <H1>Initial AdminLTE</H1> -->
-    <p>
+    <!--     <h3>template: initial.html.ep</h3> -->
+    <!--     <H1>Initial AdminLTE</H1> -->
+    
     %= $modul
-    </p>
 
 </div>
 
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep
index b57d25d..87ce22a 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep
@@ -13,8 +13,8 @@
 
     %= content_for 'head_contrib'
     % if (config 'hasJquery') {
-    %= include 'partials/_js_imports'
-    %= include 'common_js'
+        %= include 'partials/_js_imports'
+        %= include 'common_js'
     % }
 
     %= content_for 'refresh'
@@ -25,11 +25,12 @@
 <!-- Custom overrides? -->
 
 % if ($c->current_route eq 'nutups') {
-%= include 'partials/_nutups_overrides'
+    %= include 'partials/_nutups_overrides'
 % }
 
 
 
+
 </head>
 
 <body class="sidebar-expand-lg bg-body-tertiary">
@@ -47,133 +48,154 @@
     <div class="app-wrapper">
 
 
-        <!-- Should create a new separate header partial -->
+        <!-- Should create a new separate header partial?? -->
+
         <!--begin::Header-->
-        <nav id="koozali_grad" class="app-header navbar navbar-expand bg-success-subtle" data-bs-theme="light">
-            <!--begin::Container-->
-            <div class="container-fluid">
-              <!--begin::Start Navbar Links-->
-              <!-- Top bar links -->
-              <ul class="navbar-nav">
-                <li class="nav-item">
-                  <a class="nav-link" data-lte-toggle="sidebar" href="#" role="button">
-                    <i class="bi bi-list"></i>
-                  </a>
-                </li>
 
-                <li class="nav-item d-none d-md-block"><a href="/smanager" class="nav-link">Home</a></li>
-                % if ( not defined $c->session->{username} ) {
-                <li class="nav-item d-none d-md-block"><a href="login" class="nav-link">Login</a></li>    
-                % } else {
-                <li class="nav-item d-none d-md-block"><a href="logout" class="nav-link">Logout</a></li>
-                % }
-                <li class="nav-item d-none d-md-block">
-                    %= include 'partials/_flag_icon'
-                </li>
-              </ul>
-              <!--end::Start Navbar Links-->
-                <!-- this can do direct to header so always available-->
-                % if ($c->is_logged_in && scalar @{SrvMngr::theme_list( $c )} > 1) {
-                %= include 'partials/_swt_theme'
-                % }
-
-
-            </div>
-            <!--end::Container-->
-        </nav>
+            <nav id="koozali_grad" class="app-header navbar navbar-expand bg-success-subtle" data-bs-theme="light">
+    
+                <!--begin::Container-->
+                <div class="container-fluid">
+                  <!--begin::Start Navbar Links-->
+                  <!-- Top bar links -->
+                  <ul class="navbar-nav">
+                    <li class="nav-item">
+                      <a class="nav-link" data-lte-toggle="sidebar" href="#" role="button">
+                        <i class="bi bi-list"></i>
+                      </a>
+                    </li>
+    
+                    <li class="nav-item d-none d-md-block"><a href="/smanager" class="nav-link">Home</a></li>
+                    % if ( not defined $c->session->{username} ) {
+                    <li class="nav-item d-none d-md-block"><a href="login" class="nav-link">Login</a></li>    
+                    % } else {
+                    <li class="nav-item d-none d-md-block"><a href="logout" class="nav-link">Logout</a></li>
+                    % }
+                    <li class="nav-item d-none d-md-block">
+                        %= include 'partials/_flag_icon'
+                    </li>
+                  </ul>
+                  <!--end::Start Navbar Links-->
+    
+                    <!-- this can do direct to header so always available-->
+                    % if ($c->is_logged_in && scalar @{SrvMngr::theme_list( $c )} > 1) {
+                    %= include 'partials/_swt_theme'
+                    % }
+    
+                </div>
+                <!--end::Container-->
+            </nav>
 
         <!--end::Header-->
 
 
 
         <!--begin::Sidebar-->
-        <aside class="app-sidebar bg-success-subtle" data-bs-theme="light">
-            <!--begin::Sidebar Brand-->
-            <div class="sidebar-brand sidebar-dark-primary">
-                <!--begin::Brand Link-->
-                <a href="../index.html" class="brand-link">
-                    <!--begin::Brand Image-->
-                    <img src="koozali/assets/img/Koozali_EyeIcon.png" alt="Koozali Logo"
-                        class="brand-image opacity-75 shadow" />
-                    <!--end::Brand Image-->
-                    <!--begin::Brand Text-->
-                    <span class="brand-text fw-light">Koozali</span>
-                    <!--end::Brand Text-->
-                </a>
-                <!--end::Brand Link-->
-            </div>
-            <!--end::Sidebar Brand-->
 
-            <!--begin::Sidebar Wrapper-->
-            <div class="sidebar-wrapper">
-                <nav class="mt-2">
-                    <!--begin::Sidebar Menu-->
-                    <ul class="nav sidebar-menu flex-column" data-lte-toggle="treeview" role="menu" data-accordion="false">
+            <aside class="app-sidebar bg-success-subtle" data-bs-theme="light">
+                <!--begin::Sidebar Brand-->
+                <div class="sidebar-brand sidebar-dark-primary">
+                    <!--begin::Brand Link-->
+                    <a href="../index.html" class="brand-link">
+                        <!--begin::Brand Image-->
+                        <img src="koozali/assets/img/Koozali_EyeIcon.png" alt="Koozali Logo"
+                            class="brand-image opacity-75 shadow" />
+                        <!--end::Brand Image-->
+                        <!--begin::Brand Text-->
+                        <span class="brand-text fw-light">Koozali</span>
+                        <!--end::Brand Text-->
+                    </a>
+                    <!--end::Brand Link-->
+                </div>
+                <!--end::Sidebar Brand-->
+    
+                <!--begin::Sidebar Wrapper-->
+                <div class="sidebar-wrapper">
+                    <nav class="mt-2">
+                        <!--begin::Sidebar Menu-->
+                        <ul class="nav sidebar-menu flex-column" data-lte-toggle="treeview" role="menu" data-accordion="false">
+    
+                            %= include 'partials/_sidebar_support_menu'
+    
+                            % if ( $c->is_logged_in ) {
+                            %= include 'partials/_sidebar_user_menu'
+                            % }
+    
+                            % if ( $c->is_admin ) {
+                            %= include 'partials/_sidebar_main_menu'
+                            % }
+    
+                        </ul>
+                        <!--end::Sidebar Menu-->
+                    </nav>
+                </div>
+                <!--end::Sidebar Wrapper-->
+            </aside>
 
-                        %= include 'partials/_sidebar_support_menu'
-
-                        % if ( $c->is_logged_in ) {
-                        %= include 'partials/_sidebar_user_menu'
-                        % }
-
-                        % if ( $c->is_admin ) {
-                        %= include 'partials/_sidebar_main_menu'
-                        % }
-
-                    </ul>
-                    <!--end::Sidebar Menu-->
-                </nav>
-            </div>
-            <!--end::Sidebar Wrapper-->
-        </aside>
         <!--end::Sidebar-->
 
 
         <!--begin::App Main-->
-        <main class="app-main">
 
-        <!-- Can add a header row here? -->
-        <!-- %= include 'partials/_app_content_header' -->
+            <main class="app-main">
+    
+            <!-- Can add a header row here? -->
+            <!-- %= include 'partials/_app_content_header' -->
+    
+                <!--begin::App Content-->
+                <div class="app-content">
+                    <!--begin::Container-->
+                    <div class="container-fluid">
+                        <!--begin::Rows-->
+                        <!-- Add breadcrumb here -->
+                        %= include 'partials/_app_content_breadcrumb'
+    
+                        <!-- We can add extra rows in the main panel here -->
+    
+                        <!-- %#= include 'partials/_app_content_first_row' -->
+                        <!-- %#= include 'partials/_app_content_demo_row' -->
+    
+                        <!--end::Rows-->
+    
+                        <br>
+    
+                        <!-- This is the main page content depening on the calling module -->
+                        <!-- nameofpanel.html.ep -->
+                        <!-- That will also include it's own _partials -->
+                        %#= dumper $c->current_route
+                        % if ($c->current_route ne 'login') {
+                            %= include 'partials/_panel_card_top'
+                            %= include 'partials/_panel_card_header'
+                        % }
+                        %= content 'module'
 
-            <!--begin::App Content-->
-            <div class="app-content">
-                <!--begin::Container-->
-                <div class="container-fluid">
-                    <!--begin::Rows-->
-                    <!-- Add breadcrumb here -->
-                    %= include 'partials/_app_content_breadcrumb'
-
-                    <! We can add extra rows in the main panel here -->
-                    <!-- %#= include 'partials/_app_content_first_row' -->
-                    <!-- %#= include 'partials/_app_content_demo_row' -->
-
-                    <!--end::Rows-->
-                    <br>
-
-                    <!-- This is the main page content depening on the calling module -->
-                    %= content 'module'
+                        % if ($c->current_route ne 'login') {
+                            %= include 'partials/_panel_card_footer'
+                            %= include 'partials/_panel_card_bottom'
+                        % }    
+                    </div>
                 </div>
-            </div>
-            <!--end::App Content-->
-
-        </main>
+                <!--end::App Content-->
+    
+            </main>
         <!--end::App Main-->
 
+        <!-- This is the original footer - move content to new one -->
         <!--  %= include 'partials/_footer'  -->
 
         <!--begin::Footer-->
-        <footer class="app-footer">
-            <!--begin::To the end-->
-            <div class="float-end d-none d-sm-inline">Anything you want</div>
-            <!--end::To the end-->
-            <!--begin::Copyright-->
-            <strong>
-                Copyright &copy; 2014-2025&nbsp;
-                <a href="https://adminlte.io" class="text-decoration-none">AdminLTE.io</a>.
-            </strong>
-            All rights reserved.
-            <!--end::Copyright-->
-        </footer>
+            <footer class="app-footer">
+                <!--begin::To the end-->
+                <div class="float-end d-none d-sm-inline">Anything you want</div>
+                <!--end::To the end-->
+                <!--begin::Copyright-->
+                <strong>
+                    Copyright &copy; 2014-2025&nbsp;
+                    <a href="https://adminlte.io" class="text-decoration-none">AdminLTE.io</a>.
+                </strong>
+                All rights reserved.
+                <!--end::Copyright-->
+            </footer>
         <!--end::Footer-->
     </div>
     <!--end::App Wrapper-->
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/letsencrypt.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/letsencrypt.html.ep
index edb0177..03d0aef 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/letsencrypt.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/letsencrypt.html.ep
@@ -6,9 +6,11 @@
 
 % content_for 'module' => begin
 
+<!-- needs moving -->
+
 %= stylesheet '/css/letsencrypt.css'
 
-<div>
+<div  class="card-body">
 
     % if (config->{debug} == 1) {
     <pre>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/localnetworks.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/localnetworks.html.ep
index 88936c9..3a364fd 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/localnetworks.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/localnetworks.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - localnetworks";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/manual.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/manual.html.ep
index 3e4fc8a..c8dc711 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/manual.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/manual.html.ep
@@ -1,8 +1,11 @@
 % layout 'AdminLTE', title => 'Sme server 2 - Manual';
 
 % content_for 'module' => begin
-<div id="" class="">
-    <p><h1><%= $title %></h1></p>
+
+<div class="card-body">
+    <p>
+    <h1><%= $title %></h1>
+    </p>
     %= $c->render_to_string( inline => stash 'modul' )
 </div>
 
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/module.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/module.html.ep
index de6328f..a281b5b 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/module.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/module.html.ep
@@ -2,9 +2,11 @@
 
 % content_for 'module' => begin
 
+<!-- should be moved? -->
+
 %= stylesheet '/css/module.css'
 
-<div id="" class="">
+<div class="card-body">
     % if (config->{debug} == 1) {
         <p>
             <strong>Debug Info:</strong>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/not_found.development.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/not_found.development.html.ep
index d39a236..65b2f03 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/not_found.development.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/not_found.development.html.ep
@@ -2,8 +2,9 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
-    <p><br>dev<br> Oups !!! 
+<div class="card-body">
+    <p>
+    <br>dev<br> Oups !!! 
         The page you were requesting
         "<%= $self->req->url->path || '/' %>"
         could not be found.
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/not_found.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/not_found.html.ep
index 4c72b9d..d52cb71 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/not_found.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/not_found.html.ep
@@ -1,6 +1,7 @@
 % layout 'AdminLTE', title => 'Sme server 2 - Error P';
-<div id="" class="">
-    <p><br><br>
+<div class="card-body">
+    <p>
+    <br><br>
         The page you were requesting
         "<%= $self->req->url->path || '/' %>"
         could not be found.
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/not_found.production.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/not_found.production.html.ep
index e3e5cbc..deffbec 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/not_found.production.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/not_found.production.html.ep
@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
     <p><br>dev<br> Oups !!! 
         The page you were requesting
         "<%= $self->req->url->path || '/' %>"
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/nutups.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/nutups.html.ep
index 8656adf..4ffbc61 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/nutups.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/nutups.html.ep
@@ -6,7 +6,7 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <pre>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_panel_card_footer.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_panel_card_footer.html.ep
index 6dd5cb2..8ce88b4 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_panel_card_footer.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_panel_card_footer.html.ep
@@ -1,4 +1,4 @@
 
                                 <!-- card footer -->
-                                <div class="card-footer">Footer</div>
+                                <div class="card-footer">Card Footer</div>
                                 <!-- /.card-footer-->
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_panel_card_header.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_panel_card_header.html.ep
index 061c04b..2ff6db5 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_panel_card_header.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_panel_card_header.html.ep
@@ -1,7 +1,7 @@
 
                                 <div class="card-header">
-                                    <h3 class="card-title">Card Title <%= $title%></h3>
+                                    <h3 class="card-title">Card Title - <%= $title%></h3>
 
-%= include 'partials/_panel_card_tools'
+                                    %= include 'partials/_panel_card_tools'
 
                                 </div>
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_panel_card_tools.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_panel_card_tools.html.ep
index 4c03981..640043c 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_panel_card_tools.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_panel_card_tools.html.ep
@@ -1,5 +1,7 @@
 
+                                    <!-- 
                                     <div class="card-tools">
+                                        
                                         <button type="button" class="btn btn-tool" data-lte-toggle="card-collapse"
                                             title="Collapse">
                                             <i data-lte-icon="expand" class="bi bi-plus-lg"></i>
@@ -9,4 +11,5 @@
                                             title="Remove">
                                             <i class="bi bi-x-lg"></i>
                                         </button>
-                                    </div>
\ No newline at end of file
+                                    </div>
+                                    -->
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/portforwarding.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/portforwarding.html.ep
index f86608d..c4f2d46 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/portforwarding.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/portforwarding.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - Port Forwards";
 
 % content_for 'module' => begin
-<div>
+
+<div  class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/printers.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/printers.html.ep
index 1b499df..5e39e33 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/printers.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/printers.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - printers";
 
 % content_for 'module' => begin
-<div id="" class="">
+
+<div class="card-body">
 
     %if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep
index a3b3dac..8563bb5 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep
@@ -1,7 +1,9 @@
 % layout 'AdminLTE', title => "Sme server 2 - proxy";
 
 % content_for 'module' => begin
-<div id="" class="">
+
+<div class="card-body">
+
     %if (config->{debug} == 1) {
     <p>(DBG)route: <%= $c->current_route %><br>
     (DBG)ht stat: <%= $prx_datas->{http_proxy_status}%> <br>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/pseudonyms.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/pseudonyms.html.ep
index 6193c07..8a042c0 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/pseudonyms.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/pseudonyms.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - pseudonyms";
 
 % content_for 'module' => begin
-<div class="">
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/qmailanalog.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/qmailanalog.html.ep
index 56202b0..fcf8943 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/qmailanalog.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/qmailanalog.html.ep
@@ -1,7 +1,12 @@
 % layout 'AdminLTE', title => "Sme server 2 - qmailanalog";
 % content_for 'module' => begin
+
+<!-- should be moved -->
+
 %= javascript '/js/qmailanalog.js'
-<div>
+
+<div class="card-body">
+
     %if (config->{debug} == 1) {
     <p>
     (DBG)route: <%= $c->current_route %><br>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/quota.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/quota.html.ep
index 0c89726..d875e6b 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/quota.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/quota.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - quota";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/reboot.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/reboot.html.ep
index 054dd11..7b9db30 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/reboot.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/reboot.html.ep
@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id="" class="">
+<div class="card-body">
 
     %if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep
index 40a4070..db511a2 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - remoteaccess";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/review.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/review.html.ep
index 69384ed..b03ac3e 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/review.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/review.html.ep
@@ -6,8 +6,7 @@
 %#= include 'partials/_panel_card_top'
 %#= include 'partials/_panel_card_header'
 
-
-<div>
+<div class="card-body">
 
     <h1> <%= $title %> </h1> 
     <!-- Header text -->
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/roundcube.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/roundcube.html.ep
index db63b08..1624b89 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/roundcube.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/roundcube.html.ep
@@ -3,7 +3,8 @@
 % content_for 'module' => begin
 
 
-<div id="" class="">
+<div class="card-body">
+
     % if (config->{debug} == 1) {
         <p>
             %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/support.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/support.html.ep
index 3c8d16b..7656e5f 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/support.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/support.html.ep
@@ -1,10 +1,12 @@
 % layout 'AdminLTE', title => 'Sme server 2 - Support';
 
 % content_for 'module' => begin
-<div id="" class="">
+
+<div class="card-body">
     <p> < %= $title % ></p>
     <br>
     <%= $modul %> 
     <br>
 </div>
+
 %end
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/useraccounts.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/useraccounts.html.ep
index ac6eb04..fffef73 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/useraccounts.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/useraccounts.html.ep
@@ -2,8 +2,8 @@
 
 % content_for 'module' => begin
 
-%= include 'partials/_panel_card_top'
-%= include 'partials/_panel_card_header'
+%#= include 'partials/_panel_card_top'
+%#= include 'partials/_panel_card_header'
 
 <div class="card-body">
 <!-- /.card-body -->
@@ -43,8 +43,8 @@
 
 </div>
 
-%= include 'partials/_panel_card_footer'
-%= include 'partials/_panel_card_bottom'
+%#= include 'partials/_panel_card_footer'
+%#= include 'partials/_panel_card_bottom'
 
 %end
 
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep
index 6cf1266..698c537 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep
@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles.html.ep
index bc498c2..3324ff7 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles.html.ep
@@ -1,7 +1,9 @@
 % layout 'AdminLTE', title => "Sme server 2 - viewlogfiles";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
+
     %if (config->{debug} == 1) {
     <p>
     (DBG)route: <%= $c->current_route %><br>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles2.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles2.html.ep
index 7eac823..fa0139e 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles2.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles2.html.ep
@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
 
     % if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/welcome.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/welcome.html.ep
index 3ed2a9e..b789bcb 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/welcome.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/welcome.html.ep
@@ -1,7 +1,9 @@
 % layout 'AdminLTE', title => 'Sme server 2 - IndexT';
 
 % content_for 'module' => begin
-<div>
+
+<div  class="card-body">
+
     <p>Index on line - Welcome page
     <br>
     </p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/whatever.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/whatever.html.ep
index 4accb7d..c0a24f4 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/whatever.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/whatever.html.ep
@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div>
+<div  class="card-body">
     <p><br>dev<br> What else !!! 
         The page you were requesting
         "<%= $self->req->url->path || '/' %>"
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/workgroup.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/workgroup.html.ep
index fb947cc..8bc2697 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/workgroup.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/workgroup.html.ep
@@ -1,7 +1,8 @@
 % layout 'AdminLTE', title => "Sme server 2 - workgroup";
 
 % content_for 'module' => begin
-<div>
+
+<div class="card-body">
 
     %if (config->{debug} == 1) {
     <p>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yum.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yum.html.ep
index ad9d75a..fa86833 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/yum.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/yum.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yumconfig.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yumconfig.html.ep
index 09b96da..5023cc0 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/yumconfig.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/yumconfig.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yuminstall.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yuminstall.html.ep
index c7c7386..2dea9d0 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/yuminstall.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/yuminstall.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yumlogfile.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yumlogfile.html.ep
index 359c3b6..84afe34 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/yumlogfile.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/yumlogfile.html.ep
@@ -6,7 +6,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yumpostupg.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yumpostupg.html.ep
index 9a44dac..ffe532f 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/yumpostupg.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/yumpostupg.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yumremove.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yumremove.html.ep
index a70147a..5fc6f97 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/yumremove.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/yumremove.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep
index f502a46..ebc3b7f 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep
@@ -2,7 +2,8 @@
 
 % content_for 'module' => begin
 
-<div>
+<div class="card-body">
+
     % if (config->{debug} == 1) {
     <p>
     %= dumper $c->current_route
diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec
index 2e9eb51..83c02ae 100644
--- a/smeserver-manager-AdminLTE.spec
+++ b/smeserver-manager-AdminLTE.spec
@@ -1,6 +1,6 @@
 %define name smeserver-manager-AdminLTE
 %define version 11.0.0
-%define release 7
+%define release 8
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -26,6 +26,11 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 
 %changelog
+* Fri Apr 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-8.sme
+- More cleanup
+- Add Card support across all panels except login
+- Disabled minimise and remove Card icons
+
 * Thu Apr 17 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-7.sme
 - Clean up review template (but footer in the wrong place)
 - Fix typo tabel