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 cce90c6..842e337 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep
@@ -56,9 +56,8 @@
                 <label for="inputDirDepartment" class="col-form-label"><%= l 'dir_DEPARTMENT' %></label>
             </div>
             <div class="col-auto">
-              <input type="text" name="department" id="inputDirDepartment" class="form-control" aria-describedby="DirectoryDepartment" value="<%= $dir_datas->{department} %>">
-
-             </div>
+                <input type="text" name="department" id="inputDirDepartment" class="form-control" aria-describedby="DirectoryDepartment" value="<%= $dir_datas->{department} %>">
+            </div>
         </div>
 
         <br>
@@ -68,9 +67,8 @@
                 <label for="inputDirCompany" class="col-form-label"><%= l 'dir_COMPANY' %></label>
             </div>
             <div class="col-auto">
-              <input type="text" name="company" id="inputDirCompany" class="form-control" aria-describedby="DirectoryCompany" value="<%= $dir_datas->{company} %>">
-
-             </div>
+                <input type="text" name="company" id="inputDirCompany" class="form-control" aria-describedby="DirectoryCompany" value="<%= $dir_datas->{company} %>">
+            </div>
         </div>
 
         <br>
@@ -80,7 +78,8 @@
                 <label for="inputDirStreet" class="col-form-label"><%= l 'dir_STREET' %></label>
             </div>
             <div class="col-auto">
-              <input type="text" name="street" id="inputDirStreet" class="form-control" aria-describedby="DirectoryStreet" value="<%= $dir_datas->{street} %>">
+                <input type="text" name="street" id="inputDirStreet" class="form-control" aria-describedby="DirectoryStreet" value="<%= $dir_datas->{street} %>">
+            </div>
         </div>
 
         <br>
@@ -90,7 +89,8 @@
                 <label for="inputDirCity" class="col-form-label"><%= l 'dir_CITY' %></label>
             </div>
             <div class="col-auto">
-              <input type="text" name="city" id="inputDirCity" class="form-control" aria-describedby="DirectoryCity" value="<%= $dir_datas->{city} %>">
+                <input type="text" name="city" id="inputDirCity" class="form-control" aria-describedby="DirectoryCity" value="<%= $dir_datas->{city} %>">
+            </div>
         </div>
 
         <br>
@@ -100,7 +100,8 @@
                 <label for="inputDirPhoneNumber" class="col-form-label"><%= l 'dir_PHONENUMBER' %></label>
             </div>
             <div class="col-auto">
-              <input type="text" name="phonenumber" id="inputDirPhoneNumber" class="form-control" aria-describedby="DirectoryPhoneNmber" value="<%= $dir_datas->{phonenumber} %>">
+                <input type="text" name="phonenumber" id="inputDirPhoneNumber" class="form-control" aria-describedby="DirectoryPhoneNmber" value="<%= $dir_datas->{phonenumber} %>">
+            </div>
         </div>
 
         <br><br>
@@ -113,14 +114,12 @@
             <div class="col-md-2">
             <%= l 'dir_EXISTING' %>
             </div>
-
             <div class="col-auto">
-            <%= select_field 'existing'=> [[ (l 'dir_LEAVE') => 'leave'], [ (l 'dir_UPDATE') => 'update' ]], class => "form-select" %>
+                <%= select_field 'existing'=> [[ (l 'dir_LEAVE') => 'leave'], [ (l 'dir_UPDATE') => 'update' ]], class => "form-select" %>
             </div>
-
-            <br>
         </div>
 
+        <br>
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
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 8bc2697..acf19ba 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/workgroup.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/workgroup.html.ep
@@ -5,67 +5,98 @@
 <div class="card-body">
 
     %if (config->{debug} == 1) {
-    <p>
-    (DBG)route: <%= $c->current_route %><br>
-    (DBG)pdc: <%= $wkg_datas->{ServerRole}%><br>
-    (DBG)roam: <%= $wkg_datas->{RoamingProfiles}%><br>
-    </p>
+    <div>
+        (DBG)route: <%= $c->current_route %><br>
+        (DBG)pdc: <%= $wkg_datas->{ServerRole}%><br>
+        (DBG)roam: <%= $wkg_datas->{RoamingProfiles}%><br>
+    </div>
     %}
-    
+
     <h1><%= $title %></h1>
     <br>
     <%= $modul %>
-    <%  my $btn = l('SAVE');
-     %>
+    <%  my $btn = l('SAVE'); %>
 
