diff --git a/app/views/organizations/_affiliation_fields.html.erb b/app/views/organizations/_affiliation_fields.html.erb
index c687886a6..9c545c151 100644
--- a/app/views/organizations/_affiliation_fields.html.erb
+++ b/app/views/organizations/_affiliation_fields.html.erb
@@ -1,83 +1,96 @@
 <% if allowed_to?(:manage?, Organization) %>
   <% expired = f.object.inactive? || (f.object.end_date.present? && f.object.end_date < Date.current) %>
   <div data-controller="inactive-toggle">
-    <div class="nested-fields flex flex-wrap gap-x-4 gap-y-1 items-end mb-4 rounded-lg border p-3 <%= expired ? 'bg-gray-100 border-gray-300 opacity-60' : 'bg-white border-gray-200' %>"
+    <div class="nested-fields mb-4 rounded-lg border px-3 pt-3 pb-1 <%= expired ? 'bg-gray-100 border-gray-300 opacity-60' : 'bg-white border-gray-200' %>"
          style="border-left: 4px solid <%= f.object.facilitator? ? '#e879f9' : '#d1d5db' %>"
          <% if f.object.persisted? %>id="<%= dom_id(f.object) %>"<% end %>
          data-inactive-toggle-target="row">
-      <div style="width: 350px; min-width: 350px; flex-shrink: 0;" data-inactive-toggle-target="profileButton">
-        <% if f.object.persisted? && f.object.person.present? %>
-          <label class="block text-sm font-medium text-gray-700 mb-1">Person</label>
-          <% show_email = f.object.person.profile_show_email? || allowed_to?(:manage?, Person) %>
-          <%= person_profile_button(f.object.person, truncate_at: 30, subtitle: (f.object.person.preferred_email if show_email)) %>
-          <%= f.hidden_field :person_id %>
-        <% else %>
-          <%= f.input :person_id,
-            include_blank: true,
-            required: true,
-            input_html: {
-              data: {
-                controller: "remote-select",
-                remote_select_model_value: "person"
-              }
-            },
-            label: "Person"
-          %>
-        <% end %>
-      </div>
-
-      <div class="w-full sm:w-auto" style="min-width: 200px;">
-        <%= f.input :title,
-                    as: :text,
-                    input_html: {
-                      rows: 1,
-                      value: f.object&.title || "Facilitator",
-                      style: "height: 42px; min-height: 42px;",
-                      data: {
-                        inactive_toggle_target: "title",
-                        action: "affiliation-dates#recalculate inactive-toggle#updateBorder"
-                      }
-                    } %>
-      </div>
+      <div class="flex gap-x-4 items-start">
+        <div class="shrink-0" style="width: 280px;" data-inactive-toggle-target="profileButton">
+          <% if f.object.persisted? && f.object.person.present? %>
+            <label class="block font-medium text-gray-700 mb-1">Person</label>
+            <% show_email = f.object.person.profile_show_email? || allowed_to?(:manage?, Person) %>
+            <%= person_profile_button(f.object.person, truncate_at: 25, subtitle: (f.object.person.preferred_email if show_email)) %>
+            <%= f.hidden_field :person_id %>
+          <% else %>
+            <label class="block font-medium text-gray-700 mb-1">Person <abbr>*</abbr></label>
+            <div class="rounded-md border border-gray-300 shadow-sm overflow-hidden" style="height: 56px;">
+              <%= f.input :person_id,
+                include_blank: true,
+                required: true,
+                wrapper_html: { class: "mb-0 h-full" },
+                input_html: {
+                  class: "h-full border-0",
+                  data: {
+                    controller: "remote-select",
+                    remote_select_model_value: "person"
+                  }
+                },
+                label: false
+              %>
+            </div>
+          <% end %>
+        </div>
 
-      <div class="w-full sm:w-auto">
-        <%= f.input :start_date,
-                    as: :string,
-                    label: "Start",
-                    input_html: {
-                      type: "date",
-                      value: (f.object.start_date || (Date.current unless f.object.persisted?))&.strftime("%Y-%m-%d"),
-                      class: "rounded-md border-gray-300 focus:ring-blue-500 focus:border-blue-500 text-sm",
-                      data: { action: "change->affiliation-dates#recalculate" }
-                    } %>
-      </div>
+        <div class="flex-1" style="min-width: 150px;">
+          <%= f.input :title,
+                      as: :text,
+                      wrapper_html: { class: "mb-0" },
+                      input_html: {
+                        rows: 1,
+                        value: f.object&.title || "Facilitator",
+                        style: "height: 56px; min-height: 56px; padding-top: 14px;",
+                        data: {
+                          inactive_toggle_target: "title",
+                          action: "affiliation-dates#recalculate inactive-toggle#updateBorder"
+                        }
+                      } %>
+        </div>
 
-      <div class="w-full sm:w-auto">
-        <%= f.input :end_date,
-                    as: :string,
-                    label: "End",
-                    input_html: {
-                      type: "date",
-                      value: f.object.end_date&.strftime("%Y-%m-%d"),
-                      class: "rounded-md border-gray-300 focus:ring-blue-500 focus:border-blue-500 text-sm",
-                      data: {
-                        inactive_toggle_target: "endDate",
-                        action: "change->inactive-toggle#toggle change->affiliation-dates#recalculate"
-                      }
-                    } %>
-      </div>
+        <div class="shrink-0">
+          <%= f.input :start_date,
+                      as: :string,
+                      label: "Start",
+                      wrapper_html: { class: "mb-0" },
+                      input_html: {
+                        type: "date",
+                        value: (f.object.start_date || (Date.current unless f.object.persisted?))&.strftime("%Y-%m-%d"),
+                        class: "rounded-md border-gray-300 focus:ring-blue-500 focus:border-blue-500 text-sm",
+                        style: "height: 56px;",
+                        data: { action: "change->affiliation-dates#recalculate" }
+                      } %>
+        </div>
 
