diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_add.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_add.html.ep
index 3e90c99..572926a 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_add.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_add.html.ep
@@ -1,62 +1,83 @@
-<div>
+<div class="container-sm">
+    <br>
+    <!-- <h2><%#= l 'grp_FORM_TITLE' %></h2> -->
 
-    % 	my $btn = l('ADD');
-
-    %= form_for '/groups2' => (method => 'POST') => begin
-	<p><h2>
-	%=l 'CREATE_GROUP'
-	</h2>
-	<br><br>
-	%=l 'grp_GROUP_NAMING'
-	</p>
-
-	<p>
-	<span class="">
-	%=l 'GROUP_NAME', class => ""
-	</span>
-	<span class="">
-	%= text_field 'groupName', class => ""
-	</span>
-	</p>
-
-	<p>
-	%=l 'grp_GROUP_DESC_EXPL'
-	<br><br>
-	<span class="">
-	%=l 'grp_GROUP_DESC', class => ""
-	</span>
-	<span class="">
-	%= text_field 'groupDesc', class => ""
-	</span>
-	</p>
-
-	<p>
-	<span class="">
-	%=l 'GROUP_MEMBERS', class => ""
-	</span>
+	<h2><%= l 'CREATE_GROUP' %></h2>
 	<br>
-	<span class="">
-	%= check_box 'groupMembers' => 'admin'
-	Administrator (admin)
+	<%= l 'grp_GROUP_NAMING' %>
+    <br><br>
+
+    % my $btn = l('ADD');  
+
+    <form action="/smanager/groups2" method="POST">
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+          <label for="inputGroupName" class="col-form-label"><%= l 'GROUP_NAME' %></label>
+        </div>
+        <div class="col-auto">
+          <input type="text" name="groupName" id="inputGroupName" class="form-control" aria-describedby="GroupName"  >
+        </div>
+        <div class="col-auto">
+          <span id="passwordHelpInline" class="form-text">
+            Group
+          </span>
+        </div>
+    </div>
+
+<!-- value="<%#= $usr_datas->{user} %>" -->
+
+    <br><br>
+
+    <%= l 'grp_GROUP_DESC_EXPL' %>
+    
+	<br><br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+          <label for="inputGroupDesc" class="col-form-label"><%= l 'grp_GROUP_DESC' %></label>
+        </div>
+        <div class="col-auto">
+          <input type="text" name="groupDesc" id="inputGroupDesc" class="form-control" aria-describedby="GroupDesc"  >
+        </div>
+        <div class="col-auto">
+          <span id="passwordHelpInline" class="form-text">
+            Group Alias
+          </span>
+        </div>
+    </div>
+
+    <br>
+
+	<div>
+	<%= l 'GROUP_MEMBERS' %>
+	</div>
+
 	<br>
-    %	 my $users = $c->gen_users_list();
-    %    foreach my $key ( sort keys %$users )
-    %    {
-	    %= check_box 'groupMembers' => $key
-	    %=$users->{$key}
-            %= "(" . $key . ")"
+	<div>
+    	%= check_box 'groupMembers' => 'admin'
+    	&nbspAdministrator (admin)
+    	<br>
+        % my $users = $c->gen_users_list();
+        % foreach my $key ( sort keys %$users ) {
+    	    %= check_box 'groupMembers' => $key
+			&nbsp
+    	    %= $users->{$key} 
+			%= "(" . $key . ")"
             <br>
-    %    }
-    </span>
-	</p>
-
-	<p>
+        % }
+    </div>
+    
 	<br><br>
-	%= submit_button "$btn", class => ""
-	</p>
+    
+	<div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <button type="submit" class="btn btn-primary"><%= $btn %></button>
+        </div>
+    </div>
 
 	%= hidden_field 'trt' => $grp_datas->{trt}
 	
-    % end    
+    %# end
 
 </div>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep
index 6382e9b..db6e8bc 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep
@@ -1,63 +1,71 @@
-<div>
+<div class="container-sm">
 
-    %	my $btn = l('REMOVE');
-    %= form_for '/groups2' => (method => 'POST') => begin
-	<p><h2>
-	%=l 'REMOVE_USER_GROUP'
-	</h2>
+    % my $btn = l('REMOVE');
 