-    %= form_for 'workgroup' => (method => 'POST') => begin
-    <p>
-    %=l 'wkg_DESC_WORKGROUP', class => ""
-    <br><br>
-    <span class="">
-    %=l 'wkg_LABEL_WORKGROUP', class => ""
-    </span>
-    <span class="">
-    %= text_field 'Workgroup' =>  $wkg_datas->{Workgroup}, class => "" , pattern=>".{1,15}", title=>"Limited to 15 characters by the NETBIOS"
-    </span>
-    </p>
-    <p>
-    %=l 'wkg_DESC_SERVERNAME', class => ""
-    <br><br>
-    <span class="">
-    %=l 'wkg_LABEL_SERVERNAME', class => ""
-    </span>
-    <span class="">
-    %= text_field 'ServerName' =>  $wkg_datas->{ServerName}, class => ""
-    </span>
-    </p>
-    <p>
-        %= $c->render_to_string(inline => l 'wkg_DESC_PDC')
-    <br>
-    <span class="">
-    %=l 'wkg_LABEL_PDC', class => ""
-    </span>
-    <span class="">
-    % param 'ServerRole' => $wkg_datas->{ServerRole} unless param 'ServerRole';
-    %= select_field 'ServerRole' =>  [[ (l 'YES') => 'PDC'], [ (l 'NO') => 'WS']], class => ""
-    </span>
-    </p>
-    <p>
-        %= $c->render_to_string(inline => l 'wkg_DESC_ROAM')
-    <br>
-    <span class="">
-    %=l 'wkg_LABEL_ROAM', class => ""
-    </span>
-    <span class="">
-    % param 'RoamingProfiles' => $wkg_datas->{RoamingProfiles} unless param 'RoamingProfiles';
-    %= select_field 'RoamingProfiles' =>  [[ (l 'YES') => 'yes'], [ (l 'NO') => 'no']], class => ""
-    </span>
-    </p>
-    <p>
-    <br>
-    %= submit_button "$btn", class => ""
-    </p>
-    % end    
+    <form action="/smanager/workgroup" method="POST">
 
+        <div>
+            <%= l 'wkg_DESC_WORKGROUP' %>
+        </div>
+
+        <br>
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <label for="inputWorkgroup" class="col-form-label"><%= l 'wkg_LABEL_WORKGROUP' %></label>
+                </div>
+                <div class="col-auto">
+                    <input type="text" name="Workgroup" id="inputWorkgroup" class="form-control" aria-describedby="inputWorkgroup" maxlength="15" value="<%= $wkg_datas->{Workgroup}%>" >
+            </div>
+                <div class="col-auto">
+                  <span id="passwordHelpInline" class="form-text">
+                    Limited to 15 characters by the NETBIOS
+                  </span>
+                </div>
+        </div>
+
+        <br>
+
+        <div>
+            <%= l 'wkg_DESC_SERVERNAME' %>
+        </div>
+
+        <br>
+            <div class="row g-3 align-items-center">
+                <div class="col-md-1">
+                    <label for="inputSambaServerName" class="col-form-label"><%= l 'wkg_LABEL_SERVERNAME' %></label>
+                </div>
+                <div class="col-auto">
+                <input type="text" name="ServerName" id="inputSambaServerName" class="form-control" aria-describedby="inputSambaServerName"  value="<%= $wkg_datas->{ServerName}%>" >
+            </div>
+        </div>
+
+        <br>
+
+        <div>
+            %= $c->render_to_string(inline => l 'wkg_DESC_PDC')
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'wkg_LABEL_PDC' %>
+            </div>
+            <div class="col-auto">
+                % param 'ServerRole' => $wkg_datas->{ServerRole} unless param 'ServerRole';
+                <%= select_field 'ServerRole' =>  [[ (l 'YES') => 'PDC'], [ (l 'NO') => 'WS']], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <div>
+            <%= $c->render_to_string(inline => l 'wkg_DESC_ROAM') %>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'wkg_LABEL_ROAM' %>
+            </div>
+            <div class="col-auto">
+                % param 'RoamingProfiles' => $wkg_datas->{RoamingProfiles} unless param 'RoamingProfiles';
+                <%= select_field 'RoamingProfiles' =>  [[ (l 'YES') => 'yes'], [ (l 'NO') => 'no']], class => "form-select" %>
+            </div>
+        </div>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 </div>
+
 %end
\ No newline at end of file