-      <div class="w-full sm:w-auto pb-3">
-        <label class="block text-sm font-medium text-gray-700 mb-1">Primary contact</label>
-        <%= f.check_box :primary_contact,
-                        checked: f.object.primary_contact? || !f.object.persisted?,
-                        class: "h-4 w-4 text-blue-600 border-gray-300 rounded focus:ring-blue-500" %>
-      </div>
+        <div class="shrink-0">
+          <%= f.input :end_date,
+                      as: :string,
+                      label: "End",
+                      wrapper_html: { class: "mb-0" },
+                      input_html: {
+                        type: "date",
+                        value: f.object.end_date&.strftime("%Y-%m-%d"),
+                        class: "rounded-md border-gray-300 focus:ring-blue-500 focus:border-blue-500 text-sm",
+                        style: "height: 56px;",
+                        data: {
+                          inactive_toggle_target: "endDate",
+                          action: "change->inactive-toggle#toggle change->affiliation-dates#recalculate"
+                        }
+                      } %>
+        </div>
 
-      <div class="w-full text-right admin-only">
-        <%= link_to_remove_association "Remove",
-                                       f,
-                                       class: "text-sm text-gray-400 hover:text-red-600 underline whitespace-nowrap admin-only bg-blue-100 rounded px-2 py-1" %>
+        <div class="shrink-0 whitespace-nowrap">
+          <label class="block font-medium text-gray-700 mb-1">Primary org contact</label>
+          <div class="pt-2">
+            <%= f.check_box :primary_contact,
+                            checked: f.object.primary_contact? || !f.object.persisted?,
+                            class: "h-4 w-4 text-blue-600 border-gray-300 rounded focus:ring-blue-500" %>
+          </div>
+          <div class="-mb-2 text-right">
+            <%= link_to_remove_association "Remove",
+                                           f,
+                                           class: "text-sm text-gray-400 hover:text-red-600 underline whitespace-nowrap" %>
+          </div>
+        </div>
       </div>
     </div>
   </div>
diff --git a/app/views/organizations/_form.html.erb b/app/views/organizations/_form.html.erb
index 9a7c54400..08156bb25 100644
--- a/app/views/organizations/_form.html.erb
+++ b/app/views/organizations/_form.html.erb
@@ -102,56 +102,7 @@
 
     <div class="rounded-lg border border-gray-200 bg-gray-50 p-4 mb-4 shadow-sm">
 
-  <% org_earliest_aff = f.object.persisted? ? f.object.affiliations.minimum(:start_date) : nil %>
-  <% org_aff_ended = f.object.persisted? && f.object.affiliations.any? && !f.object.affiliations.active.exists? %>
-  <% org_latest_end = f.object.persisted? ? f.object.affiliations.maximum(:end_date) : nil %>
-  <% org_end_date = org_aff_ended ? org_latest_end : f.object.end_date %>
   <div class="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
-    <% if allowed_to?(:manage?, Organization) %>
-      <div class="">
-        <div class="shrink-0 relative group cursor-help">
-          <label class="inline-flex items-center gap-1 text-md font-medium text-gray-700 mb-1">
-            Affiliated since <i class="fa-solid fa-circle-info text-gray-400 text-xs"></i>
-          </label>
-          <div class="hidden group-hover:block absolute z-50 left-0 bottom-full mb-1 bg-blue-100 text-gray-700 text-xs rounded-lg shadow-lg ring-1 ring-blue-200 p-3 w-64 whitespace-normal">
-            <% if has_affiliations && org_earliest_aff.present? %>
-              <p>Auto-managed from affiliation records. Earliest affiliation start date: <%= org_earliest_aff.strftime('%b %Y') %>.</p>
-              <% if f.object.start_date.present? && f.object.start_date.beginning_of_month != org_earliest_aff.beginning_of_month %>
-                <p class="mt-2 text-gray-500"><i class="fa-solid fa-circle-info mr-1"></i>Organization start_date (<%= f.object.start_date.strftime('%b %Y') %>) differs from earliest affiliation.</p>
-              <% end %>
-            <% elsif has_affiliations %>
-              <p>Auto-managed from affiliation records.<br><br><span class="text-amber-700 font-medium">⚠ No affiliations have a start date. Add a start date to an affiliation record.</span></p>
-            <% else %>
-              <p>No affiliations yet. Set this date directly, or add affiliation records to auto-manage it.</p>
-            <% end %>
-            <% if org_aff_ended %>
-              <p class="mt-2 text-amber-700 font-medium">⚠ All affiliations have ended.</p>
-            <% elsif f.object.end_date.present? && !has_affiliations %>
-              <p class="mt-2 text-amber-700 font-medium">⚠ Organization end_date: <%= f.object.end_date.strftime('%b %Y') %>.</p>
-            <% end %>
-          </div>
-          <div class="pt-1">
-            <span class="text-gray-900 font-medium" data-affiliation-dates-target="affiliatedSince"><% if org_aff_ended || (f.object.end_date.present? && !has_affiliations) %><i class="fa-solid fa-circle-xmark text-red-400 mr-1" title="Affiliation ended"></i><% end %><%= (org_earliest_aff || f.object.start_date)&.strftime('%b %Y') || "—" %><%= " – #{org_end_date.strftime('%b %Y')}" if org_end_date.present? %></span>
-            <% if has_affiliations && org_earliest_aff.nil? %>
-              <i class="fa-solid fa-triangle-exclamation text-amber-500 ml-1"></i>
-            <% elsif f.object.start_date.present? && org_earliest_aff.present? && f.object.start_date.beginning_of_month != org_earliest_aff.beginning_of_month %>
-              <p class="text-xs text-gray-500 mt-1"><i class="fa-solid fa-circle-info mr-1"></i>Organization start_date: <%= f.object.start_date.strftime("%b %Y") %></p>
-            <% end %>
-          </div>
-        </div>
-        <% unless has_affiliations %>
-          <%= f.input :start_date,
-                      label: false,
-                      as: :string,
-                      input_html: {
-                        type: 'date',
-                        value: f.object.start_date&.strftime('%Y-%m-%d'),
-                        class: "block w-full rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500 mt-2"
-                      } %>
-        <% end %>
-      </div>
-    <% end %>
-
     <div class="flex flex-col">
       <%= f.input :agency_type,
                   label: "Organization Type",