-	<p>
-	%=l('grp_DELETE_DESCRIPTION', $grp_datas->{group}) 
-	</p>
+    <form action="/smanager/groups2" method="POST">
+    <br><br>
+
+	<h2><%=l 'REMOVE_USER_GROUP' %></h2>
+
+    <br>
+	
+	<%=l('grp_DELETE_DESCRIPTION', $grp_datas->{group}) %>
+	
+    <br><br>
+
+	<div>
+
+    % my $size = keys %$members;
+    % if ( ! $size ){
+      %= l 'ACCOUNT_GROUP_NONE'
+    % } else {
+	  %= l 'grp_GROUP_HAS_MEMBERS'
+
+	<br><br>
 
-	<p>
-    %	my $size = keys %$members;
-    %	if ( ! $size ){
-        %=l 'ACCOUNT_GROUP_NONE'
-    %	} else {
-	%=l 'grp_GROUP_HAS_MEMBERS'
-	<br>
 	<ul>
-    %    foreach my $key ( keys %$members)
-    %    {
-        <li>
-            %=$key
-            (
-            %=$members->{$key}
-            )
-    	</li>
-    %    }
-    	</ul>
-    %	}
-	</p>
+        % foreach my $key ( keys %$members) {
+            <li>
+                %=$key
+                ( <%=$members->{$key} %> )
+        	</li>
+        % }
+    </ul>
+    % }
 
-	<p>
-    %	$size = keys %$ibays;
-    %	if ( $size ) {
-    	    %=l 'grp_IBAYS_WILL_BE_CHANGED'
+	</div>
+
+    <br><br>
+
+	<div>
+
+    % $size = keys %$ibays;
+
+    % if ( $size ) {
+        %=l 'grp_IBAYS_WILL_BE_CHANGED'
 	    <br>
 	    <ul>
-    %		foreach my $key (sort ( keys %$ibays ))
-    %    	{
-    		    <li>
-        	    %=$key
-        	    (
-        	    %=$ibays->{$key}
-        	    )
-    		    </li>
-    %    	}
-    	    </ul>
-    % 	}
-	</p>
+        % foreach my $key (sort ( keys %$ibays )) {
+   		    <li>
+       	    %=$key
+       	    (
+       	    %=$ibays->{$key}
+       	    )
+   		    </li>
+        % }
+    	</ul>
+    % }
+	</div>
 	
-	<p>
-	<br>
-	%= submit_button "$btn", class => ""
-	</p>
+  	<div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <button type="submit" class="btn btn-primary"><%= $btn %></button>
+        </div>
+    </div>
 
-        %= hidden_field 'trt' => $grp_datas->{trt}
-        %= hidden_field 'groupName' => $grp_datas->{group}
+    %= hidden_field 'trt' => $grp_datas->{trt}
+    %= hidden_field 'groupName' => $grp_datas->{group}
 
-    % end    
+  
 
 </div>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep
index c1ada15..f2156cb 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep
@@ -1,71 +1,90 @@
 <div>
 
-    % 	my $btn = l('SAVE');
+    % my $btn = l('SAVE');
 
-    %= form_for '/groups2' => (method => 'POST') => begin
-
-	<p><h2>
-	%=l 'MODIFY_USER_GROUP'
-	</h2><br></p>
-
-	<p>
-	<span class="">
-	%=l 'GROUP_NAME', class => ""
-	</span>
-	<span class="">
-	%= $grp_datas->{group}, class => ""
-	</span>
-	</p>
-
-	<p>
-	%=l 'grp_GROUP_DESC_EXPL'
+    <form action="/smanager/groups2" method="POST">
+    
 	<br><br>
-	<span class="">
-	%=l 'grp_GROUP_DESC', class => ""
-	</span>
-	<span class="">
-	% param 'groupDesc' => $grp_datas->{description} unless param 'groupDesc';
-	%= text_field 'groupDesc', class => ""
-	</span>
-	</p>
+	
+	<h2><%= l 'MODIFY_USER_GROUP' %></h2>
+	
+	<br><br>
+	
+	<div class="row g-3 align-items-center">
+        <div class="col-md-2">
+          <label for="inputLastNAme" class="col-form-label"><%= l 'GROUP_NAME' %></label>
+        </div>
+        <div class="col-auto">
+          <input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $grp_datas->{group} %>">
+        </div>
+    </div>
+
+	<br><br>
+
+	<%=l 'grp_GROUP_DESC_EXPL'%>
+
+	<br><br>
+
+	% param 'groupDesc' => $grp_datas->{description} unless param 'groupDesc';
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-2">
+          <label for="inputGroupDesc" class="col-form-label"><%= l 'grp_GROUP_DESC' %></label>
+        </div>
+        <div class="col-auto">
+          <input type="text" name="groupDesc" id="inputGroupDesc" class="form-control" aria-describedby="GroupDesc" value="<%= $grp_datas->{description} %>">
+        </div>
+        <div class="col-auto">
+          <span id="passwordHelpInline" class="form-text">
+            Group Alias
+          </span>
+        </div>
+    </div>
+
+	<br><br>
+
+    <div>
+	    <%=l 'GROUP_MEMBERS' %>
+	</div>
 
