diff --git a/src/routes/events/[event_id]/+page.svelte b/src/routes/events/[event_id]/+page.svelte
index 593d0e04..fabfe843 100644
--- a/src/routes/events/[event_id]/+page.svelte
+++ b/src/routes/events/[event_id]/+page.svelte
@@ -323,14 +323,22 @@ async function handle_search__event_session(
     </title>
 </svelte:head>
 
-
+<!-- container h-full mx-auto
+flex flex-col gap-1
+py-1 px-2 pb-16
+items-center
+min-w-full
+max-w-max -->
 <section
     class="
         ae_events_pres_mgmt_event
-        container h-full mx-auto
+        md:container
         flex flex-col gap-1
-        py-1 px-2 pb-16
         items-center
+        justify-start
+        mx-auto
+        py-1 px-2 pb-16
+        h-full
         min-w-full
         max-w-max
         "
@@ -344,14 +352,73 @@ async function handle_search__event_session(
     lq__event_obj={lq__event_obj}
     />
 
-{#if !$events_loc.pres_mgmt.show_content__event_view || $events_loc.pres_mgmt.show_content__event_view == 'default'}
+{#if !$lq__event_obj}
 
-<!-- {#if $lq__event_obj} -->
-<header>
-<h2 class="h3 text-center">{$lq__event_obj?.name}</h2>
-<h3 class="h4 text-center">Presentations - Session Lookup</h3>
-</header>
-<!-- {/if} -->
+<div>
+    <span class="fas fa-spinner fa-spin mx-1"></span>
+    <span>Loading event information...</span>
+</div>
+
+{:else if $lq__event_obj?.enable || $ae_loc.trusted_access}
+
+<!-- <header> -->
+<h2 class="h2 text-center rounded-md p-1 px-2 bg-gray-300 flex flex-row gap-0.25 items-center justify-between w-full">
+    <span
+        class="flex flex-row gap-1 items-center"
+        >
+        <span class="fas fa-calendar-day m-1"></span>
+        <!-- Button to toggle between the regular event view and managing event files -->
+        <button
+            type="button"
+            on:click={() => {
+                if ($events_loc.pres_mgmt.show_content__event_view == 'manage_files') {
+                    $events_loc.pres_mgmt.show_content__event_view = null;
+                } else {
+                    $events_loc.pres_mgmt.show_content__event_view = 'manage_files';
+                }
+            }}
+            class="btn btn-md hover:variant-filled-secondary"
+            class:variant-filled-secondary={$events_loc.pres_mgmt.show_content__event_view == 'manage_files'}
+            class:variant-filled-tertiary={$events_loc.pres_mgmt.show_content__event_view != 'manage_files'}
+            class:hidden={!$ae_loc.administrator_access}
+            title="View event search or manage files for the event"
+            >
+            {#if $events_loc.pres_mgmt.show_content__event_view == 'manage_files'}
+                <span class="fas fa-info m-1"></span>
+                <!-- View Details -->
+                Event Search?
+            {:else}
+                <span class="fas fa-file-archive m-1"></span>
+                Event Files?
+                <span
+                    class="badge variant-glass-success"
+                    class:hidden={!$lq__event_obj?.file_count}
+                    >
+                    <!-- absolute -top-1.5 -right-1.5 z-10 -->
+                     <span class="fas fa-file-alt m-1"></span>
+                    {$lq__event_obj?.file_count}&times;
+                </span>
+            {/if}
+        </button>
+    </span>
+
+    <span class="sm:inline-block md:hidden">
+        {$lq__event_obj.cfg_json?.short_name ?? $lq__event_obj?.name}
+    </span>
+    <span class="hidden md:inline-block lg:hidden">
+        {$lq__event_obj.cfg_json?.med_name ?? $lq__event_obj?.name}
+    </span>
+    <span class="hidden lg:inline-block">
+        {$lq__event_obj.cfg_json?.long_name ?? $lq__event_obj?.name}
+    </span>
+
+</h2>
+<!-- <h3 class="h4 text-center">Presentations - Session Lookup</h3> -->
+<!-- </header> -->
+
+
+
+{#if !$events_loc.pres_mgmt.show_content__event_view || $events_loc.pres_mgmt.show_content__event_view == 'default'}
 
 <!-- This session search section should be moved to a separate Svelte component -->
 <div class="variant-ghost-success my-2 p-2 rounded-md flex flex-row items-center">
@@ -449,29 +516,8 @@ async function handle_search__event_session(
 </div>
 
 
-<!-- {#await load_obj_li_results}
-    <span class="modal-loading">
-        <span class="fas fa-spinner fa-spin"></span>
-        <span class="loading-text">
-            Loading...
-        </span>
-    </span>
-{:then load_obj_li_results}
-    {#if load_obj_li_results}
-    <span class="fas fa-check text-green-500"></span>
-    <span class="saved-text">
-        Loaded
-    </span>
-    {/if}
-{/await} -->
-
-<!-- count: {$lq__event_session_obj_li?.length}???
-count ids: {event_session_id_random_li?.length ?? 'nothing???'}??? -->
-
-<!-- {#if $events_slct.event_session_obj_li?.length && $events_slct.event_session_obj_li?.length == event_session_id_random_li?.length} -->
 {#if $lq__event_session_obj_li && $lq__event_session_obj_li?.length > 0 && event_session_id_random_li && event_session_id_random_li?.length > 0}
-<!-- <div class="sm:bg-red-200 md:bg-yellow-200 lg:bg-green-200 md:max-w-screen-md lg:max-w-screen-lg xl:max-w-screen-xl overflow-x-scroll outline"> -->
-<!-- <div class="sm:bg-red-100 md:bg-yellow-100 lg:bg-white"> -->
+
 <Comp_event_session_obj_li
     lq__event_session_obj_li={lq__event_session_obj_li}
     hide__session_location={$events_loc.pres_mgmt.hide__session_location}
@@ -557,6 +603,20 @@ count ids: {event_session_id_random_li?.length ?? 'nothing???'}??? -->
     </div>
 
 {/if}
+
+{:else}
+<div class="bg-red-100 p-4 border border-red-200 rounded-md">
+<h2 class="h3">
+    <span class="fas fa-exclamation-triangle text-red-500 m-1"></span>
+    Event Disabled
+</h2>
+<p>
+    This event is currently disabled. Please contact the event organizer for more information.
+</p>
+</div>
+
+{/if}
+
 </section>
 
 
diff --git a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte
index 8091fa07..ef5d192d 100644
--- a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte
+++ b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte
@@ -137,8 +137,18 @@ onMount(() => {
 
 
 <section
-    class="ae_events_pres_mgmt_event_location
-    md:container h-full mx-auto flex flex-col gap-1 py-1 px-2 pb-16"
+    class="
+        ae_events_pres_mgmt_event_location
+        md:container
+        flex flex-col gap-1
+        items-center
+        justify-start
+        mx-auto
+        py-1 px-2 pb-16
+        h-full
+        min-w-full
+        max-w-max
+        "
     >
 
 <Location_page_menu
@@ -156,8 +166,48 @@ onMount(() => {
 
 {:else if $lq__event_location_obj?.enable || $ae_loc.trusted_access}
 
-<h2 class="h2 text-center rounded-md p-2 bg-gray-300">
+<h2 class="h2 text-center rounded-md p-1 px-2 bg-gray-300 flex flex-row gap-0.25 items-center justify-between w-full">
+    <span
+        class="flex flex-row gap-1 items-center"
+        >
+        <span class="fas fa-calendar-day m-1"></span>
+        <!-- Button to toggle between the regular location view and managing location files -->
+        <button
+            type="button"
+            on:click={() => {
+                if ($events_loc.pres_mgmt.show_content__location_view == 'manage_files') {
+                    $events_loc.pres_mgmt.show_content__location_view = null;
+                } else {
+                    $events_loc.pres_mgmt.show_content__location_view = 'manage_files';
+                }
+            }}
+            class="btn btn-md hover:variant-filled-secondary"
+            class:variant-filled-secondary={$events_loc.pres_mgmt.show_content__location_view == 'manage_files'}
+            class:variant-filled-tertiary={$events_loc.pres_mgmt.show_content__location_view != 'manage_files'}
+            class:hidden={!$ae_loc.administrator_access}
+            title="View location information or manage files for the location"
+            >
+            {#if $events_loc.pres_mgmt.show_content__location_view == 'manage_files'}
+                <span class="fas fa-info m-1"></span>
+                <!-- View Details -->
+                Location Info?
+            {:else}
+                <span class="fas fa-file-archive m-1"></span>
+                Location Files?
+                <span
+                    class="badge variant-glass-success"
+                    class:hidden={!$lq__event_obj?.file_count}
+                    >
+                    <!-- absolute -top-1.5 -right-1.5 z-10 -->
+                     <span class="fas fa-file-alt m-1"></span>
+                    {$lq__event_obj?.file_count}&times;
+                </span>
+            {/if}
+        </button>
+    </span>
+
     {@html $lq__event_location_obj?.name ?? ae_snip.html__not_set}
+
 </h2>
 
 {#if !$events_loc.pres_mgmt.show_content__location_view || $events_loc.pres_mgmt.show_content__location_view == 'default'}
diff --git a/src/routes/events/[event_id]/location/location_page_menu.svelte b/src/routes/events/[event_id]/location/location_page_menu.svelte
index 03c90f06..60e1957b 100644
--- a/src/routes/events/[event_id]/location/location_page_menu.svelte
+++ b/src/routes/events/[event_id]/location/location_page_menu.svelte
@@ -55,7 +55,7 @@ let ae_triggers: key_val = {};
             class="{ae_snip.classes__events_pres_mgmt_menu__button_special}"
             class:variant-filled-primary={$events_loc.pres_mgmt.show_content__location_view == 'manage_files'}
             class:variant-glass-primary={$events_loc.pres_mgmt.show_content__location_view != 'manage_files'}
-            class:hidden={!$ae_loc.trusted_access}
+            class:hidden={!$ae_loc.trusted_access || 1==1}
             title="Manage files for the location"
             >
             {#if $events_loc.pres_mgmt.show_content__location_view == 'manage_files'}
diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte
index 45205f96..2323068d 100644
--- a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte
+++ b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte
@@ -83,8 +83,18 @@ if (!$ae_loc.authenticated_access && $events_loc.pres_mgmt.show_content__present
 
 
 <section
-    class="ae_events_pres_mgmt_event_presenter
-    md:container h-full mx-auto flex flex-col gap-1 py-1 px-2 pb-16"
+    class="
+        ae_events_pres_mgmt_event_presenter
+        md:container
+        flex flex-col gap-1
+        items-center
+        justify-start
+        mx-auto
+        py-1 px-2 pb-16
+        h-full
+        min-w-full
+        max-w-max
+        "
     >
 
 <Presenter_page_menu
@@ -102,7 +112,7 @@ if (!$ae_loc.authenticated_access && $events_loc.pres_mgmt.show_content__present
 
 {:else if $lq__event_presenter_obj?.enable || $ae_loc.trusted_access}
 
-<h2 class="h2 text-center rounded-md p-1 px-2 bg-gray-300 flex flex-row gap-0.25 items-center justify-between">
+<h2 class="h2 text-center rounded-md p-1 px-2 bg-gray-300 flex flex-row gap-0.25 items-center justify-between w-full">
     <span
         class="flex flex-row gap-1 items-center"
         >
diff --git a/src/routes/events/event_page_menu.svelte b/src/routes/events/event_page_menu.svelte
index 0a88c120..716434a3 100644
--- a/src/routes/events/event_page_menu.svelte
+++ b/src/routes/events/event_page_menu.svelte
@@ -52,7 +52,7 @@ let ae_triggers: key_val = {};
             class="{ae_snip.classes__events_pres_mgmt_menu__button_special}"
             class:variant-filled-primary={$events_loc.pres_mgmt.show_content__event_view == 'manage_files'}
             class:variant-glass-primary={$events_loc.pres_mgmt.show_content__event_view != 'manage_files'}
-            class:hidden={!$ae_loc.administrator_access}
+            class:hidden={!$ae_loc.administrator_access || 1==1}
             disabled={!$ae_loc.manager_access}
             title="Session search or manage files for the event"
             >
diff --git a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
index ad72ae92..7d528183 100644
--- a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
@@ -149,12 +149,14 @@ $: lq_kv__event_session_obj_li = liveQuery(async () => {
 //     })
 // );
 
-let lq__event_location_obj_li = liveQuery(
-    () => db_events.locations
+$: lq__event_location_obj_li = liveQuery(async () => {
+    let results = await db_events.locations
         .where('event_id_random')
-        .equals(ae_acct.slct.event_id)
+        .equals($events_slct.event_id)
         .sortBy('name')
-);
+
+    return results;
+});
 
 
 // let load_obj_li_results: Promise<any>|key_val;
@@ -397,10 +399,13 @@ async function handle_search__event_session(
 <section
     class="
         ae_events_pres_mgmt_event
-        container h-full mx-auto
+        md:container
         flex flex-col gap-1
-        py-1 px-2 pb-16
         items-center
+        justify-start
+        mx-auto
+        py-1 px-2 pb-16
+        h-full
         min-w-full
         max-w-max
         "
@@ -414,15 +419,74 @@ async function handle_search__event_session(
     lq__event_obj={lq__event_obj}
     />
 
-{#if !$events_loc.pres_mgmt.show_content__event_view || $events_loc.pres_mgmt.show_content__event_view == 'default'}
+{#if !$lq__event_obj}
 
-<!-- {#if $lq__event_obj} -->
-<header>
-<h2 class="h3 text-center">{$lq__event_obj?.name}</h2>
-<h3 class="h4 text-center">Presentations - Session Lookup</h3>
-</header>
+<div>
+    <span class="fas fa-spinner fa-spin mx-1"></span>
+    <span>Loading event information...</span>
+</div>
+
+{:else if $lq__event_obj?.enable || $ae_loc.authenticated_access}
+
+<!-- <header> -->
+<h2 class="h2 text-center rounded-md p-1 px-2 bg-gray-300 flex flex-row gap-0.25 items-center justify-between w-full">
+    <span
+        class="flex flex-row gap-1 items-center"
+        >
+        <span class="fas fa-calendar-day m-1"></span>
+        <!-- Button to toggle between the regular event view and managing event files -->
+        <button
+            type="button"
+            on:click={() => {
+                if ($events_loc.pres_mgmt.show_content__event_view == 'manage_files') {
+                    $events_loc.pres_mgmt.show_content__event_view = null;
+                } else {
+                    $events_loc.pres_mgmt.show_content__event_view = 'manage_files';
+                }
+            }}
+            class="btn btn-md hover:variant-filled-secondary"
+            class:variant-filled-secondary={$events_loc.pres_mgmt.show_content__event_view == 'manage_files'}
+            class:variant-filled-tertiary={$events_loc.pres_mgmt.show_content__event_view != 'manage_files'}
+            class:hidden={!$ae_loc.administrator_access}
+            title="View event search or manage files for the event"
+            >
+            {#if $events_loc.pres_mgmt.show_content__event_view == 'manage_files'}
+                <span class="fas fa-info m-1"></span>
+                <!-- View Details -->
+                Event Search?
+            {:else}
+                <span class="fas fa-file-archive m-1"></span>
+                Event Files?
+                <span
+                    class="badge variant-glass-success"
+                    class:hidden={!$lq__event_obj?.file_count}
+                    >
+                    <!-- absolute -top-1.5 -right-1.5 z-10 -->
+                        <span class="fas fa-file-alt m-1"></span>
+                    {$lq__event_obj?.file_count}&times;
+                </span>
+            {/if}
+        </button>
+    </span>
+
+    <span class="sm:inline-block md:hidden">
+        {$lq__event_obj.cfg_json?.short_name ?? $lq__event_obj?.name}
+    </span>
+    <span class="hidden md:inline-block lg:hidden">
+        {$lq__event_obj.cfg_json?.med_name ?? $lq__event_obj?.name}
+    </span>
+    <span class="hidden lg:inline-block">
+        {$lq__event_obj.cfg_json?.long_name ?? $lq__event_obj?.name}
+    </span>
+
+</h2>
+<!-- <h3 class="h4 text-center">Presentations - Session Lookup</h3> -->
+<!-- </header> -->
 <!-- {/if} -->
 
+
+{#if !$events_loc.pres_mgmt.show_content__event_view || $events_loc.pres_mgmt.show_content__event_view == 'default'}
+
 <!-- This session search section should be moved to a separate Svelte component -->
 <div class="variant-ghost-success my-2 p-2 rounded-md flex flex-row items-center">
 
@@ -644,6 +708,20 @@ count ids: {event_session_id_random_li?.length ?? 'nothing???'}??? -->
     </div>
 
 {/if}
+
+{:else}
+<div class="bg-red-100 p-4 border border-red-200 rounded-md">
+<h2 class="h3">
+    <span class="fas fa-exclamation-triangle text-red-500 m-1"></span>
+    Event Disabled
+</h2>
+<p>
+    This event is currently disabled. Please contact the event organizer for more information.
+</p>
+</div>
+
+{/if}
+
 </section>
 
 
diff --git a/src/routes/events_pres_mgmt/event_page_menu.svelte b/src/routes/events_pres_mgmt/event_page_menu.svelte
index a0766feb..bf221caf 100644
--- a/src/routes/events_pres_mgmt/event_page_menu.svelte
+++ b/src/routes/events_pres_mgmt/event_page_menu.svelte
@@ -51,7 +51,7 @@ let ae_triggers: key_val = {};
             class="{ae_snip.classes__events_pres_mgmt_menu__button_special}"
             class:variant-filled-primary={$events_loc.pres_mgmt.show_content__event_view == 'manage_files'}
             class:variant-glass-primary={$events_loc.pres_mgmt.show_content__event_view != 'manage_files'}
-            class:hidden={!$ae_loc.administrator_access}
+            class:hidden={!$ae_loc.administrator_access || 1==1}
             disabled={!$ae_loc.manager_access}
             title="Session search or manage files for the event"
             >
diff --git a/src/routes/events_pres_mgmt/session/[slug]/+page.svelte b/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
index e1386b57..c20c10d9 100644
--- a/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
@@ -147,8 +147,18 @@ onMount(() => {
 
 
 <section
-    class="ae_events_pres_mgmt_event_session
-    md:container h-full mx-auto flex flex-col gap-1 py-1 px-2 pb-16"
+    class="
+        ae_events_pres_mgmt_event_session
+        md:container
+        flex flex-col gap-1
+        items-center
+        justify-start
+        mx-auto
+        py-1 px-2 pb-16
+        h-full
+        min-w-full
+        max-w-max
+        "
     >
 
 <Session_page_menu
@@ -167,12 +177,13 @@ onMount(() => {
 
 {:else if $lq__event_session_obj?.enable || $ae_loc.trusted_access}
 
-<h2 class="h2 text-center rounded-md p-1 px-2 bg-gray-300 flex flex-row gap-0.25 items-center justify-between">
+<h2 class="h2 text-center rounded-md p-1 px-2 bg-gray-300 flex flex-row gap-0.25 items-center justify-between w-full">
     <span
         class="flex flex-row gap-1 items-center"
         >
         <!-- <span class="fas fa-calendar-day m-1"></span> -->
         <span class="fas fa-chalkboard-teacher m-1"></span>
+        <!-- Button to toggle between the regular session view and managing session files -->
         <button
             type="button"
             on:click={() => {
@@ -186,7 +197,7 @@ onMount(() => {
             class:variant-ghost-tertiary={$events_loc.pres_mgmt.show_content__session_view == 'manage_files'}
             class:variant-filled-tertiary={$events_loc.pres_mgmt.show_content__session_view != 'manage_files'}
             class:hidden={!$ae_loc.public_access}
-            title="Manage files for the session"
+            title="View session information or manage files for the session"
             >
             {#if $events_loc.pres_mgmt.show_content__session_view == 'manage_files'}
                 <span class="fas fa-users m-1"></span>