@@ -301,8 +252,68 @@
     </div>
 
     <div class="rounded-lg border border-gray-200 <%= DomainTheme.bg_class_for(:people) %> p-4 mb-4 shadow-sm">
+      <% org_earliest_aff = f.object.persisted? ? f.object.affiliations.minimum(:start_date) : nil %>
+      <% org_aff_ended = f.object.persisted? && f.object.affiliations.any? && !f.object.affiliations.active.exists? %>
+      <% org_latest_end = f.object.persisted? ? f.object.affiliations.maximum(:end_date) : nil %>
+      <% org_end_date = org_aff_ended ? org_latest_end : f.object.end_date %>
+      <% org_decorated = f.object.decorate %>
+      <% org_fac_start = org_decorated.facilitator_since_date %>
+      <% org_fac_ended = org_decorated.facilitation_end_date %>
+      <div class="flex flex-col md:flex-row gap-6 mb-4">
+        <div class="shrink-0 relative group cursor-help">
+          <label class="inline-flex items-center gap-1 text-md font-medium text-gray-700 mb-1">
+            Affiliated since <i class="fa-solid fa-circle-info text-gray-400 text-xs"></i>
+          </label>
+          <div class="hidden group-hover:block absolute z-50 left-0 bottom-full mb-1 bg-blue-100 text-gray-700 text-xs rounded-lg shadow-lg ring-1 ring-blue-200 p-3 w-64 whitespace-normal">
+            <% if has_affiliations && org_earliest_aff.present? %>
+              <p>Auto-managed from affiliation records. Earliest affiliation start date: <%= org_earliest_aff.strftime('%b %Y') %>.</p>
+              <% if f.object.start_date.present? && f.object.start_date.beginning_of_month != org_earliest_aff.beginning_of_month %>
+                <p class="mt-2 text-gray-500"><i class="fa-solid fa-circle-info mr-1"></i>Organization start_date (<%= f.object.start_date.strftime('%b %Y') %>) differs from earliest affiliation.</p>
+              <% end %>
+            <% elsif has_affiliations %>
+              <p>Auto-managed from affiliation records.<br><br><span class="text-amber-700 font-medium">⚠ No affiliations have a start date. Add a start date to an affiliation record.</span></p>
+            <% else %>
+              <p>No affiliations yet. Set this date directly, or add affiliation records to auto-manage it.</p>
+            <% end %>
+            <% if org_aff_ended %>
+              <p class="mt-2 text-amber-700 font-medium">⚠ All affiliations have ended.</p>
+            <% elsif f.object.end_date.present? && !has_affiliations %>
+              <p class="mt-2 text-amber-700 font-medium">⚠ Organization end_date: <%= f.object.end_date.strftime('%b %Y') %>.</p>
+            <% end %>
+          </div>
+          <div class="pt-1">
+            <span class="text-gray-900 font-medium" data-affiliation-dates-target="affiliatedSince"><% if org_aff_ended || (f.object.end_date.present? && !has_affiliations) %><i class="fa-solid fa-circle-xmark text-red-400 mr-1" title="Affiliation ended"></i><% end %><%= (org_earliest_aff || f.object.start_date)&.strftime('%b %Y') || "—" %><%= " – #{org_end_date.strftime('%b %Y')}" if org_end_date.present? %></span>
+            <% if has_affiliations && org_earliest_aff.nil? %>
+              <i class="fa-solid fa-triangle-exclamation text-amber-500 ml-1"></i>
+            <% elsif f.object.start_date.present? && org_earliest_aff.present? && f.object.start_date.beginning_of_month != org_earliest_aff.beginning_of_month %>
+              <p class="text-xs text-gray-500 mt-1"><i class="fa-solid fa-circle-info mr-1"></i>Organization start_date: <%= f.object.start_date.strftime("%b %Y") %></p>
+            <% end %>
+          </div>
+          <% unless has_affiliations %>
+            <%= f.input :start_date,
+                        label: false,
+                        as: :string,
+                        input_html: {
+                          type: 'date',
+                          value: f.object.start_date&.strftime('%Y-%m-%d'),
+                          class: "block w-full rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500 mt-2"
+                        } %>
+          <% end %>
+        </div>
+        <div class="shrink-0 relative group cursor-help">
+          <label class="inline-flex items-center gap-1 text-md font-medium text-gray-700 mb-1">
+            Facilitations/program since <i class="fa-solid fa-circle-info text-gray-400 text-xs"></i>
+          </label>
+          <div class="hidden group-hover:block absolute z-50 left-0 bottom-full mb-1 bg-blue-100 text-gray-700 text-xs rounded-lg shadow-lg ring-1 ring-blue-200 p-3 w-64 whitespace-normal">
+            <p>Earliest start date from affiliations with 'facilitator' in the title. Edit affiliation records to change this date.</p>
+          </div>
+          <div class="pt-1">
+            <span class="text-gray-900 font-medium" data-affiliation-dates-target="facilitatorSince"><% if org_fac_ended %><i class="fa-solid fa-circle-xmark text-red-400 mr-1" title="No active facilitator affiliations"></i><% end %><%= org_fac_start&.strftime("%b %Y") || "—" %><%= " – #{org_fac_ended.strftime('%b %Y')}" if org_fac_ended %></span>
+          </div>
+        </div>
+      </div>
       <% if allowed_to?(:manage?, Organization) %>
-        <div class="admin-only bg-blue-100 p-3" data-controller="paginated-fields" data-paginated-fields-per-page-value="10" data-affiliation-dates-target="affiliationsContainer">
+        <div class="p-3" data-controller="paginated-fields" data-paginated-fields-per-page-value="10" data-affiliation-dates-target="affiliationsContainer">
           <%= f.fields_for :affiliations do |affiliation_form| %>
             <div data-paginated-fields-target="item">
               <%= render "affiliation_fields",
@@ -311,7 +322,7 @@
           <% end %>
           <div data-paginated-fields-target="nav"></div>
 
-          <div class="admin-only bg-blue-100 p-3 mt-6"><%= link_to_add_association "➕ Add Affiliation",
+          <div class="p-3 mt-6"><%= link_to_add_association "➕ Add Affiliation",
                                         f,
                                         :affiliations,
                                         class: "btn btn-secondary-outline" %></div>
