diff --git a/internal/core/templates/share_invite_new.html b/internal/core/templates/share_invite_new.html
index 90ed29f..585786b 100644
--- a/internal/core/templates/share_invite_new.html
+++ b/internal/core/templates/share_invite_new.html
@@ -8,11 +8,12 @@
 </div>
 <div class="modal-body">
   <form method="post" action="/repeaters/{{.Repeater.PublicID}}/share/link" id="new-invite-form">
-    <div class="mb-3">
-      <label class="form-label" for="share_description">Description <span class="text-secondary">(optional)</span></label>
-      <input type="text" class="form-control" id="share_description" name="description" placeholder="e.g. for Bob's modem" maxlength="100">
-    </div>
-    <p class="text-secondary mb-0">
+    <div class="hr-text hr-text-left mt-0 mb-3">Details</div>
+    <label class="form-label" for="share_description">Description <span class="text-secondary">(optional)</span></label>
+    <input type="text" class="form-control" id="share_description" name="description" placeholder="e.g. for Bob's modem" maxlength="100">
+
+    <div class="hr-text hr-text-left mt-5 mb-3">Permissions</div>
+    <p class="text-secondary">
       Choose which commands the recipient may send once they accept — you can change these any time
       afterwards. Risky commands can take over or brick the node; grant them only with care.
     </p>
diff --git a/internal/core/templates/share_org_limits.html b/internal/core/templates/share_org_limits.html
index d25c338..03e2255 100644
--- a/internal/core/templates/share_org_limits.html
+++ b/internal/core/templates/share_org_limits.html
@@ -10,25 +10,13 @@
 </div>
 <div class="modal-body">
   <form method="post" action="/repeaters/{{.Repeater.PublicID}}/orgs/{{.Org.Slug}}/limits" id="org-access-form">
-    <label class="form-check form-switch mb-3">
+    <div class="hr-text hr-text-left mt-0 mb-3">Sharing</div>
+    <label class="form-check form-switch">
       <input class="form-check-input" type="checkbox" name="include" value="1" {{if not .Excluded}}checked{{end}}>
       <span class="form-check-label"><strong>Shared with {{.Org.Name}}</strong></span>
     </label>
-    {{if .Excluded}}
-    <div class="alert alert-warning" role="alert">
-      <div class="d-flex">
-        <div class="me-2">{{template "icon-alert" ""}}</div>
-        <div>
-          <h4 class="alert-title">This repeater is opted out of {{.Org.Name}}</h4>
-          <p class="mb-0">
-            While it's opted out, <strong>no one</strong> in {{.Org.Name}} can run <strong>any</strong>
-            command below. You can still set these limits now — turn on <strong>Shared with {{.Org.Name}}</strong>
-            above and Save to opt back in.
-          </p>
-        </div>
-      </div>
-    </div>
-    {{end}}
+
+    <div class="hr-text hr-text-left mt-5 mb-3">Permissions</div>
     <p class="text-secondary">
       Restrict which of the commands <strong>{{.Org.Name}}</strong> is permitted to run actually run on
       “{{.Repeater.Name}}”.
@@ -37,6 +25,21 @@
       Commands badged <span class="badge bg-success-lt">Admins</span> are available only to organization
       admins; <span class="badge bg-azure-lt">Members</span> to everyone.
     </p>
+    {{if .Excluded}}
+    <div class="alert alert-warning" role="alert">
+      <div class="d-flex">
+        <div class="me-2">{{template "icon-alert" ""}}</div>
+        <div>
+          <h4 class="alert-title">This repeater is opted out of {{.Org.Name}}</h4>
+          <p class="mb-0">
+            While it's opted out, <strong>no one</strong> in {{.Org.Name}} can run <strong>any</strong>
+            command below. You can still set these limits now — turn on
+            <strong>Shared with {{.Org.Name}}</strong> above and Save to opt back in.
+          </p>
+        </div>
+      </div>
+    </div>
+    {{end}}
     {{template "command-grid" .}}
   </form>
 </div>