diff --git a/src/routes/core/accounts/[account_id]/+page.svelte b/src/routes/core/accounts/[account_id]/+page.svelte
index 4dc7ae81..c3c11f4c 100644
--- a/src/routes/core/accounts/[account_id]/+page.svelte
+++ b/src/routes/core/accounts/[account_id]/+page.svelte
@@ -109,19 +109,19 @@
                 </h3>
                 <div class="space-y-4">
                     <div class="space-y-1">
-                        <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Account Name</label>
+                        <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Account Name</span>
                         <input class="input variant-filled-surface rounded-lg p-3" type="text" bind:value={account.name} />
                     </div>
                     <div class="space-y-1">
-                        <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Short Name</label>
+                        <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Short Name</span>
                         <input class="input variant-filled-surface rounded-lg p-3" type="text" bind:value={account.short_name} />
                     </div>
                     <div class="space-y-1">
-                        <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Account Code</label>
+                        <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Account Code</span>
                         <input class="input variant-filled-surface rounded-lg font-mono p-3" type="text" bind:value={account.code} />
                     </div>
                     <div class="space-y-1">
-                        <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Description</label>
+                        <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Description</span>
                         <textarea class="textarea variant-filled-surface rounded-lg p-3" rows="3" bind:value={account.description}></textarea>
                     </div>
                 </div>
@@ -147,11 +147,11 @@
                 </div>
                 <div class="space-y-4 border-t border-surface-500/30 pt-4">
                     <div class="space-y-1">
-                        <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Group</label>
+                        <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Group</span>
                         <input class="input variant-filled-surface rounded-lg p-3" type="text" bind:value={account.group} />
                     </div>
                     <div class="space-y-1">
-                        <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Sort Order</label>
+                        <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Sort Order</span>
                         <input class="input variant-filled-surface rounded-lg p-3" type="number" bind:value={account.sort} />
                     </div>
                 </div>
diff --git a/src/routes/core/activity_logs/+page.svelte b/src/routes/core/activity_logs/+page.svelte
index bb1a3bd4..aa5135ad 100644
--- a/src/routes/core/activity_logs/+page.svelte
+++ b/src/routes/core/activity_logs/+page.svelte
@@ -72,7 +72,7 @@
     <div class="card p-6 shadow-xl variant-glass-surface border border-surface-500/10 space-y-4">
         <div class="flex flex-wrap gap-6 items-end">
             <div class="flex-1 min-w-[280px] space-y-1">
-                <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Search Keywords</label>
+                <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Search Keywords</span>
                 <form onsubmit={handle_search} class="flex bg-surface-200-700-token rounded-lg overflow-hidden border border-surface-500/20 shadow-inner group focus-within:ring-2 focus-within:ring-primary-500/50 transition-all">
                     <div class="flex items-center justify-center px-4 bg-surface-300-600-token border-r border-surface-500/20">
                         <Search size={18} class="opacity-50" />
@@ -90,7 +90,7 @@
             </div>
 
             <div class="space-y-1">
-                <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Display Limit</label>
+                <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Display Limit</span>
                 <select class="select variant-filled-surface rounded-lg text-sm border border-surface-500/20 p-2" bind:value={limit} onchange={load_logs}>
                     <option value={25}>Latest 25</option>
                     <option value={50}>Latest 50</option>
diff --git a/src/routes/core/addresses/+page.svelte b/src/routes/core/addresses/+page.svelte
index 436983ec..b692d214 100644
--- a/src/routes/core/addresses/+page.svelte
+++ b/src/routes/core/addresses/+page.svelte
@@ -80,7 +80,7 @@
 
     <div class="card p-6 shadow-xl variant-glass-surface border border-surface-500/10">
         <div class="max-w-2xl space-y-1">
-            <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Search Directory</label>
+            <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Search Directory</span>
             <div class="flex bg-surface-200-700-token rounded-lg overflow-hidden border border-surface-500/20 shadow-inner group focus-within:ring-2 focus-within:ring-primary-500/50 transition-all">
                 <div class="flex items-center justify-center px-4 bg-surface-300-600-token border-r border-surface-500/20">
                     <Search size={18} class="opacity-50" />
diff --git a/src/routes/core/contacts/+page.svelte b/src/routes/core/contacts/+page.svelte
index 5375aea3..7e8f3563 100644
--- a/src/routes/core/contacts/+page.svelte
+++ b/src/routes/core/contacts/+page.svelte
@@ -80,7 +80,7 @@
 
     <div class="card p-6 shadow-xl variant-glass-surface border border-surface-500/10">
         <div class="max-w-2xl space-y-1">
-            <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Search Directory</label>
+            <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Search Directory</span>
             <div class="flex bg-surface-200-700-token rounded-lg overflow-hidden border border-surface-500/20 shadow-inner group focus-within:ring-2 focus-within:ring-primary-500/50 transition-all">
                 <div class="flex items-center justify-center px-4 bg-surface-300-600-token border-r border-surface-500/20">
                     <Search size={18} class="opacity-50" />