diff --git a/app/views/people/_affiliation_fields.html.erb b/app/views/people/_affiliation_fields.html.erb
index 06e801e29..c2cf55bfb 100644
--- a/app/views/people/_affiliation_fields.html.erb
+++ b/app/views/people/_affiliation_fields.html.erb
@@ -1,85 +1,95 @@
 <% if allowed_to?(:manage?, Person) %>
   <% expired = f.object.inactive? || (f.object.end_date.present? && f.object.end_date < Date.current) %>
   <div data-controller="inactive-toggle">
-    <div class="nested-fields flex flex-wrap gap-x-4 gap-y-1 items-end mb-4 rounded-lg border p-3 <%= expired ? 'bg-gray-100 border-gray-300 opacity-60' : 'bg-white border-gray-200' %>"
+    <div class="nested-fields mb-4 rounded-lg border px-3 pt-3 pb-1 <%= expired ? 'bg-gray-100 border-gray-300 opacity-60' : 'bg-white border-gray-200' %>"
          style="border-left: 4px solid <%= f.object.facilitator? ? '#e879f9' : '#d1d5db' %>"
          data-inactive-toggle-target="row">
-      <div style="width: 350px; min-width: 350px; flex-shrink: 0;" data-inactive-toggle-target="profileButton">
-        <% if f.object.persisted? && f.object.organization.present? %>
-          <label class="block text-sm font-medium text-gray-700 mb-1">Organization</label>
-          <%= organization_profile_button(f.object.organization, truncate_at: 30) %>
-          <%= f.hidden_field :organization_id %>
-        <% else %>
-          <%= f.input :organization_id,
-            include_blank: true,
-            required: true,
-            input_html: {
-              data: {
-                controller: "remote-select",
-                remote_select_model_value: "organization"
-              }
-            },
-            error: "Organization can't be blank",
-            prompt: "Search by name",
-            label: "Organization",
-            label_html: { class: "block text-sm font-medium text-gray-700 mb-1 " } %>
-        <% end %>
-      </div>
+      <div class="flex gap-x-4 items-start">
+        <div class="shrink-0" style="width: 280px;" data-inactive-toggle-target="profileButton">
+          <% if f.object.persisted? && f.object.organization.present? %>
+            <label class="block font-medium text-gray-700 mb-1">Organization</label>
+            <%= organization_profile_button(f.object.organization, truncate_at: 25) %>
+            <%= f.hidden_field :organization_id %>
+          <% else %>
+            <label class="block font-medium text-gray-700 mb-1">Organization <abbr>*</abbr></label>
+            <div class="rounded-md border border-gray-300 shadow-sm overflow-hidden" style="height: 56px;">
+              <%= f.input :organization_id,
+                include_blank: true,
+                required: true,
+                wrapper_html: { class: "mb-0 h-full" },
+                input_html: {
+                  class: "h-full border-0",
+                  data: {
+                    controller: "remote-select",
+                    remote_select_model_value: "organization"
+                  }
+                },
+                error: "Organization can't be blank",
+                prompt: "Search by name",
+                label: false %>
+            </div>
+          <% end %>
+        </div>
 
-      <div class="w-full sm:w-auto" style="min-width: 200px;">
-        <div class="pt-1">
+        <div class="flex-1" style="min-width: 150px;">
           <%= f.input :title,
                       as: :text,
+                      wrapper_html: { class: "mb-0" },
                       input_html: {
                         rows: 1,
                         value: f.object.title || "Facilitator",
-                        style: "height: 42px; min-height: 42px;",
+                        style: "height: 56px; min-height: 56px; padding-top: 14px;",
                         data: {
                           inactive_toggle_target: "title",
                           action: "affiliation-dates#recalculate inactive-toggle#updateBorder"
                         }
                       } %>
         </div>
-      </div>
-
-      <div class="w-full sm:w-auto">
-        <%= f.input :start_date,
-                    as: :string,
-                    label: "Start",
-                    input_html: {
-                      type: "date",
-                      value: (f.object.start_date || (Date.current unless f.object.persisted?))&.strftime("%Y-%m-%d"),
-                      class: "rounded-md border-gray-300 focus:ring-blue-500 focus:border-blue-500 text-sm",
-                      data: { action: "change->affiliation-dates#recalculate" }
-                    } %>
-      </div>
 
-      <div class="w-full sm:w-auto">
-        <%= f.input :end_date,
-                    as: :string,
-                    label: "End",
-                    input_html: {
-                      type: "date",
-                      value: f.object.end_date&.strftime("%Y-%m-%d"),
-                      class: "rounded-md border-gray-300 focus:ring-blue-500 focus:border-blue-500 text-sm",
-                      data: {
-                        inactive_toggle_target: "endDate",
-                        action: "change->inactive-toggle#toggle change->affiliation-dates#recalculate"
-                      }
-                    } %>
-      </div>
+        <div class="shrink-0">
+          <%= f.input :start_date,
+                      as: :string,
+                      label: "Start",
+                      wrapper_html: { class: "mb-0" },
+                      input_html: {
+                        type: "date",
+                        value: (f.object.start_date || (Date.current unless f.object.persisted?))&.strftime("%Y-%m-%d"),
+                        class: "rounded-md border-gray-300 focus:ring-blue-500 focus:border-blue-500 text-sm",
+                        style: "height: 56px;",
+                        data: { action: "change->affiliation-dates#recalculate" }
+                      } %>
+        </div>
 
-      <div class="w-full sm:w-auto pb-3">
-        <label class="block text-sm font-medium text-gray-700 mb-1">Primary contact</label>
-        <%= f.check_box :primary_contact,
-                        checked: f.object.primary_contact? || !f.object.persisted?,
-                        class: "h-4 w-4 text-blue-600 border-gray-300 rounded focus:ring-blue-500" %>
-      </div>
+        <div class="shrink-0">
+          <%= f.input :end_date,
+                      as: :string,
+                      label: "End",
+                      wrapper_html: { class: "mb-0" },
+                      input_html: {
+                        type: "date",
+                        value: f.object.end_date&.strftime("%Y-%m-%d"),
+                        class: "rounded-md border-gray-300 focus:ring-blue-500 focus:border-blue-500 text-sm",
+                        style: "height: 56px;",
+                        data: {
+                          inactive_toggle_target: "endDate",
+                          action: "change->inactive-toggle#toggle change->affiliation-dates#recalculate"
+                        }
+                      } %>
+        </div>
 
