diff --git a/src/routes/events/+layout.svelte b/src/routes/events/+layout.svelte
index f95aedb8..bea608f1 100644
--- a/src/routes/events/+layout.svelte
+++ b/src/routes/events/+layout.svelte
@@ -230,13 +230,13 @@ function clear_sess() {
                 max-w-7xl flex-col
                 items-center justify-between gap-1 rounded-b-lg
 
-                border-b-2 bg-gray-200 p-1 px-2
-                pb-2 transition-all
-                duration-1000
+                border-b-2 bg-gray-200
+                p-1 px-2
+                transition-all duration-1000
 
                 hover:opacity-100 sm:flex-row
 
-                sm:flex-wrap md:min-h-20
+                sm:flex-wrap md:min-h-14
 
                 dark:bg-gray-800 print:hidden
                 ">
@@ -244,8 +244,8 @@ function clear_sess() {
                 <!-- Be sure to explain what &AElig; (Aether) means in the title text or similar! -->
                 <Satellite
                     size="1.5em"
-                    class="mx-1 inline-block text-gray-500" />
-                <abbr title="Aether - Events Module"> Æ Events </abbr>
+                    class="mx-1 inline-block text-gray-500 dark:text-gray-400" />
+                <abbr title="Aether - Events Module" class="text-gray-500 dark:text-gray-400 font-semibold"> Æ Events </abbr>
             </span>
             {#if !$ae_sess?.disable_sys_header}
                 <Element_data_store
@@ -254,9 +254,11 @@ function clear_sess() {
             {/if}
             <a
                 href="/"
-                class="btn btn-sm preset-tonal-surface border-surface-500 hover:preset-filled-success-500 border">
-                <House />
-                <span class="hidden md:inline"> Home </span>
+                class="btn btn-sm preset-tonal-surface border-surface-300-700 hover:border-surface-600-400 hover:preset-filled-primary-300-700 border">
+                <House
+                    size="1.5em"
+                    class="mx-1 inline-block text-gray-500 dark:text-gray-400" />
+                <span class="hidden md:inline text-gray-500 dark:text-gray-400"> Home </span>
             </a>
         </nav>
     {/if}
diff --git a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_search.svelte b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_search.svelte
index dfc23dbc..204328e3 100644
--- a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_search.svelte
+++ b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_search.svelte
@@ -95,7 +95,7 @@ function handle_qr_scan_result(event: {
             class="search_form bg-primary-50-950 border-primary-100-900 flex w-full max-w-7xl flex-col sm:flex-row flex-wrap items-center justify-center gap-2 rounded-lg px-2 py-2 shadow-md md:px-12">
             <div
                 class="flex grow flex-col md:flex-row flex-wrap items-center justify-center gap-2">
-                {#if $ae_loc.trusted_access}
+                {#if ($ae_loc.trusted_access && $ae_loc.edit_mode) || $ae_loc.manager_access}
                     <span class="flex flex-row flex-wrap items-center justify-center gap-1">
                     <select
                         bind:value={badges_loc.current.search_badge_type_code}