diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_up2.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_up2.html.ep
index aab1530..47a3788 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_up2.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_up2.html.ep
@@ -1,6 +1,6 @@
 <div>
 
-    %   my $btn = l('SAVE');
+    % my $btn = l('SAVE');
 
     <form action="/smanager/domains2" method="POST">
 
@@ -9,7 +9,7 @@
     </div>
 
     <br>
-    
+
     <div class="row g-3 align-items-center">
         <div class="col-md-3">
             <label for="inputCorpDNSPrimary" class="col-form-label"><%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' %></label>
@@ -40,7 +40,7 @@
         </div>
     </div>
     <%= hidden_field 'trt' => $dom_datas->{trt} %>
-    
+
     </form>
 
 </div>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_upd.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_upd.html.ep
index 4952983..478f2ee 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_upd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_upd.html.ep
@@ -1,74 +1,88 @@
 <div>
 
-    %   my $btn = l('ADD');
+    % my $btn = l('ADD');
 
-    %= form_for '/domains2' => (method => 'POST') => begin
-    <p>
-    <h2>
-    % if ( $dom_datas->{trt} eq "ADD" ) {
-    %=l 'dom_CREATE_TITLE'
-    % } else {
-    %=l 'dom_MODIFY_TITLE'
-    %   $btn = l('MODIFY');
-    % }
-    </h2>
-    </p>
+    <form action="/smanager/domains2" method="POST">
 
-    <p><br>
-    <span class="">
-    %=l 'DOMAIN_NAME', class => ""
-    </span>
-    <span class="">
-    % if ( $dom_datas->{trt} eq "ADD" ) {
-    % param 'Domain' => $dom_datas->{domain} unless param 'Domain';
-    %= text_field 'Domain', class => ""
-    % } else {
-        %= hidden_field 'Domain' => $dom_datas->{domain}
-    %= $dom_datas->{domain}, class => ""
-    % }
-    </span>
-    </p>
-
-    <p><br>
-    <span class="">
-    %=l 'DESCRIPTION_BRIEF', class => ""
-    </span>
-    <span class="">
-    % param 'Description' => $dom_datas->{description} unless param 'Description';
-    %= text_field 'Description', class => ""
-    </span>
-    </p>
-
-    <p><br>
-    %=l 'dom_CONTENT_FIELD_DESCRIPTION'
     <br>
-    <span class="">
-    %= $c->l('dom_CONTENT', '');
-    </span>
-    <span class="">
-    % param 'Content' => $dom_datas->{content} unless param 'Content';
-    %= select_field 'Content', $c->content_options_list(), class => ""
-    </span>
-    </p>
 
-    <p><br>
-    %=l 'dom_DESC_NAMESERVERS'
+    <div>
+        <h2>
+        % if ( $dom_datas->{trt} eq "ADD" ) {
+            <%=l 'dom_CREATE_TITLE' %>
+        % } else {
+            <%=l 'dom_MODIFY_TITLE' %>
+            % $btn = l('MODIFY');
+        % }
+        </h2>
+    </div>
+
     <br>
-    <span class="">
-    %=l 'dom_LABEL_NAMESERVERS', class => ""
-    </span>
-    <span class="">
-    % param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers';
-    %= select_field 'Nameservers', $c->nameserver_options_list(), class => ""
-    </span>
-    </p>
 
-    <p><br>
-    %= submit_button "$btn", class => ""
-    </p>
+    <div class="row g-3 align-items-center">
+        <div class="col-md-3">
+            <%=l 'DOMAIN_NAME' %>
+        </div>
+        <div class="col-auto">
+        % if ( $dom_datas->{trt} eq "ADD" ) {
+            % param 'Domain' => $dom_datas->{domain} unless param 'Domain';
+            <%= text_field 'Domain' %>
+        % } else {
+            <%= hidden_field 'Domain' => $dom_datas->{domain} %>
+            <%= $dom_datas->{domain} %>
+        % }
+        </div>
+    </div>
 
-    %= hidden_field 'trt' => $dom_datas->{trt}
+    <br>
 
-    %end
+    <div class="row g-3 align-items-center">
+        <div class="col-md-3">
+            <label for="inputDomainDesc" class="col-form-label"><%=l 'DESCRIPTION_BRIEF' %></label>
+        </div>
+        <div class="col-auto">
+            % param 'Description' => $dom_datas->{description} unless param 'Description';
+            <input type="text" name="Description" id="DomainDesc" class="form-control" aria-describedby="inputCorpDNSPrimary" value="<%= $dom_datas->{description} %>">
+        </div>
+    </div>
+
+    <br>
+    <%=l 'dom_CONTENT_FIELD_DESCRIPTION' %>
+    <br><br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-3">
+            <label for="inputDomainContent" class="col-form-label"><%= $c->l('dom_CONTENT') %></label>
+        </div>
+        <div class="col-auto">
+            % param 'Content' => $dom_datas->{content} unless param 'Content';
+            <%= select_field 'Content', $c->content_options_list(), class => "form-select", id => "inputDomainContent" %>
+        </div>
+    </div>
+
+    <br>
+    <%=l 'dom_DESC_NAMESERVERS' %>
+    <br><br>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-md-3">
+        <label for="inputDomainNameServers" class="col-form-label"><%=l 'dom_LABEL_NAMESERVERS' %></label>
+        </div>
+        <div class="col-auto">
+            % param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers';
+            <%= select_field 'Nameservers', $c->nameserver_options_list(), class => "form-select", id => "inputDomainNameServers" %>
+        </div>
+    </div>
+
+    <br>
+
+    <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' => $dom_datas->{trt} %>
+
+    </form>
 
 </div>
diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec
index 26539ef..8a49e0b 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 22
+%define release 23
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -26,6 +26,9 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 
 %changelog
+* Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-23.sme
+- Domains done plus more tweaks
+
 * Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-22.sme
 - Hosts done and a few tweaks