-      <div class="w-full text-right admin-only">
-        <%= link_to_remove_association "Remove",
-                                       f,
-                                       class: "text-sm text-gray-400 hover:text-red-600 underline whitespace-nowrap admin-only bg-blue-100 rounded px-2 py-1" %>
+        <div class="shrink-0 whitespace-nowrap">
+          <label class="block font-medium text-gray-700 mb-1">Primary org contact</label>
+          <div class="pt-2">
+            <%= f.check_box :primary_contact,
+                            checked: f.object.primary_contact? || !f.object.persisted?,
+                            class: "h-4 w-4 text-blue-600 border-gray-300 rounded focus:ring-blue-500" %>
+          </div>
+          <div class="-mb-2 text-right">
+            <%= link_to_remove_association "Remove",
+                                           f,
+                                           class: "text-sm text-gray-400 hover:text-red-600 underline whitespace-nowrap" %>
+          </div>
+        </div>
       </div>
     </div>
   </div>
diff --git a/app/views/people/_form.html.erb b/app/views/people/_form.html.erb
index 0d1fd615a..535a7f45f 100644
--- a/app/views/people/_form.html.erb
+++ b/app/views/people/_form.html.erb
@@ -13,102 +13,47 @@
       <div class="space-y-6">
         <div class="flex flex-col md:flex-row gap-4"><%= f.input :first_name, input_html: { value: f.object.first_name || @user&.first_name } %><%= f.input :legal_first_name, label: "Legal First Name", hint: "If different from first name" %><%= f.input :last_name, input_html: { value: f.object.last_name || @user&.last_name } %><%= f.input :pronouns %></div>
 