-	<p>
-	<span class="">
-	%=l 'GROUP_MEMBERS', class => ""
-	</span>
 	<br>
-    <span class="">
+
+	<div>
 	% if ( $members->{'admin'} ) {
 	    %= check_box 'groupMembers', value => 'admin', checked => undef
-	%} else {
+	% } else {
 	    %= check_box 'groupMembers' => 'admin'
-	%}
-	Administrator (admin)
+	% }
+	&nbspAdministrator (admin)
+    </div>
+
 	<br>
 
-    %	 my $users = $c->gen_users_list();
-    %    foreach my $key ( sort keys %$users )
-    %    {
+    % my $users = $c->gen_users_list();
+    % foreach my $key ( sort keys %$users ) {
 	    % if ( $members->{ $key } ) {
-		<!-- % = check_box 'groupMembers', value => $key, checked => 'checked' -->
-		<input type='checkbox' name='groupMembers' checked value='<%= $key %>'>
-	    %} else {
-		%= check_box 'groupMembers' => $key
-	    %}
-	    %=$users->{$key} . " (" . $key . ")"
-            <br>
-    %    }
-    </span>
-	</p>
+		    <input type='checkbox' name='groupMembers' checked value='<%= $key %>'>
+	    % } else {
+		    %= check_box 'groupMembers' => $key
+			&nbsp
+	    % }
+	        %= $users->{$key} 
+			%= " (" . $key . ")"
+        <br>
+    % }
 
-	<p>
 	<br><br>
-	%= submit_button "$btn", class => ""
-	</p>
+
+  	<div class="row g-3 align-items-center">
+        <div class="col-md-2">
+            <button type="submit" class="btn btn-primary"><%= $btn %></button>
+        </div>
+    </div>
+
 
 	%= hidden_field 'trt' => $grp_datas->{trt}
-        %= hidden_field 'groupName' => $grp_datas->{group}
+    %= hidden_field 'groupName' => $grp_datas->{group}
 	
-    % end    
+
 
 </div>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep
index f58108e..d0b1e95 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep
@@ -24,6 +24,7 @@
     %   if ($numUsers == 0){
         %=l 'usr_NO_USER_ACCOUNTS'
     %   } else {
+    <div class="table-responsive">
     <table class="table table-bordered">
     <thead>
         <tr>
@@ -158,6 +159,7 @@
         % }
         </tbody>
         </table>
+        </div>
 
     <%} %>
 
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep
index f95504f..17dbefb 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep
@@ -1,4 +1,3 @@
-% content_for 'module' => begin
 
 <div class="container-sm">
     <br>
@@ -18,10 +17,10 @@
     
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
-              <label for="inputLastNAme" class="col-form-label"><%= l 'usr_ACCOUNT_NAME' %></label>
+              <label for="inputAccountName" class="col-form-label"><%= l 'usr_ACCOUNT_NAME' %></label>
             </div>
             <div class="col-auto">
-              <input type="text" id="inputUser" class="form-control" aria-describedby="LastName" value="<%= $usr_datas->{user} %>" >
+              <input type="text" name="user" id="inputAccountName" class="form-control" aria-describedby="AccountName" value="<%= $usr_datas->{user} %>" >
             </div>
             <div class="col-auto">
               <span id="passwordHelpInline" class="form-text">
@@ -30,8 +29,6 @@
             </div>
         </div>
     
-        %#= text_field 'user'
-    
         % } else {
             <!-- If not user set Button Save not Add -->
             % $btn = l('SAVE');
@@ -250,7 +247,6 @@
                     <th class="col-sm-1"><%= l 'usr_MEMBER' %></th>
                     <th class="col-sm-1"><%=l 'GROUP' %></th>
                     <th class="col-sm-1"><%=l 'DESCRIPTION' %></th>
-                    
                   </tr>
                 </thead>
                     <tbody>
@@ -296,7 +292,6 @@
                 %= hidden_field 'user' => $usr_datas->{user}
         % }
         
-        % end
     </form>
 </div>
 
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 216a6c8..01d096d 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/useraccounts.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/useraccounts.html.ep
@@ -15,7 +15,6 @@
     %= dumper $usr_datas
     </p>
     % }
-    
  
   <h1><%= $title%></h1>
   
diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec
index cfc84ae..14c0359 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 15
+%define release 16
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -26,8 +26,13 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 
 %changelog
+* Thu May 01 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-16.sme
+- Fix user add error
+- Update group templates
+
 * Fri Apr 25 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-15.sme
 - Forgot the updated CSS
+
 * Fri Apr 25 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-14.sme
 - Finish user templates. Saving fixed. Start on groups