diff --git a/src/routes/events/+layout.svelte b/src/routes/events/+layout.svelte
index 7858cc77..629bb9e0 100644
--- a/src/routes/events/+layout.svelte
+++ b/src/routes/events/+layout.svelte
@@ -210,7 +210,7 @@ function clear_sess() {
         container m-auto flex h-full min-h-full
         w-full max-w-7xl
         min-w-full flex-col gap-1
-        overflow-auto
+        overflow-auto [scrollbar-gutter:stable]
 
         bg-gray-50 text-gray-800
         dark:bg-gray-900 dark:text-gray-200
diff --git a/src/routes/events/[event_id]/(badges)/badges/+page.svelte b/src/routes/events/[event_id]/(badges)/badges/+page.svelte
index d2beb3a2..e71d61d6 100644
--- a/src/routes/events/[event_id]/(badges)/badges/+page.svelte
+++ b/src/routes/events/[event_id]/(badges)/badges/+page.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 import { untrack } from 'svelte';
+import { slide, fade } from 'svelte/transition';
 interface Props {
     /** @type {import('./$types').PageData} */
     data: any;
@@ -472,7 +473,7 @@ async function handle_search_refresh(params: any) {
 ></Comp_badge_search>
 
 {#if $ae_loc.trusted_access && $ae_loc.edit_mode}
-    <div class="flex flex-row gap-1 items-center justify-center">
+    <div transition:slide={{ duration: 200 }} class="flex flex-row gap-1 items-center justify-center">
     {#if badges_loc.current.enable_add_badge_btn ?? true}
         <button
             type="button"
@@ -593,12 +594,16 @@ async function handle_search_refresh(params: any) {
 
 {#if $events_sess?.badges?.search_status === 'loading' && event_badge_id_li.length === 0}
     <div
-        class="flex flex-col items-center justify-center p-10 text-center opacity-50">
-        <LoaderCircle size="3em" class="mx-auto mb-4 animate-spin" />
+        transition:fade={{ duration: 200 }}
+        class="flex w-full flex-col items-center justify-center p-16 text-center opacity-50">
+        <LoaderCircle size="3em" class="mx-auto mb-2 animate-spin" />
         <p class="text-xl">Loading badges...</p>
     </div>
 {:else}
-    <Comp_badge_obj_li {lq__event_badge_obj_li} log_lvl={1}></Comp_badge_obj_li>
+    <Comp_badge_obj_li
+        {lq__event_badge_obj_li}
+        search_status={$events_sess?.badges?.search_status ?? null}
+        log_lvl={1} />
 {/if}
 
 <style>
diff --git a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte
index 09a5d245..af305089 100644
--- a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte
+++ b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte
@@ -2,6 +2,7 @@
 interface Props {
     container_class_li?: string | Array<string>;
     lq__event_badge_obj_li: any;
+    search_status?: string | null;
     log_lvl?: number;
     show_sensitive_fields?: boolean;
     hide_affiliations?: boolean;
@@ -12,6 +13,7 @@ interface Props {
 let {
     container_class_li = [],
     lq__event_badge_obj_li,
+    search_status = null,
     log_lvl = $bindable(0),
     show_sensitive_fields = true,
     hide_affiliations = false,
@@ -408,12 +410,16 @@ let visible_badge_obj_li = $derived(
         </ul>
     {:else}
         <div
-            class="flex w-full flex-col items-center justify-center p-20 text-center opacity-50">
-            <UserSearch size="3em" class="mx-auto mb-2 opacity-20" />
-            {#if !is_trusted && !(badges_loc.current.fulltext_search_qry_str ?? '').trim()}
-                <p>Enter your name above to find your badge.</p>
+            class="flex w-full flex-col items-center justify-center p-16 text-center opacity-50">
+            {#if search_status === 'loading'}
+                <LoaderCircle size="3em" class="mx-auto mb-2 animate-spin" />
+                <p class="text-xl">Searching...</p>
+            {:else if !is_trusted && !(badges_loc.current.fulltext_search_qry_str ?? '').trim()}
+                <UserSearch size="3em" class="mx-auto mb-2 opacity-20" />
+                <p class="text-xl">Enter your name above to find your badge.</p>
             {:else}
-                <p>No badges found matching your criteria. Try adjusting your filters.</p>
+                <UserSearch size="3em" class="mx-auto mb-2 opacity-20" />
+                <p class="text-xl">No badges found matching your criteria.</p>
             {/if}
         </div>
     {/if}