-        <% person = f.object.respond_to?(:object) ? f.object.object : f.object %>
-        <% decorated = person.decorate %>
-        <h3 class="font-semibold text-gray-700 mb-2">Important dates</h3>
-        <div class="rounded-lg border border-gray-200 bg-gray-50 p-4 shadow-sm">
-          <div class="flex flex-col md:flex-row gap-6">
-            <div class="shrink-0 relative group cursor-help">
-              <label class="inline-flex items-center gap-1 text-md font-medium text-gray-700 mb-1">
-                Affiliated since <i class="fa-solid fa-circle-info text-gray-400 text-xs"></i>
-              </label>
-              <div class="hidden group-hover:block absolute z-50 left-0 bottom-full mb-1 bg-blue-100 text-gray-700 text-xs rounded-lg shadow-lg ring-1 ring-blue-200 p-3 w-64 whitespace-normal">
-                <% affiliated_start = person.affiliations.minimum(:start_date) %>
-                <% if affiliated_start.nil? && person.affiliations.exists? && person.member_since.present? %>
-                  <p>Earliest start date from any affiliation, regardless of title.<br><br><span class="text-amber-700 font-medium">⚠ No affiliations have a start date. Legacy member_since value is <%= person.member_since.strftime('%b %Y') %>. Add a start date to an affiliation to use it here.</span></p>
-                <% elsif affiliated_start.nil? && person.affiliations.exists? %>
-                  <p>Earliest start date from any affiliation, regardless of title.<br><br><span class="text-amber-700 font-medium">⚠ No affiliations have a start date. Edit the affiliation records to add one.</span></p>
-                <% else %>
-                  <p>Earliest start date from any affiliation, regardless of title. Edit affiliation records to change this date.</p>
-                  <% if decorated.member_since_earlier_than_all_affiliations? %>
-                    <p class="mt-2 text-amber-700 font-medium">⚠ Member since (<%= person.member_since.strftime('%b %Y') %>) is earlier than any affiliation. Create an affiliation with that start date to reflect it on the profile.</p>
-                  <% elsif decorated.member_since_differs_from_all_affiliations? %>
-                    <p class="mt-2 text-gray-500"><i class="fa-solid fa-circle-info mr-1"></i>Member since (<%= person.member_since.strftime('%b %Y') %>) differs from the earliest affiliation start date.</p>
-                  <% end %>
-                <% end %>
-              </div>
-              <div class="pt-1">
-                <span class="text-gray-900 font-medium" data-affiliation-dates-target="affiliatedSince"><% if decorated.affiliation_end_date %><i class="fa-solid fa-circle-xmark text-red-400 mr-1" title="No active affiliations"></i><% end %><%= decorated.affiliated_since_date&.strftime("%b %Y") || "—" %><%= " – #{decorated.affiliation_end_date.strftime('%b %Y')}" if decorated.affiliation_end_date %></span>
-                <% if decorated.affiliated_since_date.nil? && person.affiliations.exists? %>
-                  <i class="fa-solid fa-triangle-exclamation text-amber-500 ml-1"></i>
-                <% elsif decorated.member_since_earlier_than_all_affiliations? %>
-                  <p class="text-xs text-amber-700 mt-1">⚠ Earlier date on file: <%= person.member_since.strftime("%b %Y") %></p>
-                <% elsif decorated.member_since_differs_from_all_affiliations? %>
-                  <p class="text-xs text-gray-500 mt-1"><i class="fa-solid fa-circle-info mr-1"></i>Different date on file: <%= person.member_since.strftime("%b %Y") %></p>
-                <% end %>
-              </div>
-            </div>
-            <div class="shrink-0 relative group cursor-help">
-              <label class="inline-flex items-center gap-1 text-md font-medium text-gray-700 mb-1">
-                Facilitator since <i class="fa-solid fa-circle-info text-gray-400 text-xs"></i>
-              </label>
-              <div class="hidden group-hover:block absolute z-50 left-0 bottom-full mb-1 bg-blue-100 text-gray-700 text-xs rounded-lg shadow-lg ring-1 ring-blue-200 p-3 w-64 whitespace-normal">
-                <% facilitator_start = person.affiliations.facilitators.minimum(:start_date) %>
-                <% if facilitator_start.nil? && person.member_since.present? %>
-                  <p>Earliest start date from affiliations with 'facilitator' somewhere in the title.<br><br><span class="text-amber-700 font-medium">⚠ Currently showing the legacy member_since value (<%= person.member_since.strftime('%b %Y') %>) because no Facilitator affiliation has a start date. Add a start date to a Facilitator affiliation to stop using the legacy value.</span></p>
-                <% else %>
-                  <p>Earliest start date from affiliations with 'facilitator' somewhere in the title. Edit affiliation records to change this date.</p>
-                  <% if decorated.member_since_earlier_than_facilitator_affiliations? %>
-                    <p class="mt-2 text-amber-700 font-medium">⚠ Member since (<%= person.member_since.strftime('%b %Y') %>) is earlier than any Facilitator affiliation. Create an affiliation with that start date to reflect it on the profile.</p>
-                  <% elsif decorated.member_since_differs_from_facilitator_affiliations? %>
-                    <p class="mt-2 text-gray-500"><i class="fa-solid fa-circle-info mr-1"></i>Member since (<%= person.member_since.strftime('%b %Y') %>) differs from the earliest Facilitator affiliation start date.</p>
-                  <% end %>
-                <% end %>
-              </div>
-              <div class="pt-1">
-                <span class="text-gray-900 font-medium" data-affiliation-dates-target="facilitatorSince"><% if decorated.facilitation_end_date %><i class="fa-solid fa-circle-xmark text-red-400 mr-1" title="No active facilitator affiliations"></i><% end %><%= decorated.facilitator_since_date&.strftime("%b %Y") || "—" %><%= " – #{decorated.facilitation_end_date.strftime('%b %Y')}" if decorated.facilitation_end_date %></span>
-                <% if decorated.member_since_earlier_than_facilitator_affiliations? %>
-                  <p class="text-xs text-amber-700 mt-1">⚠ Earlier date on file: <%= person.member_since.strftime("%b %Y") %></p>
-                <% elsif decorated.member_since_differs_from_facilitator_affiliations? %>
-                  <p class="text-xs text-gray-500 mt-1"><i class="fa-solid fa-circle-info mr-1"></i>Different date on file: <%= person.member_since.strftime("%b %Y") %></p>
-                <% end %>
-              </div>
-            </div>
-            <div class="flex-1">
-              <%= f.input :date_of_birth,
-                          label: "Birthday",
-                          as: :date,
-                          discard_year: true,
-                          order: [:month, :day],
-                          prompt: { month: "Select Month", day: "Select Day" },
-                          wrapper_html: { class: "flex flex-wrap gap-2 items-end" },
-                          label_html: { class: "w-full" },
-                          input_html: {
-                            class: "flex-1 rounded-md border-gray-300 shadow-sm
-                          focus:border-blue-500 focus:ring focus:ring-blue-200 focus:ring-opacity-50"
-                          } %>
+        <div class="emails">
+          <h3 class="font-semibold text-gray-700 mb-2">Emails</h3>
+
+          <div class="rounded-lg border border-gray-200 bg-gray-50 p-4 shadow-sm">
+            <div class="flex flex-col md:flex-row gap-4">
+              <% if f.object.user %>
+                <div>
+                  <label class="block text-md font-medium text-gray-700 mb-1">Primary email</label>
+                  <span class="text-gray-900 font-medium"><%= f.object.user&.email %></span>
+
+                  <p class="text-sm text-gray-500 mt-1">
+                    Only
+                    <% if allowed_to?(:edit?, f.object.user) %>
+                      <%= link_to "editable by admins",
+                                  edit_user_path(f.object.user),
+                                  class: "underline" %>
+                    <% else %>
+                      editable by admins
+                    <% end %>
+                  </p>
+                </div>
+              <% else %>
+                <%= f.input :email, label: "Primary email" %>
+              <% end %>
+
+              <%= f.input :email_type,
+                          label: "Primary email type",
+                          as: :select,
+                          collection: Person::CONTACT_TYPES.compact.map { |type| [type.to_s.humanize, type] },
+                          selected: f.object.email_type || f.object.user&.email_type,
+                          include_blank: true %>
+
+              <%= f.input :email_2, label: "Secondary email" %>
+
+              <%= f.input :email_2_type,
+                          label: "Secondary email type",
+                          as: :select,
+                          collection: Person::CONTACT_TYPES.compact.map { |type| [type.to_s.humanize, type] },
+                          include_blank: true %>
             </div>
           </div>
-          <% if allowed_to?(:manage?, Person) && params[:admin].present? %>
-            <div class="admin-only bg-blue-100 rounded-lg p-4 mt-3">
-              <%= f.input :member_since,
-                          as: :date,
-                          discard_day: true,
-                          start_year: 1991,
-                          end_year: Time.current.year,
-                          prompt: { month: "Select Month", year: "Select Year" },
-                          order: [:month, :year],
-                          label: "Member since (override)",
-                          hint: "Pick January if you only know the year",
-                          wrapper_html: { class: "flex flex-wrap gap-2 items-end" },
-                          label_html: { class: "w-full" },
-                          hint_html: { class: "w-full" },
-                          input_html: {
-                            class: "flex-1 rounded-md border-gray-300 shadow-sm admin-only bg-blue-100 border-blue-200
-                            focus:border-blue-500 focus:ring focus:ring-blue-200 focus:ring-opacity-50"
-                          } %>
-            </div>
-          <% end %>
         </div>
       </div>
     </div>
@@ -117,49 +62,6 @@
     <div class="w-full md:w-1/4 flex flex-col items-center gap-4"><%= render "shared/form_image_field", f: f, field_name: :avatar %></div>
   </div>
 
