diff --git a/lavender/manage-apps-create.go.html b/lavender/manage-apps-create.go.html
index 005914e..e0d3dc2 100644
--- a/lavender/manage-apps-create.go.html
+++ b/lavender/manage-apps-create.go.html
@@ -10,7 +10,7 @@
 <main>
     <div class="center-box sm:max-w-2xl">
         <h1 class="box-title">Create Client Application</h1>
-        <form method="POST" action="/manage/apps" class="space-y-4 md:space-y-6">
+        <form id="manage-apps-create" method="POST" action="/manage/apps" class="space-y-4 md:space-y-6">
             <input type="hidden" name="action" value="create"/>
             <input type="hidden" name="offset" value="{{.Offset}}"/>
             <div>
@@ -66,11 +66,13 @@
                     </div>
                 </div>
             </div>
-            <div class="grid grid-cols-2 gap-4">
-                <button name="create_action" value="create" class="btn-green">Create</button>
-                <button name="create_action" value="cancel" class="btn-red">Cancel</button>
-            </div>
         </form>
+        <div class="grid grid-cols-2 gap-4">
+            <button type="submit" class="btn-green" form="manage-apps-create">Create</button>
+            <form method="GET" action="/manage/apps">
+                <button type="submit" class="btn-red">Cancel</button>
+            </form>
+        </div>
     </div>
 </main>
 </body>
diff --git a/lavender/manage-apps-edit.go.html b/lavender/manage-apps-edit.go.html
index 296ebf5..96e7f79 100644
--- a/lavender/manage-apps-edit.go.html
+++ b/lavender/manage-apps-edit.go.html
@@ -10,7 +10,7 @@
 <main>
     <div class="center-box sm:max-w-2xl">
         <h1 class="box-title">Edit Client Application</h1>
-        <form method="POST" action="/manage/apps" class="space-y-4 md:space-y-6">
+        <form id="manage-apps-edit" method="POST" action="/manage/apps" class="space-y-4 md:space-y-6">
             <input type="hidden" name="action" value="create"/>
             <input type="hidden" name="offset" value="{{.Offset}}"/>
             <input type="hidden" name="subject" value="{{.EditApp.Subject}}"/>
@@ -70,11 +70,13 @@
                     </div>
                 </div>
             </div>
-            <div class="grid grid-cols-2 gap-4">
-                <button name="edit_action" value="edit" class="btn-green">Save</button>
-                <button name="edit_action" value="cancel" class="btn-red">Cancel</button>
-            </div>
         </form>
+        <div class="grid grid-cols-2 gap-4">
+            <button type="submit" class="btn-green" form="manage-apps-edit">Save</button>
+            <form method="GET" action="/manage/apps">
+                <button type="submit" class="btn-red">Cancel</button>
+            </form>
+        </div>
     </div>
 </main>
 </body>
diff --git a/lavender/manage-apps.go.html b/lavender/manage-apps.go.html
index 477ae7e..8222ae0 100644
--- a/lavender/manage-apps.go.html
+++ b/lavender/manage-apps.go.html
@@ -37,6 +37,9 @@
     {{end}}
 
     <h1 class="box-title">Manage Client Applications</h1>
+    <form method="GET" action="/manage/apps/create">
+        <button type="submit" class="btn-green">New Client Application</button>
+    </form>
 
     <div class="relative overflow-x-auto shadow-md sm:rounded-lg w-full">
         <table class="table-default">
@@ -60,8 +63,8 @@
                     <td>{{.Domain}}</td>
                     <td>
                         <label class="flex items-center">
-                            <input type="checkbox" disabled class="focus:outline-none appearance-none relative peer w-6 h-6 border border-gray-300 rounded bg-gray-50 focus:ring focus:ring-3 focus:ring-emerald-300 dark:bg-gray-700 dark:border-gray-600 dark:focus:ring-emerald-600 dark:ring-offset-gray-800 checked:bg-emerald-700" {{if .Active}}checked{{end}}/>
-                            <svg class="absolute w-6 h-6 mt-1 hidden peer-checked:block pointer-events-none text-gray-200" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="4" stroke-linecap="round" stroke-linejoin="round">
+                            <input type="checkbox" disabled {{if .Active}}checked{{end}}/>
+                            <svg class="check" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="4" stroke-linecap="round" stroke-linejoin="round">
                                 <polyline points="20 6 9 17 4 12"></polyline>
                             </svg>
                             <span class="hidden">Active</span>
diff --git a/lavender/manage-users-edit.go.html b/lavender/manage-users-edit.go.html
index 3c48f58..d9dbb85 100644
--- a/lavender/manage-users-edit.go.html
+++ b/lavender/manage-users-edit.go.html
@@ -10,7 +10,7 @@
 <main>
     <div class="center-box sm:max-w-2xl">
         <h1 class="box-title">Edit User</h1>
-        <form method="POST" action="/manage/users" class="space-y-4 md:space-y-6">
+        <form id="manage-users-edit" method="POST" action="/manage/users" class="space-y-4 md:space-y-6">
             <input type="hidden" name="action" value="create"/>
             <input type="hidden" name="offset" value="{{.Offset}}"/>
             <input type="hidden" name="subject" value="{{.EditUser.Subject}}"/>
@@ -36,11 +36,13 @@
                     </div>
                 </div>
             </div>
-            <div class="grid grid-cols-2 gap-4">
-                <button name="edit_action" value="edit" class="btn-green">Save</button>
-                <button name="edit_action" value="cancel" class="btn-red">Cancel</button>
-            </div>
         </form>
+        <div class="grid grid-cols-2 gap-4">
+            <button type="submit" class="btn-green" form="manage-users-edit">Save</button>
+            <form method="GET" action="/manage/users">
+                <button type="submit" class="btn-red">Cancel</button>
+            </form>
+        </div>
     </div>
 </main>
 </body>
diff --git a/lavender/manage-users.go.html b/lavender/manage-users.go.html
index b3c33b7..780e6c0 100644
--- a/lavender/manage-users.go.html
+++ b/lavender/manage-users.go.html
@@ -42,8 +42,8 @@
                     <td>{{.UpdatedAt}}</td>
                     <td>
                         <label class="flex items-center">
-                            <input type="checkbox" disabled class="focus:outline-none appearance-none relative peer w-6 h-6 border border-gray-300 rounded bg-gray-50 focus:ring focus:ring-3 focus:ring-emerald-300 dark:bg-gray-700 dark:border-gray-600 dark:focus:ring-emerald-600 dark:ring-offset-gray-800 checked:bg-emerald-700" {{if .Active}}checked{{end}}/>
-                            <svg class="absolute w-6 h-6 mt-1 hidden peer-checked:block pointer-events-none text-gray-200" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="4" stroke-linecap="round" stroke-linejoin="round">
+                            <input type="checkbox" disabled {{if .Active}}checked{{end}}/>
+                            <svg class="check" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="4" stroke-linecap="round" stroke-linejoin="round">
                                 <polyline points="20 6 9 17 4 12"></polyline>
                             </svg>
                             <span class="hidden">Active</span>