diff --git a/src/routes/core/people/ae_comp__person_search.svelte b/src/routes/core/people/ae_comp__person_search.svelte
index 1ba05e32..a1041b8a 100644
--- a/src/routes/core/people/ae_comp__person_search.svelte
+++ b/src/routes/core/people/ae_comp__person_search.svelte
@@ -45,7 +45,7 @@
 <div class="card p-6 shadow-xl variant-glass-surface border border-surface-500/10 space-y-4">
     <div class="flex flex-wrap gap-6 items-end">
         <div class="flex-1 min-w-[280px] space-y-1">
-            <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Search People</label>
+            <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Search People</span>
             <div class="flex bg-surface-200-700-token rounded-lg overflow-hidden border border-surface-500/20 shadow-inner group focus-within:ring-2 focus-within:ring-primary-500/50 transition-all">
                 <div class="flex items-center justify-center px-4 bg-surface-300-600-token border-r border-surface-500/20">
                     <Search size={18} class="opacity-50" />
@@ -69,7 +69,7 @@
 
         <div class="grid grid-cols-2 gap-4">
             <div class="space-y-1">
-                <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Account Status</label>
+                <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Account Status</span>
                 <select class="select variant-filled-surface rounded-lg text-sm border border-surface-500/20 p-2" bind:value={qry_enabled} onchange={handle_search}>
                     <option value="all">All Records</option>
                     <option value="enabled">Enabled Only</option>
@@ -78,7 +78,7 @@
             </div>
 
             <div class="space-y-1">
-                <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Visibility</label>
+                <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Visibility</span>
                 <select class="select variant-filled-surface rounded-lg text-sm border border-surface-500/20 p-2" bind:value={qry_hidden} onchange={handle_search}>
                     <option value="all">All Visible</option>
                     <option value="not_hidden">Publicly Visible</option>
diff --git a/src/routes/core/sites/[site_id]/+page.svelte b/src/routes/core/sites/[site_id]/+page.svelte
index 0a1fb3e6..794731d4 100644
--- a/src/routes/core/sites/[site_id]/+page.svelte
+++ b/src/routes/core/sites/[site_id]/+page.svelte
@@ -143,19 +143,19 @@
                     </h3>
                     <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
                         <div class="space-y-1">
-                            <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Site Name</label>
+                            <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Site Name</span>
                             <input class="input variant-filled-surface rounded-lg p-3" type="text" bind:value={site.name} />
                         </div>
                         <div class="space-y-1">
-                            <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Site Code</label>
+                            <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Site Code</span>
                             <input class="input variant-filled-surface rounded-lg font-mono p-3" type="text" bind:value={site.code} />
                         </div>
                         <div class="space-y-1 md:col-span-2">
-                            <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Tagline</label>
+                            <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Tagline</span>
                             <input class="input variant-filled-surface rounded-lg p-3" type="text" bind:value={site.tagline} />
                         </div>
                         <div class="space-y-1 md:col-span-2">
-                            <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Description</label>
+                            <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Description</span>
                             <textarea class="textarea variant-filled-surface rounded-lg p-3" rows="2" bind:value={site.description}></textarea>
                         </div>
                     </div>
@@ -183,7 +183,7 @@
                         </label>
                         {#if site.restrict_access}
                             <div class="space-y-1 max-w-md animate-fade-in">
-                                <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Access Key</label>
+                                <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Access Key</span>
                                 <input class="input variant-filled-surface rounded-lg font-mono p-3" type="text" bind:value={site.access_key} />
                             </div>
                         {/if}
diff --git a/src/routes/core/users/+page.svelte b/src/routes/core/users/+page.svelte
index 286923b8..372bb12d 100644
--- a/src/routes/core/users/+page.svelte
+++ b/src/routes/core/users/+page.svelte
@@ -82,7 +82,7 @@
     <div class="card p-6 shadow-xl variant-glass-surface border border-surface-500/10 space-y-4">
         <div class="flex flex-wrap gap-6 items-end">
             <div class="flex-1 min-w-[280px] space-y-1">
-                <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Search Users</label>
+                <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Search Users</span>
                 <div class="flex bg-surface-200-700-token rounded-lg overflow-hidden border border-surface-500/20 shadow-inner group focus-within:ring-2 focus-within:ring-primary-500/50 transition-all">
                     <div class="flex items-center justify-center px-4 bg-surface-300-600-token border-r border-surface-500/20">
                         <Search size={18} class="opacity-50" />
@@ -106,7 +106,7 @@
 
             <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
                 <div class="space-y-1">
-                    <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Scope</label>
+                    <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Scope</span>
                     <select class="select variant-filled-surface rounded-lg text-sm border border-surface-500/20 p-2" bind:value={qry_account_scope} onchange={load_users}>
                         <option value="all">All (Current + Global)</option>
                         <option value="account">Account Only</option>
@@ -115,7 +115,7 @@
                 </div>
 
                 <div class="space-y-1">
-                    <label class="label text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Status</label>
+                    <span class="label block text-xs font-bold opacity-75 uppercase tracking-wider ml-1">Status</span>
                     <select class="select variant-filled-surface rounded-lg text-sm border border-surface-500/20 p-2" bind:value={qry_enabled} onchange={load_users}>
                         <option value="all">All</option>
                         <option value="enabled">Enabled</option>