-  <div class="emails">
-    <h3 class="font-semibold text-gray-700 mb-2">Emails</h3>
-
-    <div class="rounded-lg border border-gray-200 bg-gray-50 p-4 mb-4 shadow-sm">
-      <div class="flex flex-col md:flex-row gap-4">
-        <% if f.object.user %>
-          <div>
-            <label class="block text-md font-medium text-gray-700 mb-1">Primary email</label>
-            <span class="text-gray-900 font-medium"><%= f.object.user&.email %></span>
-
-            <p class="text-sm text-gray-500 mt-1">
-              Only
-              <% if allowed_to?(:edit?, f.object.user) %>
-                <%= link_to "editable by admins",
-                            edit_user_path(f.object.user),
-                            class: "underline" %>
-              <% else %>
-                editable by admins
-              <% end %>
-            </p>
-          </div>
-        <% else %>
-          <%= f.input :email, label: "Primary email" %>
-        <% end %>
-
-        <%= f.input :email_type,
-                    label: "Primary email type",
-                    as: :select,
-                    collection: Person::CONTACT_TYPES.compact.map { |type| [type.to_s.humanize, type] },
-                    selected: f.object.email_type || f.object.user&.email_type,
-                    include_blank: true %>
-
-        <%= f.input :email_2, label: "Secondary email" %>
-
-        <%= f.input :email_2_type,
-                    label: "Secondary email type",
-                    as: :select,
-                    collection: Person::CONTACT_TYPES.compact.map { |type| [type.to_s.humanize, type] },
-                    include_blank: true %>
-      </div>
-    </div>
-  </div>
-
   <div class="phones">
     <div class="form-group space-y-4">
       <div class="font-semibold text-gray-700 mb-2">
@@ -255,12 +157,92 @@
   <% end %>
 
   <!-- Organization Affiliations -->
+  <% person = f.object.respond_to?(:object) ? f.object.object : f.object %>
+  <% decorated = person.decorate %>
   <div class="form-group space-y-4">
     <div class="font-semibold text-gray-700 mb-2">
       Affiliations<span class="text-sm font-normal text-gray-500"> (only editable by admins)</span>
     </div>
 
-    <div class="rounded-lg border border-gray-200 <%= DomainTheme.bg_class_for(:organizations) %> p-4 mb-4 shadow-sm">
+    <div class="rounded-lg border border-gray-200 admin-only bg-blue-50 p-4 mb-4 shadow-sm">
+      <% if allowed_to?(:manage?, Person) && params[:admin].present? %>
+        <div class="admin-only bg-blue-100 rounded-lg p-4 mb-4">
+          <%= f.input :member_since,
+                      as: :date,
+                      discard_day: true,
+                      start_year: 1991,
+                      end_year: Time.current.year,
+                      prompt: { month: "Select Month", year: "Select Year" },
+                      order: [:month, :year],
+                      label: "Member since (override)",
+                      hint: "Pick January if you only know the year",
+                      wrapper_html: { class: "flex flex-wrap gap-2 items-end" },
+                      label_html: { class: "w-full" },
+                      hint_html: { class: "w-full" },
+                      input_html: {
+                        class: "flex-1 rounded-md border-gray-300 shadow-sm admin-only bg-blue-100 border-blue-200
+                        focus:border-blue-500 focus:ring focus:ring-blue-200 focus:ring-opacity-50"
+                      } %>
+        </div>
+      <% end %>
+      <div class="flex flex-col md:flex-row gap-6 mb-4">
+        <div class="shrink-0 relative group cursor-help">
+          <label class="inline-flex items-center gap-1 text-md font-medium text-gray-700 mb-1">
+            Affiliated since <i class="fa-solid fa-circle-info text-gray-400 text-xs"></i>
+          </label>
+          <div class="hidden group-hover:block absolute z-50 left-0 bottom-full mb-1 bg-blue-100 text-gray-700 text-xs rounded-lg shadow-lg ring-1 ring-blue-200 p-3 w-64 whitespace-normal">
+            <% affiliated_start = person.affiliations.minimum(:start_date) %>
+            <% if affiliated_start.nil? && person.affiliations.exists? && person.member_since.present? %>
+              <p>Earliest start date from any affiliation, regardless of title.<br><br><span class="text-amber-700 font-medium">⚠ No affiliations have a start date. Legacy member_since value is <%= person.member_since.strftime('%b %Y') %>. Add a start date to an affiliation to use it here.</span></p>
+            <% elsif affiliated_start.nil? && person.affiliations.exists? %>
+              <p>Earliest start date from any affiliation, regardless of title.<br><br><span class="text-amber-700 font-medium">⚠ No affiliations have a start date. Edit the affiliation records to add one.</span></p>
+            <% else %>
+              <p>Earliest start date from any affiliation, regardless of title. Edit affiliation records to change this date.</p>
+              <% if decorated.member_since_earlier_than_all_affiliations? %>
+                <p class="mt-2 text-amber-700 font-medium">⚠ Member since (<%= person.member_since.strftime('%b %Y') %>) is earlier than any affiliation. Create an affiliation with that start date to reflect it on the profile.</p>
+              <% elsif decorated.member_since_differs_from_all_affiliations? %>
+                <p class="mt-2 text-gray-500"><i class="fa-solid fa-circle-info mr-1"></i>Member since (<%= person.member_since.strftime('%b %Y') %>) differs from the earliest affiliation start date.</p>
+              <% end %>
+            <% end %>
+          </div>
+          <div class="pt-1">
+            <span class="text-gray-900 font-medium" data-affiliation-dates-target="affiliatedSince"><% if decorated.affiliation_end_date %><i class="fa-solid fa-circle-xmark text-red-400 mr-1" title="No active affiliations"></i><% end %><%= decorated.affiliated_since_date&.strftime("%b %Y") || "—" %><%= " – #{decorated.affiliation_end_date.strftime('%b %Y')}" if decorated.affiliation_end_date %></span>
+            <% if decorated.affiliated_since_date.nil? && person.affiliations.exists? %>
+              <i class="fa-solid fa-triangle-exclamation text-amber-500 ml-1"></i>
+            <% elsif decorated.member_since_earlier_than_all_affiliations? %>
+              <p class="text-xs text-amber-700 mt-1">⚠ Earlier date on file: <%= person.member_since.strftime("%b %Y") %></p>
+            <% elsif decorated.member_since_differs_from_all_affiliations? %>
+              <p class="text-xs text-gray-500 mt-1"><i class="fa-solid fa-circle-info mr-1"></i>Different date on file: <%= person.member_since.strftime("%b %Y") %></p>
+            <% end %>
+          </div>
+        </div>
+        <div class="shrink-0 relative group cursor-help">
+          <label class="inline-flex items-center gap-1 text-md font-medium text-gray-700 mb-1">
+            Facilitator since <i class="fa-solid fa-circle-info text-gray-400 text-xs"></i>
+          </label>
+          <div class="hidden group-hover:block absolute z-50 left-0 bottom-full mb-1 bg-blue-100 text-gray-700 text-xs rounded-lg shadow-lg ring-1 ring-blue-200 p-3 w-64 whitespace-normal">
+            <% facilitator_start = person.affiliations.facilitators.minimum(:start_date) %>
+            <% if facilitator_start.nil? && person.member_since.present? %>
+              <p>Earliest start date from affiliations with 'facilitator' somewhere in the title.<br><br><span class="text-amber-700 font-medium">⚠ Currently showing the legacy member_since value (<%= person.member_since.strftime('%b %Y') %>) because no Facilitator affiliation has a start date. Add a start date to a Facilitator affiliation to stop using the legacy value.</span></p>
+            <% else %>
+              <p>Earliest start date from affiliations with 'facilitator' somewhere in the title. Edit affiliation records to change this date.</p>
+              <% if decorated.member_since_earlier_than_facilitator_affiliations? %>
+                <p class="mt-2 text-amber-700 font-medium">⚠ Member since (<%= person.member_since.strftime('%b %Y') %>) is earlier than any Facilitator affiliation. Create an affiliation with that start date to reflect it on the profile.</p>
+              <% elsif decorated.member_since_differs_from_facilitator_affiliations? %>
+                <p class="mt-2 text-gray-500"><i class="fa-solid fa-circle-info mr-1"></i>Member since (<%= person.member_since.strftime('%b %Y') %>) differs from the earliest Facilitator affiliation start date.</p>
+              <% end %>
+            <% end %>
+          </div>
+          <div class="pt-1">
+            <span class="text-gray-900 font-medium" data-affiliation-dates-target="facilitatorSince"><% if decorated.facilitation_end_date %><i class="fa-solid fa-circle-xmark text-red-400 mr-1" title="No active facilitator affiliations"></i><% end %><%= decorated.facilitator_since_date&.strftime("%b %Y") || "—" %><%= " – #{decorated.facilitation_end_date.strftime('%b %Y')}" if decorated.facilitation_end_date %></span>
+            <% if decorated.member_since_earlier_than_facilitator_affiliations? %>
+              <p class="text-xs text-amber-700 mt-1">⚠ Earlier date on file: <%= person.member_since.strftime("%b %Y") %></p>
+            <% elsif decorated.member_since_differs_from_facilitator_affiliations? %>
+              <p class="text-xs text-gray-500 mt-1"><i class="fa-solid fa-circle-info mr-1"></i>Different date on file: <%= person.member_since.strftime("%b %Y") %></p>
+            <% end %>
+          </div>
+        </div>
+      </div>
       <% if allowed_to?(:manage?, Person) %>
         <div class="p-3" data-controller="paginated-fields" data-paginated-fields-per-page-value="10" data-affiliation-dates-target="affiliationsContainer">
           <%= f.fields_for :affiliations do |affiliation_form| %>
@@ -287,21 +269,33 @@
   </div>
 
   <!-- PERSON FIELDS -->
-  <div class="space-y-6">
-    <%= f.input :bio,
-                as: :text,
-                input_html: {
-                  rows: 2,
-                  maxlength: 1650,
-                  class: "w-full rounded-md border-gray-300 shadow-sm
-                      focus:border-blue-500 focus:ring focus:ring-blue-200 focus:ring-opacity-50"
-                },
-                hint: "Maximum 250 characters" %></div>
-
-  <!-- Preferences: timezone for event times etc. -->
-  <% if f.object.user %>
-    <%= f.fields_for :user do |user_form| %>
-      <div class="space-y-6 p-3">
+  <%= f.input :bio,
+              as: :text,
+              input_html: {
+                rows: 2,
+                maxlength: 1650,
+                class: "w-full rounded-md border-gray-300 shadow-sm
+                    focus:border-blue-500 focus:ring focus:ring-blue-200 focus:ring-opacity-50"
+              },
+              hint: "Maximum 250 characters" %>
+
+  <div class="flex flex-col md:flex-row gap-6 items-end">
+    <div class="w-full md:w-48">
+      <%= f.input :date_of_birth,
+                  label: "Birthday",
+                  as: :date,
+                  discard_year: true,
+                  order: [:month, :day],
+                  prompt: { month: "Month", day: "Day" },
+                  wrapper_html: { class: "flex flex-wrap gap-2 items-end" },
+                  label_html: { class: "w-full" },
+                  input_html: {
+                    class: "flex-1 rounded-md border-gray-300 shadow-sm
+                    focus:border-blue-500 focus:ring focus:ring-blue-200 focus:ring-opacity-50"
+                  } %>
+    </div>
+    <% if f.object.user %>
+      <%= f.fields_for :user do |user_form| %>
         <%= user_form.input :time_zone,
                     as: :select,
                     collection: us_time_zone_fundamentals,
@@ -310,13 +304,13 @@
                     hint: "Event times and other dates will be shown in this timezone.",
                     input_html: { class: "w-full" },
                     wrapper_html: { class: "w-full max-w-md" } %>
-      </div>
+      <% end %>
     <% end %>
-  <% end %>
+  </div>
 
   <div class="profile-preferences-section">
     <div class="font-medium text-gray-700 mb-2 block">
-      Social media links:
+      Social media links
     </div>
 
     <div class="rounded-lg border border-gray-200 bg-gray-50 p-4 mb-4 shadow-sm">
@@ -332,7 +326,7 @@
 
   <div class="profile-preferences-section">
     <div class="font-medium text-gray-700 mb-2 block">
-      Profile display preferences:
+      Profile display preferences
     </div>
 
     <div class="rounded-lg border border-gray-200 bg-gray-50 p-4 mb-4 shadow-sm">