diff --git a/src/lib/ae_events__event_file.ts b/src/lib/ae_events__event_file.ts
index f132d899..de0fddc5 100644
--- a/src/lib/ae_events__event_file.ts
+++ b/src/lib/ae_events__event_file.ts
@@ -79,7 +79,7 @@ export async function handle_load_ae_obj_li__event_file(
     }
 
     let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled
-    let hidden: string = (params.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden
+    let hidden: string = (params.qry__hidden ?? 'all'); // all, hidden, not_hidden
     let limit: number = (params.qry__limit ?? 99); // 99
     let offset: number = (params.qry__offset ?? 0); // 0
 
@@ -105,7 +105,9 @@ export async function handle_load_ae_obj_li__event_file(
         })
     .then(function (event_file_obj_li_get_result) {
         if (event_file_obj_li_get_result) {
-            handle_db_save_ae_obj_li__event_file({obj_type: 'event_file', obj_li: event_file_obj_li_get_result});
+            if (try_cache) {
+                handle_db_save_ae_obj_li__event_file({obj_type: 'event_file', obj_li: event_file_obj_li_get_result});
+            }
             return event_file_obj_li_get_result;
         } else {
             console.log('No results returned.');
diff --git a/src/lib/ae_events__event_presenter.ts b/src/lib/ae_events__event_presenter.ts
index 2c09d72f..3a2f479a 100644
--- a/src/lib/ae_events__event_presenter.ts
+++ b/src/lib/ae_events__event_presenter.ts
@@ -11,7 +11,7 @@ export async function handle_load_ae_obj_id__event_presenter(
         {
             api_cfg,
             event_presenter_id,
-            try_cache=false,
+            try_cache = true,
             log_lvl=0
         }: {
             api_cfg: any,
@@ -35,8 +35,13 @@ export async function handle_load_ae_obj_id__event_presenter(
         })
     .then(function (event_presenter_obj_get_result) {
         if (event_presenter_obj_get_result) {
-            // This is expecting a list
-            handle_db_save_ae_obj_li__event_presenter({obj_type: 'event_presenter', obj_li: [event_presenter_obj_get_result]});
+            if (try_cache) {
+                // This is expecting a list
+                handle_db_save_ae_obj_li__event_presenter({
+                    obj_type: 'event_presenter',
+                    obj_li: [event_presenter_obj_get_result]
+                });
+            }
             return event_presenter_obj_get_result;
         } else {
             console.log('No results returned.');
@@ -55,20 +60,22 @@ export async function handle_load_ae_obj_id__event_presenter(
 export async function handle_load_ae_obj_li__event_presenter(
         {
             api_cfg,
-            event_presentation_id,
+            for_obj_type,
+            for_obj_id,
             params={},
             try_cache=true,
             log_lvl=0
         }: {
             api_cfg: any,
-            event_presentation_id: string,
+            for_obj_type: string,
+            for_obj_id: string,
             params?: key_val,
             try_cache?: boolean,
             log_lvl?: number
         }
     ) {
     if (log_lvl) {
-        console.log(`*** handle_load_ae_obj_li__event_presenter() *** event_presentation_id=${event_presentation_id}`);
+        console.log(`*** handle_load_ae_obj_li__event_presenter() *** for_obj_type=${for_obj_type} for_obj_id=${for_obj_id}`);
     }
 
     let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled
@@ -83,8 +90,8 @@ export async function handle_load_ae_obj_li__event_presenter(
     ae_promises.load__event_presenter_obj_li = await api.get_ae_obj_li_for_obj_id_crud({
         api_cfg: api_cfg,
         obj_type: 'event_presenter',
-        for_obj_type: 'event_presentation',
-        for_obj_id: event_presentation_id,
+        for_obj_type: for_obj_type,
+        for_obj_id: for_obj_id,
         use_alt_table: true, // NOTE: This will use the table_name_alt value instead of the table_name value in the API config.
         use_alt_base: false, // NOTE: This will use the base_name_alt value instead of the base_name value
         enabled: enabled,
@@ -98,7 +105,12 @@ export async function handle_load_ae_obj_li__event_presenter(
         })
     .then(function (event_presenter_obj_li_get_result) {
         if (event_presenter_obj_li_get_result) {
-            handle_db_save_ae_obj_li__event_presenter({obj_type: 'event_presenter', obj_li: event_presenter_obj_li_get_result});
+            if (try_cache) {
+                handle_db_save_ae_obj_li__event_presenter({
+                    obj_type: 'event_presenter',
+                    obj_li: event_presenter_obj_li_get_result
+                });
+            }
             return event_presenter_obj_li_get_result;
         } else {
             return [];
diff --git a/src/lib/ae_events__event_session.ts b/src/lib/ae_events__event_session.ts
index 39f72a9d..0845f6c2 100644
--- a/src/lib/ae_events__event_session.ts
+++ b/src/lib/ae_events__event_session.ts
@@ -3,25 +3,26 @@ import { api } from '$lib/api';
 
 import { db_events } from "$lib/db_events";
 
+import { handle_load_ae_obj_li__event_file } from "$lib/ae_events__event_file";
 import { handle_load_ae_obj_li__event_presentation } from "$lib/ae_events__event_presentation";
 
 let ae_promises: key_val = {};
 
 
-// Updated 2024-06-10
+// Updated 2024-08-09
 export async function handle_load_ae_obj_id__event_session(
         {
             api_cfg,
             event_session_id,
             inc_file_li = false,
-            inc_presenter_li = false, // Actually presentations and presenters
+            inc_presentation_li = false,
             try_cache = true,
             log_lvl = 0
         }: {
             api_cfg: any,
             event_session_id: string,
             inc_file_li?: boolean,
-            inc_presenter_li?: boolean,
+            inc_presentation_li?: boolean,
             try_cache?: boolean,
             log_lvl?: number
         }
@@ -59,16 +60,45 @@ export async function handle_load_ae_obj_id__event_session(
         console.log('No results returned or failed.', error);
     });
 
+    if (log_lvl) {
+        console.log('ae_promises.load__event_session_obj:', ae_promises.load__event_session_obj);
+    }
 
-    if (inc_presenter_li) {
+    if (inc_file_li) {
+        // Load the files for the session
+        if (log_lvl) {
+            console.log(`Need to load the file list for the session now`);
+        }
+        let load_event_file_obj_li = handle_load_ae_obj_li__event_file({
+            api_cfg: api_cfg,
+            for_obj_type: 'event_session',
+            for_obj_id: event_session_id,
+            params: {qry__enabled: 'all', qry__limit: 15},
+            try_cache: try_cache,
+            log_lvl: log_lvl
+        })
+        .then((event_file_obj_li) => {
+            if (log_lvl) {
+                console.log(`event_file_obj_li = `, event_file_obj_li);
+            }
+            return event_file_obj_li;
+        });
+
+        if (log_lvl) {
+            console.log(`load_event_file_obj_li = `, load_event_file_obj_li);
+        }
+        ae_promises.load__event_session_obj.event_file_li = load_event_file_obj_li;
+    }
+
+    if (inc_presentation_li) {
         // Load the presentations for the session
         if (log_lvl) {
-            console.log(`Need to load the presentation list now`);
+            console.log(`Need to load the presentation list for the session now`);
         }
         let load_event_presentation_obj_li = handle_load_ae_obj_li__event_presentation({
             api_cfg: api_cfg,
             event_session_id: event_session_id,
-            params: {enabled: 'all', qry__limit: 15},
+            params: {qry__enabled: 'all', qry__limit: 15},
             try_cache: try_cache,
             log_lvl: log_lvl
         })
@@ -76,15 +106,15 @@ export async function handle_load_ae_obj_id__event_session(
             if (log_lvl) {
                 console.log(`event_presentation_obj_li = `, event_presentation_obj_li);
             }
-            if (try_cache) {
-                ae_promises.load__event_session_obj.event_presentation_li = event_presentation_obj_li;
-                // Re-save the session object with the new presentation list
-                handle_db_save_ae_obj_li__event_session({
-                    obj_type: 'event_session',
-                    obj_li: ae_promises.load__event_session_obj
-                });
-            }
-
+            // if (try_cache) {
+            //     console.log(`ae_promises.load__event_session_obj = `, ae_promises.load__event_session_obj);
+            //     ae_promises.load__event_session_obj.event_presentation_li = event_presentation_obj_li;
+            //     // Re-save the session object with the new presentation list
+            //     handle_db_save_ae_obj_li__event_session({
+            //         obj_type: 'event_session',
+            //         obj_li: [ae_promises.load__event_session_obj]
+            //     });
+            // }
             return event_presentation_obj_li;
         });
 
@@ -98,14 +128,14 @@ export async function handle_load_ae_obj_id__event_session(
 }
 
 
-// Updated 2024-05-24
+// Updated 2024-08-09
 export async function handle_load_ae_obj_li__event_session(
         {
             api_cfg,
             for_obj_type,
             for_obj_id,
             inc_file_li = false,
-            inc_presenter_li = false, // Actually presentations and presenters
+            inc_presentation_li = false,
             params={},
             try_cache=true,
             log_lvl=0
@@ -114,13 +144,13 @@ export async function handle_load_ae_obj_li__event_session(
             for_obj_type: string,
             for_obj_id: string,
             inc_file_li?: boolean,
-            inc_presenter_li?: boolean,
+            inc_presentation_li?: boolean,
             params?: key_val,
             try_cache?: boolean,
             log_lvl?: number
         }
     ) {
-    console.log(`*** handle_load_ae_obj_li__event_session() ***`);
+    console.log(`*** handle_load_ae_obj_li__event_session() *** for_obj_type=${for_obj_type} for_obj_id=${for_obj_id}`);
 
     let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled
     let hidden: string = (params.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden
@@ -168,8 +198,41 @@ export async function handle_load_ae_obj_li__event_session(
         console.log('ae_promises.load__event_session_obj_li:', ae_promises.load__event_session_obj_li);
     }
 
-    if (inc_presenter_li) {
+    if (inc_file_li) {
+        // Load the files for the sessions
+        if (log_lvl) {
+            console.log(`Need to load the file list for each session now`);
+        }
+        for (let i = 0; i < ae_promises.load__event_session_obj_li.length; i++) {
+            let event_session_obj = ae_promises.load__event_session_obj_li[i];
+            let event_session_id = event_session_obj.event_session_id_random;
+
+            let load_event_file_obj_li = handle_load_ae_obj_li__event_file({
+                api_cfg: api_cfg,
+                for_obj_type: 'event_session',
+                for_obj_id: event_session_id,
+                params: {qry__enabled: 'all', qry__limit: 15},
+                try_cache: try_cache,
+                log_lvl: log_lvl
+            })
+            .then((event_file_obj_li) => {
+                if (log_lvl) {
+                    console.log(`event_file_obj_li = `, event_file_obj_li);
+                }
+                return event_file_obj_li;
+            });
+
+            if (log_lvl) {
+                console.log(`load_event_file_obj_li = `, load_event_file_obj_li);
+            }
+        }
+    }
+
+    if (inc_presentation_li) {
         // Load the presentations for the sessions
+        if (log_lvl) {
+            console.log(`Need to load the presentation list for each session now`);
+        }
         for (let i = 0; i < ae_promises.load__event_session_obj_li.length; i++) {
             let event_session_obj = ae_promises.load__event_session_obj_li[i];
             let event_session_id = event_session_obj.event_session_id_random;
@@ -182,7 +245,11 @@ export async function handle_load_ae_obj_li__event_session(
                 log_lvl: log_lvl
             })
             .then((event_presentation_obj_li) => {
+                if (log_lvl) {
+                    console.log(`event_presentation_obj_li = `, event_presentation_obj_li);
+                }
                 if (try_cache) {
+                    console.log(`event_session_obj = `, event_session_obj);
                     event_session_obj.event_presentation_li = event_presentation_obj_li;
                     // Re-save the session object with the new presentation list
                     handle_db_save_ae_obj_li__event_session({
@@ -190,17 +257,16 @@ export async function handle_load_ae_obj_li__event_session(
                         obj_li: event_session_obj
                     });
                 }
+
+                return event_presentation_obj_li;
             });
 
             if (log_lvl) {
                 console.log(`load_event_presentation_obj_li = `, load_event_presentation_obj_li);
             }
-            // event_session_obj.event_presentation_li = load_event_presentation_obj_li;
-
         }
     }
 
-
     return ae_promises.load__event_session_obj_li;
 }
 
@@ -392,6 +458,7 @@ export function handle_db_save_ae_obj_li__event_session(
                     file_count: obj.file_count,
                     file_count_all: obj.file_count_all,
                     internal_use_count: obj.internal_use_count,
+                    event_file_id_li_json: obj.event_file_id_li_json,
 
                     poc_person_given_name: obj.poc_person_given_name,
                     poc_person_family_name: obj.poc_person_family_name,
diff --git a/src/lib/ae_events_stores.ts b/src/lib/ae_events_stores.ts
index 1a05ec6c..73d9abf9 100644
--- a/src/lib/ae_events_stores.ts
+++ b/src/lib/ae_events_stores.ts
@@ -96,9 +96,17 @@ let events_local_data_struct: key_val = {
         qry_max__presenters: 75,
         qry_max__files: 75,
 
+        show_content__hidden_files: false,
+        show_content__hidden_presentations: false,
+        show_content__hidden_presenters: false,
+        show_content__hidden_sessions: false,
+
         show_content__session_code: true,
         show_content__presentation_code: true,
         show_content__presenter_code: true,
+
+        time_format: 'time_us_short', // 'time_short', 'time_us_short'
+
         slct: {
             event_id: null,
             event_location_id: null,
diff --git a/src/lib/ae_utils__datetime_format.ts b/src/lib/ae_utils__datetime_format.ts
index f29408b6..d08e32b0 100644
--- a/src/lib/ae_utils__datetime_format.ts
+++ b/src/lib/ae_utils__datetime_format.ts
@@ -114,11 +114,14 @@ export let iso_datetime_formatter = function iso_datetime_formatter(
             datetime_string = dayjs(raw_datetime).format('HH:mm');
             break;
         case 'time_short_no_leading':
-            datetime_string = dayjs(raw_datetime).format('h:mm A');
+            datetime_string = dayjs(raw_datetime).format('H:mm');
             break;
         case 'time_us_short':
             datetime_string = dayjs(raw_datetime).format('hh:mm A');
             break;
+        case 'time_us_short_no_leading':
+            datetime_string = dayjs(raw_datetime).format('h:mm A');
+            break;
         case 'week_long':
             datetime_string = dayjs(raw_datetime).format('dddd');
             break;
diff --git a/src/lib/db_events.ts b/src/lib/db_events.ts
index e90dab4b..ac22eaed 100644
--- a/src/lib/db_events.ts
+++ b/src/lib/db_events.ts
@@ -355,6 +355,7 @@ export interface Session {
     file_count?: null|number; // Only files directly under a session
     file_count_all?: null|number; // All files under a session
     internal_use_count?: null|number; // Files marked for internal use
+    event_file_id_li_json?: null|string;
 
     poc_person_given_name?: null|string;
     poc_person_family_name?: null|string;
diff --git a/src/lib/element_manage_event_file_li.svelte b/src/lib/element_manage_event_file_li.svelte
index 8f590084..ee0815cd 100644
--- a/src/lib/element_manage_event_file_li.svelte
+++ b/src/lib/element_manage_event_file_li.svelte
@@ -78,7 +78,7 @@ onMount(() => {
                 for_obj_type: link_to_type,
                 for_obj_id: link_to_id,
                 params: params,
-                try_cache: false
+                try_cache: true
             });
 
             // ae_tmp.show__file_li = false;
@@ -348,7 +348,7 @@ onMount(() => {
                         for_obj_type: link_to_type,
                         for_obj_id: link_to_id,
                         params: params,
-                        try_cache: false
+                        try_cache: true
                     });
                 });
             }}
@@ -545,14 +545,14 @@ onMount(() => {
                 </strong>
                 {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'date_iso')}
                 at
-                <strong>{ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_short_no_leading')}</strong>
+                <strong>{ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_us_short_no_leading')}</strong>
                 <!-- {event_file_obj.updated_on} -->
              {:else}
                 <!-- <span class="fas fa-calendar-day mx-1"></span> -->
                 <strong>
                 {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'date_short')}
                 <!-- at -->
-                <strong>{ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_short_no_leading')}</strong>
+                <strong>{ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_us_short_no_leading')}</strong>
                 </strong>
             {/if}
         </span>
diff --git a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page.ts b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page.ts
index ced51214..2b3321fd 100644
--- a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page.ts
+++ b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page.ts
@@ -82,6 +82,7 @@ export async function load({ params, parent, url }) { // route
 
 
     if (browser) {
+        console.log('HERE!!!');
         // if (url.searchParams.get('location_id')) {
         //     console.log(`url.searchParams.get('location_id') = `, url.searchParams.get('location_id'));
         //     for_obj_type = 'event_location';
@@ -93,7 +94,8 @@ export async function load({ params, parent, url }) { // route
             api_cfg: ae_acct.api,
             for_obj_type: for_obj_type,
             for_obj_id: for_obj_id,
-            params: {qry__enabled: 'enabled', qry__limit: 550},
+            // inc_presentation_li: false,
+            params: {qry__enabled: 'enabled', qry__limit: 500},
             try_cache: true
         })
         .finally(() => {
diff --git a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page@(launcher).svelte b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page@(launcher).svelte
index 7a621bc8..d76ab374 100644
--- a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page@(launcher).svelte
+++ b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page@(launcher).svelte
@@ -315,7 +315,7 @@ onMount(() => {
 <section
     id="Main-Nav-Menu"
     class="event_launcher_menu
-        container h-full flex flex-col gap-4 py-1 px-1
+        container h-full flex flex-col gap-2 py-1 px-1
         basis-1/5
         min-w-72
         max-w-xs
@@ -371,7 +371,7 @@ onMount(() => {
     {/if} -->
     <!-- {$lq__event_session_obj?.name} -->
 
-    {#if $events_loc.launcher.slct.event_session_id}
+    {#if $events_loc.launcher.slct.event_session_id && $lq__event_session_obj}
     <Event_launcher_session_view
         slct_event_session_id={$events_slct.event_session_id}
 
diff --git a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_file_cont.svelte b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_file_cont.svelte
index 303f243f..e9718888 100644
--- a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_file_cont.svelte
+++ b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_file_cont.svelte
@@ -8,16 +8,16 @@ type key_val = {
 };
 
 // *** Import Aether core variables and functions
-import { ae } from 'aether_npm_lib';
+// import { ae } from 'aether_npm_lib';
 
 // import { } from '../../mods/electron.js';
-import { ae_event_launcher, event_file_obj_def, open_event_file_as_modal, ae_screen_saver_img_list } from '../../stores_mod_events';
+// import { ae_event_launcher, event_file_obj_def, open_event_file_as_modal, ae_screen_saver_img_list } from '../../stores_mod_events';
 
 // *** Import Aether core components
 
 // *** Import Aether module variables and functions
 // import { ae_event_launcher } from '../stores_event.js';
-import { download_event_file } from '../stores_event_api.js';
+// import { download_event_file } from '../stores_event_api.js';
 
 // *** Import Aether module components
 
diff --git a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_menu.svelte b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_menu.svelte
index c51888a3..7da17a33 100644
--- a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_menu.svelte
+++ b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_menu.svelte
@@ -51,10 +51,42 @@ let ae_promises: key_val = {};
 </script>
 
 
-<section>
+<section class="text-center space-y-1">
+
 <h2 class="">{$lq__event_obj?.cfg_json.short_name ?? 'loading...'}</h2>
+
+<button
+    on:click={() => {
+        $events_loc.launcher.show_content__hidden_files = !$events_loc.launcher.show_content__hidden_files;
+    }}
+    class="btn btn-sm variant-ghost-warning hover:variant-filled-primary text-xs py-1 px-2"
+    >
+    {#if $events_loc.launcher.show_content__hidden_files}
+        <span class="fas fa-eye-slash m-1"></span>
+        Hide Files
+    {:else}
+        <span class="fas fa-eye m-1"></span>
+        Show Hidden Files
+    {/if}
+
+</button>
+<button
+    on:click={() => {
+        $events_loc.launcher.show_content__hidden_sessions = !$events_loc.launcher.show_content__hidden_sessions;
+    }}
+    class="btn btn-sm variant-ghost-warning hover:variant-filled-primary text-xs py-1 px-2"
+    >
+    {#if $events_loc.launcher.show_content__hidden_sessions}
+        <span class="fas fa-eye-slash m-1"></span>
+        Hide Sessions
+    {:else}
+        <span class="fas fa-eye m-1"></span>
+        Show Hidden Sessions
+    {/if}
+</button>
+
 {#if $lq_get__event_location_obj_li && $lq_get__event_location_obj_li.length > 0}
-<strong class="text-xs">
+<div class="text-xs"><strong>
     Locations:
     {#if $ae_loc.administrator_access}
         ({$lq_get__event_location_obj_li?.length})
@@ -65,7 +97,7 @@ let ae_promises: key_val = {};
     {:then result}
         <span class="fas fa-check text-green-500"></span>
     {/await}
-</strong>
+</strong></div>
 <select
     class="select text-xs p-1"
     bind:value={slct_event_location_id}
@@ -109,8 +141,9 @@ let ae_promises: key_val = {};
                 api_cfg: $ae_api,
                 for_obj_type: 'event_location',
                 for_obj_id: $events_loc.launcher.slct.event_location_id,
+                inc_presentation_li: false,
                 params: {qry__enabled: 'enabled', qry__limit: 550},
-                try_cache: false,
+                try_cache: true,
                 log_lvl: 1,
             })
             .then(async function (load_results) {
@@ -166,7 +199,9 @@ let ae_promises: key_val = {};
 
 </section>
 
-<section>
+
+<section class="text-center">
+
 {#if lq_get__event_session_obj_li}
 <Menu_session_list_menu
     data_url={data_url}
@@ -174,6 +209,7 @@ let ae_promises: key_val = {};
     lq_get__event_session_obj_li={lq_get__event_session_obj_li}
     />
 {/if}
+
 </section>
 
 <!-- {/await} -->
diff --git a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_presenter_view.svelte b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_presenter_view.svelte
new file mode 100644
index 00000000..45b3ccfc
--- /dev/null
+++ b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_presenter_view.svelte
@@ -0,0 +1,114 @@
+<script lang="ts">
+
+import type { key_val } from '$lib/ae_stores';
+import { ae_util } from '$lib/ae_utils';
+import { api } from '$lib/api';
+
+import { liveQuery } from "dexie";
+
+import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
+import { db_events } from "$lib/db_events";
+import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
+import { events_func } from '$lib/ae_events_functions';
+
+// export let slct_event_presentation_id: string;
+// export let slct_event_presenter_id: string;
+export let lq__event_presenter_obj: any;
+
+let ae_promises: key_val = {
+    get_li__event_file: null,
+};
+
+// Event File
+let lq__event_file_obj_li = liveQuery(
+    () => db_events.files
+        // .where('event_session_id_random')
+        .where('for_id_random')
+        .equals(lq__event_presenter_obj?.event_presenter_id)
+        .sortBy('name')
+);
+
+</script>
+
+
+<strong>
+    <span class="fas fa-user"></span>
+    {#if lq__event_presenter_obj?.full_name }{lq__event_presenter_obj?.full_name}{:else }{lq__event_presenter_obj?.given_name}{/if }
+</strong>
+
+{#if !lq__event_presenter_obj?.file_count}
+    <p class="text-sm text-center text-gray-400">
+        <!-- <span class="fas fa-exclamation"></span> -->
+        No files to show for this presenter at this time.
+        <!-- <span class="fas fa-exclamation"></span> -->
+    </p>
+{/if}
+
+{#if $lq__event_file_obj_li && $lq__event_file_obj_li.length }
+<section class="event_session_file_list">
+    <div>
+        <div class="text-xs"><strong>
+            <span class="fas fa-file-archive"></span>
+            Presenter Files:
+            {#if $ae_loc.administrator_access}
+                ({$lq__event_file_obj_li?.length})
+            {/if}
+        </strong></div>
+    </div>
+    <ul>
+    {#each $lq__event_file_obj_li as event_file_obj, index}
+        <li
+            class="flex flex-row justify-center gap-1"
+            class:d_none={!$events_loc.launcher.show_hidden_sessions && event_file_obj.hide}
+            >
+            <button
+                disabled={!$ae_loc.trusted_access}
+                on:click={() => {
+                    // ae_promises[event_file_obj.event_file_id_random]
+                    ae_promises[event_file_obj.event_file_id_random] = api.download_hosted_file({
+                        api_cfg: $ae_api,
+                        hosted_file_id: event_file_obj.hosted_file_id_random,
+                        return_file: true,
+                        filename: event_file_obj.filename,
+                        auto_download: true,
+                        log_lvl: 0
+                    });
+
+                    // window.postMessage({ type: 'download_event_file', event_file_id: event_file_obj.event_file_id_random, filename: event_file_obj.filename, auto_download: true }, '*');
+                }}
+                class="btn btn-sm lg:btn-md variant-soft-primary hover:variant-filled-primary min-w-72 lg:min-w-96"
+                title={`Download this file:\n${event_file_obj.filename}\n[API] SHA256: ${event_file_obj.hash_sha256.slice(0, 10)}... Hosted ID: ${event_file_obj.hosted_file_id_random} Event File ID: ${event_file_obj.event_file_id_random}`}
+                >
+                {#await ae_promises[event_file_obj.event_file_id_random]}
+                    <span class="fas fa-spinner fa-spin mx-1"></span>
+                    <span class="">
+                        Downloading
+                        {#if $ae_sess.api_download_kv[event_file_obj.hosted_file_id_random]}
+                            {$ae_sess.api_download_kv[event_file_obj.hosted_file_id_random].percent_completed}%
+                        {/if}
+                        :
+                    </span>
+                {:then}
+                    <!-- <span class="fas fa-download mx-1"></span> -->
+                    <span class="fas fa-{ae_util.file_extension_icon(event_file_obj.extension)}"></span>
+                    <!-- <span class="text-sm">
+                    Download:
+                    </span> -->
+                {/await}
+
+                <span class="grow">
+                {ae_util.shorten_filename({filename: event_file_obj.filename, max_length: 30})}
+                </span>
+
+                <span
+                    class="badge variant-glass-success hover:variant-filled-success text-sm"
+                    class:hidden={!event_file_obj.file_purpose}
+                    >
+                    {event_file_obj.file_purpose}
+                </span>
+            </button>
+        </li>
+    {/each}
+    </ul>
+</section>
+{/if}
diff --git a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_session_view.svelte b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_session_view.svelte
index 34106d93..099c985e 100644
--- a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_session_view.svelte
+++ b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_session_view.svelte
@@ -4,7 +4,8 @@ import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils';
 import { api } from '$lib/api';
 import Element_ae_crud from '$lib/element_ae_crud.svelte';
-import Element_data_store from '$lib/element_data_store.svelte';
+import Launcher_file_cont from './launcher_file_cont.svelte';
+import Launcher_presenter_view from './launcher_presenter_view.svelte';
 
 import { liveQuery } from "dexie";
 // import { core_func } from '$lib/ae_core_functions';
@@ -25,11 +26,13 @@ export let lq__event_location_obj: any;
 // export let lq_get__event_presenter_obj_li: any;
 export let lq__event_session_obj: any;
 
-let load_event_session_obj = events_func.handle_load_ae_obj_id__event_session({
-    api_cfg: $ae_api,
-    event_session_id: slct_event_session_id,
-    try_cache: true
-});
+// let load_event_session_obj = events_func.handle_load_ae_obj_id__event_session({
+//     api_cfg: $ae_api,
+//     event_session_id: $events_loc.launcher.slct.event_session_id,
+//     inc_presenter_li: false,
+//     try_cache: true,
+//     log_lvl: 1
+// });
 
 // let lq__event_session_obj = liveQuery(
 //     () => db_events.sessions.get(slct_event_session_id)
@@ -46,70 +49,163 @@ export let hide_description: boolean = true;
 export let show_designations: boolean = false;
 export let show_email: boolean = false;
 
-// Event Presentation
-let lq__event_presentation_obj = liveQuery(
-    () => db_events.presentations
-        .get($events_loc.launcher.slct.event_presentation_id)
+// Event File
+let lq__event_file_obj_li = liveQuery(
+    () => db_events.files
+        // .where('event_session_id_random')
+        .where('for_id_random')
+        .equals($events_loc.launcher.slct.event_session_id)
+        .sortBy('filename')
 );
 
+// Does not refresh when the event_file_id_li_json changes.
+// let lq_get__event_file_obj_li = liveQuery(
+//     () => db_events.files
+//         .bulkGet($lq__event_session_obj?.event_file_id_li_json ?? [''])
+// );
+// console.log(`$lq__event_session_obj?.event_file_id_li_json = `, $lq__event_session_obj?.event_file_id_li_json);
+
+// Event Presentation
+// let lq__event_presentation_obj = liveQuery(
+//     () => db_events.presentations
+//         .get($events_loc.launcher.slct.event_presentation_id)
+// );
+
 let lq__event_presentation_obj_li = liveQuery(
     () => db_events.presentations
         .where('event_session_id_random')
         .equals($events_loc.launcher.slct.event_session_id)
-        .sortBy('name')
+        .sortBy('start_datetime')
+        // .sortBy('name')
 );
 
 // FIX! This id list needs to be updated. It is currently commented out in the menu_session_list.svelte file.
-let lq_get__event_presentation_obj_li = liveQuery(
-    () => db_events.presentations
-        .bulkGet($events_slct.id_li__event_presentation)
-);
+// let lq_get__event_presentation_obj_li = liveQuery(
+//     () => db_events.presentations
+//         .bulkGet($events_slct.id_li__event_presentation)
+// );
 
 
+let lq__event_presenter_obj_li = liveQuery(
+    () => db_events.presenters
+        .where('event_session_id_random')
+        .equals($events_loc.launcher.slct.event_session_id)
+        .sortBy('full_name')
+);
+
 let show_modal_upload_files: boolean = false;
 let link_to_type: null|string = null;
 let link_to_id: null|string = null;
 
 
+let ae_promises: key_val = {};
+$events_slct.id_li__event_presenter = [];
+// await tick();
+ae_promises[$events_loc.launcher.slct.event_session_id] = events_func.handle_load_ae_obj_li__event_presenter({
+    api_cfg: $ae_api,
+    for_obj_type: 'event_session',
+    for_obj_id: $events_loc.launcher.slct.event_session_id,
+    // inc_file_li: false,
+    params: {qry__enabled: 'enabled', qry__limit: 550},
+    try_cache: true,
+    log_lvl: 1,
+})
+.then(async function (load_results) {
+    console.log(`load_results = `, load_results);
+
+    let event_presenter_id_li = [];
+
+    let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery.
+
+    for (let i = 0; i < load_results.length; i++) {
+        let event_presenter_obj = load_results[i];
+        let event_presenter_id_random = event_presenter_obj.event_presenter_id_random;
+        tmp_li.push(event_presenter_id_random);
+    }
+    event_presenter_id_li = tmp_li;
+    console.log(`event_presenter_id_li:`, event_presenter_id_li);
+    $events_slct.id_li__event_presenter = event_presenter_id_li;
+    // $events_slct = {...$events_slct};
+    // await tick();
+
+    return load_results;
+});
+
 </script>
 
 <!-- {$events_slct.event_session_id} -->
 
-<section class="event_launcher_session_view">
+<section class="event_launcher_session_view grow w-full space-y-2">
     <!-- <slot name="event_session_message">event session message</slot> -->
 
     {#if $lq__event_session_obj && $lq__event_session_obj.event_session_id_random}
-        <header class="event_session_about">
-            <div class="event_session_datetimes">
-                <strong>{ae_util.iso_datetime_formatter($lq__event_session_obj.start_datetime, 'week_long')}</strong>
-                {ae_util.iso_datetime_formatter($lq__event_session_obj.start_datetime, 'date_long_month_day')}
-                <strong>{ae_util.iso_datetime_formatter($lq__event_session_obj.start_datetime, 'time_short')}</strong>
-                &ndash;
-                {ae_util.iso_datetime_formatter($lq__event_session_obj.end_datetime, 'time_short')}
-            </div>
-            <h2>
+        <header class="event_session_about text-center border-b-2 border-gray-400">
+
+            <h3
+                class="event_session_datetimes"
+                >
+                <button
+                    on:click={() => {
+                        if ($events_loc.launcher.time_format == 'time_us_short') {
+                            $events_loc.launcher.time_format = 'time_short';
+                        } else {
+                            $events_loc.launcher.time_format = 'time_us_short';
+                        }
+                    }}
+                    >
+                <strong>{ae_util.iso_datetime_formatter($lq__event_session_obj.start_datetime, 'week_long')}</strong>
+                <span class="font-normal">
+                    {ae_util.iso_datetime_formatter($lq__event_session_obj.start_datetime, 'date_long_month_day')}
+                </span>
+                <strong>{ae_util.iso_datetime_formatter($lq__event_session_obj.start_datetime, $events_loc.launcher.time_format)}</strong>
+                <span class="font-normal">
+                    &ndash;
+                    {ae_util.iso_datetime_formatter($lq__event_session_obj.end_datetime, $events_loc.launcher.time_format)}
+                </span>
+                </button>
+            </h3>
+            <h2 class="text-xl">
 
-                <!-- {$lq__event_session_obj.name} -->
-                <!-- {#if $lq__event_session_obj.code}
-                {$lq__event_session_obj.code}
-                {/if} -->
                 {$lq__event_session_obj?.name}
                 {#if $lq__event_session_obj?.code}
-                    ({$lq__event_session_obj?.code})
+                <span class="text-base text-gray-500 font-normal p-1"
+                    title="Session code {$lq__event_session_obj.code}"
+                    >
+                    <span class="fas fa-barcode"></span>
+                    {$lq__event_session_obj?.code}
+                </span>
                 {/if}
 
             </h2>
         </header>
 
-        <section class="event_session_description text-xs" class:d_none="{hide_description}">
+        <!-- <section class="event_session_description text-xs" class:d_none="{hide_description}">
             {@html $lq__event_session_obj.description}
-        </section>
+        </section> -->
 
-        {#if $lq__event_session_obj?.event_file_list && $lq__event_session_obj?.event_file_list.length }
+        {#if !$lq__event_session_obj?.file_count_all}
+            <p class="text-2xl text-center text-red-500 font-bold">
+                <span class="fas fa-exclamation-triangle"></span>
+                Warning
+                <span class="fas fa-exclamation-triangle"></span>
+                <br>
+                No files available show for this session.
+
+            </p>
+        {/if}
+
+
+        {#if $lq__event_file_obj_li && $lq__event_file_obj_li.length }
         <section class="event_session_file_list">
             <div>
-                <strong>Session Files:</strong>
-                {#if $ae_loc.trusted_access || $events_loc.launcher.trusted_access}
+                <div class="text-xs"><strong>
+                    <span class="fas fa-file-archive"></span>
+                    Session Files:
+                    {#if $ae_loc.administrator_access}
+                        ({$lq__event_file_obj_li?.length})
+                    {/if}
+                </strong></div>
+                <!-- {#if $ae_loc.trusted_access || $events_loc.launcher.trusted_access}
                 <button on:click={async () => {
                     show_modal_upload_files = true;
                     link_to_type = 'event_session';
@@ -119,80 +215,128 @@ let link_to_id: null|string = null;
                     >
                     <span class="fas fa-upload"></span> Upload Session File(s)
                 </button>
-                {/if}
+                {/if} -->
             </div>
             <ul>
-            {#each $lq__event_session_obj.event_file_list as event_file_obj, index}
-                <li class:d_none={!$events_loc.launcher.show_hidden_sessions && event_file_obj.hide}>
-                    <!-- <Event_launcher_file_cont {event_file_obj} hide_created_on={false} show_bak_download={($ae_loc.trusted_access || $events_loc.launcher.trusted_access)} open_file_as={$lq__event_session_obj.type_code} poster_title={$lq__event_session_obj.title} /> -->
+            {#each $lq__event_file_obj_li as event_file_obj, index}
+                <li
+                    class="flex flex-row justify-center gap-1"
+                    class:hidden={!$events_loc.launcher.show_content__hidden_sessions && event_file_obj.hide}>
+                    <button
+                        disabled={!$ae_loc.trusted_access}
+                        on:click={() => {
+                            // ae_promises[event_file_obj.event_file_id_random]
+                            ae_promises[event_file_obj.event_file_id_random] = api.download_hosted_file({
+                                api_cfg: $ae_api,
+                                hosted_file_id: event_file_obj.hosted_file_id_random,
+                                return_file: true,
+                                filename: event_file_obj.filename,
+                                auto_download: true,
+                                log_lvl: 0
+                            });
+
+                            // window.postMessage({ type: 'download_event_file', event_file_id: event_file_obj.event_file_id_random, filename: event_file_obj.filename, auto_download: true }, '*');
+                        }}
+                        class="btn btn-sm lg:btn-md variant-soft-secondary hover:variant-filled-primary min-w-72 lg:min-w-96"
+                        title={`Download this file:\n${event_file_obj.filename}\n[API] SHA256: ${event_file_obj.hash_sha256.slice(0, 10)}... Hosted ID: ${event_file_obj.hosted_file_id_random} Event File ID: ${event_file_obj.event_file_id_random}`}
+                        >
+                        {#await ae_promises[event_file_obj.event_file_id_random]}
+                            <span class="fas fa-spinner fa-spin mx-1"></span>
+                            <span class="">
+                                Downloading
+                                {#if $ae_sess.api_download_kv[event_file_obj.hosted_file_id_random]}
+                                    {$ae_sess.api_download_kv[event_file_obj.hosted_file_id_random].percent_completed}%
+                                {/if}
+                                :
+                            </span>
+                        {:then}
+                            <!-- <span class="fas fa-download mx-1"></span> -->
+                            <span class="fas fa-{ae_util.file_extension_icon(event_file_obj.extension)}"></span>
+                            <!-- <span class="text-sm">
+                            Download:
+                            </span> -->
+                        {/await}
+
+                        <span class="grow">
+                        {ae_util.shorten_filename({filename: event_file_obj.filename, max_length: 30})}
+                        </span>
+
+                        <span
+                            class="badge variant-glass-success hover:variant-filled-success text-sm"
+                            class:hidden={!event_file_obj.file_purpose}
+                            >
+                            {event_file_obj.file_purpose}
+                        </span>
+                    </button>
+                    <!-- <Launcher_file_cont {event_file_obj} hide_created_on={false} show_bak_download={($ae_loc.trusted_access || $events_loc.launcher.trusted_access)} open_file_as={$lq__event_session_obj.type_code} poster_title={$lq__event_session_obj.title} /> -->
+
+
+                    <!-- <a
+                        href="{$ae_api.base_url}/event/file/{event_file_obj.event_file_id_random}/download?filename={event_file_obj.filename}&x_no_account_id_token=direct-download"
+                        class="btn btn-sm variant-soft-secondary m-0.5 *:hover:inline"
+                        class:hidden={!ae_tmp.show__direct_download}
+                        title={`Download this file:\n${event_file_obj.filename}\n[API] SHA256: ${event_file_obj.hash_sha256.slice(0, 10)}... Hosted ID: ${event_file_obj.hosted_file_id_random} Event File ID: ${event_file_obj.event_file_id_random}`}
+                        >
+                        <span class="fas fa-download mx-1"></span>
+                        <div class="hidden">
+                        Download
+                        </div>
+                    </a> -->
                 </li>
             {/each}
             </ul>
         </section>
         {/if}
 
+        <!-- <hr class="w-full border border-gray-200" /> -->
+
         <section class="event_presentation_list">
-        <div><strong>Presentations:</strong></div>
 
 
-        {$lq__event_presentation_obj_li?.length}
-
-        {$lq__event_session_obj?.event_presentation_li?.length ?? 'loading...?'}
+        <!-- {$lq__event_session_obj?.event_presentation_li?.length ?? 'loading...?'} -->
 
         {#if $lq__event_presentation_obj_li}
-            Presentations:
-            <ul class="event_presentation_list">
+
+            <div class="text-xs"><strong>
+                Presentations:
+                {#if $ae_loc.administrator_access}
+                    ({$lq__event_presentation_obj_li?.length})
+                {/if}
+            </strong></div>
+
+            <!-- Maybe set max with? max-w-screen-md -->
+            <ul class="event_presentation_list max-w-full space-y-2">
             {#each $lq__event_presentation_obj_li as event_presentation_obj}
-                <li>
-                    <div class="event_presentation_datetime_name">
-                        {#if event_presentation_obj?.start_datetime}
-                            <span class="event_presentation_datetime"><strong>{ae_util.iso_datetime_formatter(event_presentation_obj?.start_datetime, 'time_short')}</strong></span>
-                        {/if}
+                <li class="border-b-2 border-gray-300">
 
-                        <span class="event_presentation_name">{event_presentation_obj?.name}</span>
+                    <!-- The presentation information -->
+                    <div class="event_presentation_datetime_name flex flex-row justify-evenly gap-4">
+                        <!-- <div class="event_presentation_datetime_name"> -->
+                            {#if event_presentation_obj?.start_datetime}
+                                <span class="event_presentation_datetime"><strong>{ae_util.iso_datetime_formatter(event_presentation_obj?.start_datetime, 'time_us_short_no_leading')}</strong></span>
+                            {/if}
 
+                            <span class="event_presentation_name grow">{event_presentation_obj?.name}</span>
+                        <!-- </div> -->
                     </div>
 
-                    <!-- {#if 1==3 && event_presentation_obj?.event_presenter_list.length}
+                    <!-- The presenter list -->
+                    {#if $lq__event_presenter_obj_li && $lq__event_presenter_obj_li.length}
                         <ul>
-                        {#each event_presentation_obj?.event_presenter_list as event_presenter_obj, index}
+                        {#each $lq__event_presenter_obj_li as event_presenter_obj, index}
+                            {#if event_presenter_obj.event_presentation_id_random == event_presentation_obj.event_presentation_id_random}
                             <li>
-                                <strong>
-                                    {#if event_presenter_obj.display_name }{event_presenter_obj.display_name}{:else }{event_presenter_obj.full_name}{/if }
-                                    {#if show_designations && event_presenter_obj.designations}<span class="event_presenter_designations">{event_presenter_obj.designations}</span>{/if}
-                                    {#if show_email && event_presenter_obj.email}<span class="event_presenter_email">{event_presenter_obj.email}</span>{/if}
-                                </strong>
-
-                                {#if $ae_loc.trusted_access || $events_loc.launcher.trusted_access}
-                                <button on:click={async () => {
-                                    show_modal_upload_files = true;
-                                    link_to_type = 'event_presenter';
-                                    link_to_id = event_presenter_obj.event_presenter_id_random;
-                                    }}
-                                    type="button" class="ae_btn btn_outline_warning btn_xs" title="Upload updated or additional files"
-                                    >
-                                    <span class="fas fa-upload"></span> Upload Presenter File(s)
-                                </button>
-                                {/if}
-
-                                {#if event_presenter_obj.event_file_list.length }
-                                <ul class="btn_list">
-                                {#each event_presenter_obj.event_file_list as event_file_obj, index}
-                                    <li class:d_none={!$events_loc.launcher.show_hidden_sessions && event_file_obj.hide}> -->
-                                        <!-- <Event_launcher_file_cont {event_file_obj} hide_created_on={false} show_bak_download={($ae_loc.trusted_access || $events_loc.launcher.trusted_access)} open_file_as={$lq__event_session_obj.type_code} poster_title={`${event_presenter_obj.full_name} - ${event_presentation_obj?.name}`} /> -->
-                                    <!-- </li>
-                                {/each}
-                                </ul>
-                                {:else}
-                                    <span class="event_launcher_no_presenter_files">No files to display</span>
-                                {/if}
-
+                                <Launcher_presenter_view
+                                    lq__event_presenter_obj={event_presenter_obj}
+                                    />
                             </li>
+                            {/if}
                         {/each}
                         </ul>
                     {:else}
-                    <span class="event_launcher_no_presententations">No presentations to display</span>
-                    {/if} -->
+                        <span class="event_launcher_no_presenters">No presenters to display</span>
+                    {/if}
+
                 </li>
             {/each}
             </ul>
diff --git a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/menu_session_list.svelte b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/menu_session_list.svelte
index d7d394be..f328d8c4 100644
--- a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/menu_session_list.svelte
+++ b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/menu_session_list.svelte
@@ -3,6 +3,7 @@ import { goto } from '$app/navigation';
 // import { liveQuery } from "dexie";
 
 import type { key_val } from '$lib/ae_stores';
+import { ae_util } from '$lib/ae_utils';
 // import { db_events } from "$lib/db_events";
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
@@ -31,7 +32,7 @@ let ae_promises: key_val = {
 
 
 {#if $lq_get__event_session_obj_li && $lq_get__event_session_obj_li.length > 0}
-<strong class="text-xs">
+<div class="text-xs"><strong>
     Sessions:
     {#if $ae_loc.administrator_access}
         ({$lq_get__event_session_obj_li?.length})
@@ -42,25 +43,29 @@ let ae_promises: key_val = {
     {:then result}
         <span class="fas fa-check text-green-500"></span>
     {/await}
-</strong>
+</strong></div>
 <ul
     class="space-y-1"
     >
     {#each $lq_get__event_session_obj_li as event_session_obj}
         <li>
         <button
-            class="btn btn-sm variant-ghost-primary hover:variant-filled-primary overflow-hidden text-sm w-full max-w-full text-left transition-all rounded-md"
+            type="button"
             on:click={async () => {
+                $events_loc.launcher.slct.event_session_id = null;
+                await tick();
+
                 $events_loc.launcher.slct.event_session_id = event_session_obj?.id;
                 data_url.searchParams.set('session_id', event_session_obj?.id);
 
                 $events_slct.event_session_id = event_session_obj?.id;
                 $events_slct.event_session_obj = event_session_obj;
 
-                ae_promises.slct_event_session_id = await events_func.handle_load_ae_obj_id__event_session({
+                ae_promises.slct_event_session_id = events_func.handle_load_ae_obj_id__event_session({
                     api_cfg: $ae_api,
                     event_session_id: event_session_obj?.id,
-                    inc_presenter_li: true,
+                    inc_file_li: true,
+                    inc_presentation_li: true,
                     try_cache: true,
                     log_lvl: 1
                 })
@@ -71,6 +76,7 @@ let ae_promises: key_val = {
                     console.log(new_url);
                     goto(new_url, {replaceState: false});
                 });
+                // await tick();
 
                 // ae_promises.slct_event_presentation_li = await events_func.handle_load_ae_obj_li__event_presentation({
                 //     api_cfg: $ae_api,
@@ -109,8 +115,19 @@ let ae_promises: key_val = {
                 // console.log(new_url);
                 // goto(new_url, {replaceState: false});
             }}
+            class="btn btn-sm variant-ghost-primary hover:variant-filled-primary overflow-hidden text-sm w-full max-w-full text-left transition-all rounded-md flex flex-row justify-between items-center"
+            title={event_session_obj?.name}
             >
-            {event_session_obj?.name}
+            <span>
+                <span class="fas fa-calendar-alt"></span>
+                <span class="text-xs">
+                    {ae_util.iso_datetime_formatter(event_session_obj?.start_datetime, 'week_long')}
+                </span>
+                {ae_util.iso_datetime_formatter(event_session_obj?.start_datetime, 'time_us_short_no_leading')}
+            </span>
+            <span class="text-xs">
+                {event_session_obj?.name}
+            </span>
         </button>
         </li>
     {/each}
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte
index 296534a0..8ba2c889 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte
@@ -139,7 +139,8 @@ onMount(() => {
         // if (link_to_type == 'event_presentation') {
             events_func.handle_load_ae_obj_li__event_presenter({
                 api_cfg: $ae_api,
-                event_presentation_id: link_to_id,
+                for_obj_type: link_to_type,
+                for_obj_id: link_to_id,
                 log_lvl: 1,
             });
         // }
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte
index 9fd79172..9e36dbe9 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte
@@ -203,7 +203,21 @@ let lq_kv__event_session_obj_li = liveQuery(
             {/if}
         </span>
     </td>
-    <td>{session_obj?.event_location_name ?? '-- not set --'}</td>
+    <td>
+        {#if $ae_loc.trusted_access}
+            <a
+                href="/events_pres_mgmt/launcher/{session_obj?.event_id_random}?location_id={session_obj?.event_location_id_random}"
+                class="text-blue-500 hover:text-blue-800 hover:underline"
+                title="Launcher: {session_obj?.event_location_name} {session_obj?.event_location_id_random}"
+                >
+                <span class="fas fa-paper-plane"></span>
+                {@html session_obj?.event_location_name ? session_obj?.event_location_name : ae_snip.html__not_set}
+            </a>
+        {:else}
+            <span>
+                {session_obj?.event_location_name ?? '-- not set --'}
+            </span>
+        {/if}
     <td
         >
         <span class="flex flex-col items-start lg:flex-row lg:items-center lg:justify-between">
diff --git a/src/routes/events_pres_mgmt/form_agree.svelte b/src/routes/events_pres_mgmt/form_agree.svelte
index ec49e0df..92537bfb 100644
--- a/src/routes/events_pres_mgmt/form_agree.svelte
+++ b/src/routes/events_pres_mgmt/form_agree.svelte
@@ -310,7 +310,11 @@ async function handle_update__event_presenter({
 
             // Wait 1 second to make sure it saved...?
 
-            events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 1})
+            events_func.handle_load_ae_obj_id__event_presenter({
+                api_cfg: $ae_api,
+                event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random,
+                log_lvl: 1
+            })
             .then(function (load_results) {
                 // Wait and then close
                 // $events_loc.pres_mgmt.show_content__agree_text = null;
diff --git a/src/routes/events_pres_mgmt/presenter/[slug]/+page.ts b/src/routes/events_pres_mgmt/presenter/[slug]/+page.ts
index a2888075..b6ee0070 100644
--- a/src/routes/events_pres_mgmt/presenter/[slug]/+page.ts
+++ b/src/routes/events_pres_mgmt/presenter/[slug]/+page.ts
@@ -46,7 +46,7 @@ export async function load({ params, parent }) { // route
             for_obj_type: 'event_presenter',
             for_obj_id: event_presenter_id,
             params: ae_params,
-            try_cache: false
+            try_cache: true
         })
         .then((event_file_obj_li) => {
             if (log_lvl) {
diff --git a/src/routes/events_pres_mgmt/presenter_page_menu.svelte b/src/routes/events_pres_mgmt/presenter_page_menu.svelte
index 0dfd3767..fbee6541 100644
--- a/src/routes/events_pres_mgmt/presenter_page_menu.svelte
+++ b/src/routes/events_pres_mgmt/presenter_page_menu.svelte
@@ -172,7 +172,11 @@ let ae_triggers: key_val = {};
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 1});
+                events_func.handle_load_ae_obj_id__event_presenter({
+                    api_cfg: $ae_api,
+                    event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random,
+                    log_lvl: 1
+                });
             }}
             >
             <!-- {@html $lq__event_presenter_obj?.priority ? '<span class="fas fa-star m-1"></span> High Priority' : '<span class="far fa-star m-1"></span> Priority not set'} -->
@@ -221,7 +225,11 @@ let ae_triggers: key_val = {};
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 1});
+                events_func.handle_load_ae_obj_id__event_presenter({
+                    api_cfg: $ae_api,
+                    event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random,
+                    log_lvl: 1
+                });
             }}
             >
             <!-- {($lq__event_presenter_obj?.hide ? 'Hidden' : 'Not Hidden')} -->
@@ -270,7 +278,11 @@ let ae_triggers: key_val = {};
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 1})
+                events_func.handle_load_ae_obj_id__event_presenter({
+                    api_cfg: $ae_api,
+                    event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random,
+                    log_lvl: 1
+                })
                 .then(function (load_results) {
                     // Maybe reload page?
                     // window.location.reload();
diff --git a/src/routes/events_pres_mgmt/presenter_view.svelte b/src/routes/events_pres_mgmt/presenter_view.svelte
index 6a45cbec..9862062b 100644
--- a/src/routes/events_pres_mgmt/presenter_view.svelte
+++ b/src/routes/events_pres_mgmt/presenter_view.svelte
@@ -479,7 +479,9 @@ $: if ($lq__event_presenter_obj) {
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0})
+                events_func.handle_load_ae_obj_id__event_presenter({
+                    api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                })
                 .then(function (load_results) {
                     // Maybe reload page?
                     // window.location.reload();
@@ -511,7 +513,9 @@ $: if ($lq__event_presenter_obj) {
                 on:ae_crud_updated={e => {
                     console.log(`ae_crud_updated:`, e.detail);
 
-                    events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0})
+                    events_func.handle_load_ae_obj_id__event_presenter({
+                        api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                    })
                     .then(function (load_results) {
                         // Maybe reload page?
                         // window.location.reload();
@@ -542,7 +546,9 @@ $: if ($lq__event_presenter_obj) {
                 on:ae_crud_updated={e => {
                     console.log(`ae_crud_updated:`, e.detail);
 
-                    events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0})
+                    events_func.handle_load_ae_obj_id__event_presenter({
+                        api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                    })
                     .then(function (load_results) {
                         // Maybe reload page?
                         // window.location.reload();
@@ -597,7 +603,9 @@ $: if ($lq__event_presenter_obj) {
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0})
+                events_func.handle_load_ae_obj_id__event_presenter({
+                    api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                })
                 .then(function (load_results) {
                     // Maybe reload page?
                     // window.location.reload();
@@ -624,7 +632,9 @@ $: if ($lq__event_presenter_obj) {
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0})
+                events_func.handle_load_ae_obj_id__event_presenter({
+                    api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                })
                 .then(function (load_results) {
                     // Maybe reload page?
                     // window.location.reload();
@@ -656,7 +666,9 @@ $: if ($lq__event_presenter_obj) {
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0})
+                events_func.handle_load_ae_obj_id__event_presenter({
+                    api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                })
                 .then(function (load_results) {
                     // Maybe reload page?
                     // window.location.reload();
@@ -696,7 +708,9 @@ $: if ($lq__event_presenter_obj) {
                 on:ae_crud_updated={e => {
                     console.log(`ae_crud_updated:`, e.detail);
 
-                    events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0})
+                    events_func.handle_load_ae_obj_id__event_presenter({
+                        api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                    })
                     .then(function (load_results) {
                         // Maybe reload page?
                         // window.location.reload();
@@ -743,7 +757,9 @@ $: if ($lq__event_presenter_obj) {
                     on:ae_crud_updated={e => {
                         console.log(`ae_crud_updated:`, e.detail);
 
-                        events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0})
+                        events_func.handle_load_ae_obj_id__event_presenter({
+                            api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                        })
                         .then(function (load_results) {
                             // Maybe reload page?
                             // window.location.reload();
@@ -789,7 +805,9 @@ $: if ($lq__event_presenter_obj) {
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0})
+                events_func.handle_load_ae_obj_id__event_presenter({
+                    api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                })
                 .then(function (load_results) {
                 });
             }}
@@ -818,7 +836,9 @@ $: if ($lq__event_presenter_obj) {
                 on:ae_crud_updated={e => {
                     console.log(`ae_crud_updated:`, e.detail);
 
-                    events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0});
+                    events_func.handle_load_ae_obj_id__event_presenter({
+                        api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                    });
                 }}
                 >
                 <span class="fas fa-star-of-life"></span>
@@ -846,7 +866,9 @@ $: if ($lq__event_presenter_obj) {
                 on:ae_crud_updated={e => {
                     console.log(`ae_crud_updated:`, e.detail);
 
-                    events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0})
+                    events_func.handle_load_ae_obj_id__event_presenter({
+                        api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                    })
                     .then(function (load_results) {
                         // Maybe reload page?
                         // window.location.reload();
@@ -892,7 +914,9 @@ $: if ($lq__event_presenter_obj) {
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0})
+                events_func.handle_load_ae_obj_id__event_presenter({
+                    api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                })
                 .then(function (load_results) {
                 });
             }}
@@ -921,7 +945,9 @@ $: if ($lq__event_presenter_obj) {
                 on:ae_crud_updated={e => {
                     console.log(`ae_crud_updated:`, e.detail);
 
-                    events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0});
+                    events_func.handle_load_ae_obj_id__event_presenter({
+                        api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                    });
                 }}
                 >
                 <span class="fas fa-star-of-life"></span>
@@ -949,7 +975,9 @@ $: if ($lq__event_presenter_obj) {
                 on:ae_crud_updated={e => {
                     console.log(`ae_crud_updated:`, e.detail);
 
-                    events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0})
+                    events_func.handle_load_ae_obj_id__event_presenter({
+                        api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                    })
                     .then(function (load_results) {
                         // Maybe reload page?
                         // window.location.reload();
@@ -1002,7 +1030,9 @@ $: if ($lq__event_presenter_obj) {
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0})
+                events_func.handle_load_ae_obj_id__event_presenter({
+                    api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                })
                 .then(function (load_results) {
                     // Maybe reload page?
                     // window.location.reload();
@@ -1209,7 +1239,9 @@ $: if ($lq__event_presenter_obj) {
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0})
+                events_func.handle_load_ae_obj_id__event_presenter({
+                    api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                })
                 .then(function (load_results) {
                     // Maybe reload page?
                     // window.location.reload();
@@ -1259,7 +1291,9 @@ $: if ($lq__event_presenter_obj) {
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_presenter({api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0})
+                events_func.handle_load_ae_obj_id__event_presenter({
+                    api_cfg: $ae_api, event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random, log_lvl: 0
+                })
                 .then(function (load_results) {
                     // Maybe reload page?
                     // window.location.reload();
diff --git a/src/routes/events_pres_mgmt/session/[slug]/+page.ts b/src/routes/events_pres_mgmt/session/[slug]/+page.ts
index 3d278ccb..383a9146 100644
--- a/src/routes/events_pres_mgmt/session/[slug]/+page.ts
+++ b/src/routes/events_pres_mgmt/session/[slug]/+page.ts
@@ -58,8 +58,9 @@ export async function load({ params, parent }) { // route
 
                 let load_event_presenter_obj_li = events_func.handle_load_ae_obj_li__event_presenter({
                     api_cfg: ae_acct.api,
-                    event_presentation_id: event_presentation_id,
-                    params: {enabled: 'all', qry__limit: 15},
+                    for_obj_type: 'event_presentation',
+                    for_obj_id: event_presentation_id,
+                    params: {qry__enabled: 'all', qry__limit: 15},
                     try_cache: true
                 });
                 if (log_lvl) {
@@ -87,7 +88,7 @@ export async function load({ params, parent }) { // route
             for_obj_type: 'event_session',
             for_obj_id: event_session_id,
             params: ae_params,
-            try_cache: false
+            try_cache: true
         })
         .then((event_file_obj_li) => {
             if (log_lvl) {
diff --git a/src/routes/events_pres_mgmt/session_page_menu.svelte b/src/routes/events_pres_mgmt/session_page_menu.svelte
index ea627bd8..b58dc2a6 100644
--- a/src/routes/events_pres_mgmt/session_page_menu.svelte
+++ b/src/routes/events_pres_mgmt/session_page_menu.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 export let data: any;
+export let log_lvl = 0;
 
 import type { key_val } from '$lib/ae_stores';
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
@@ -122,7 +123,11 @@ let ae_triggers: key_val = {};
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_session({api_cfg: $ae_api, event_session_id: $lq__event_session_obj?.event_session_id_random, log_lvl: 1});
+                events_func.handle_load_ae_obj_id__event_session({
+                    api_cfg: $ae_api,
+                    event_session_id: $lq__event_session_obj?.event_session_id_random,
+                    log_lvl: log_lvl
+                });
             }}
             >
             <!-- {@html $lq__event_session_obj?.priority ? '<span class="fas fa-star m-1"></span> High Priority' : '<span class="far fa-star m-1"></span> Priority not set'} -->
@@ -172,7 +177,11 @@ let ae_triggers: key_val = {};
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_session({api_cfg: $ae_api, event_session_id: $lq__event_session_obj?.event_session_id_random, log_lvl: 1});
+                events_func.handle_load_ae_obj_id__event_session({
+                    api_cfg: $ae_api,
+                    event_session_id: $lq__event_session_obj?.event_session_id_random,
+                    log_lvl: log_lvl
+                });
             }}
             >
             <!-- {($lq__event_session_obj?.hide ? 'Hidden' : 'Not Hidden')} -->
@@ -221,7 +230,11 @@ let ae_triggers: key_val = {};
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.handle_load_ae_obj_id__event_session({api_cfg: $ae_api, event_session_id: $lq__event_session_obj?.event_session_id_random, log_lvl: 1})
+                events_func.handle_load_ae_obj_id__event_session({
+                    api_cfg: $ae_api,
+                    event_session_id: $lq__event_session_obj?.event_session_id_random,
+                    log_lvl: log_lvl
+                })
                 .then(function (load_results) {
                     // Maybe reload page?
                     // window.location.reload();
diff --git a/src/routes/events_pres_mgmt/session_view.svelte b/src/routes/events_pres_mgmt/session_view.svelte
index 159e3063..85773627 100644
--- a/src/routes/events_pres_mgmt/session_view.svelte
+++ b/src/routes/events_pres_mgmt/session_view.svelte
@@ -25,6 +25,7 @@ import { events_func } from '$lib/ae_events_functions';
 import Form_agree from './form_agree.svelte';
 import Comp_event_presenter_obj_li from './ae_comp__event_presenter_obj_li.svelte';
 import Element_manage_event_file_li from '$lib/element_manage_event_file_li.svelte';
+	import AeCompEventFileObjTbl from './ae_comp__event_file_obj_tbl.svelte';
 
 // Exports
 export let event_session_id: string;
@@ -252,7 +253,19 @@ $: if ($lq__event_session_obj) {
         </Element_ae_crud>
     </li>
     <li>
-        <strong class="text-sm">Location/Room:</strong> {@html $lq__event_session_obj.event_location_name ? $lq__event_session_obj.event_location_name : ae_snip.html__not_set}
+        <strong class="text-sm">Location/Room:</strong>
+        {#if $ae_loc.trusted_access}
+            <a
+                href="/events_pres_mgmt/launcher/{$lq__event_session_obj.event_location_id_random}"
+                class="text-blue-500 hover:text-blue-800 hover:underline"
+                title="Launcher: {$lq__event_session_obj?.event_location_name} {$lq__event_session_obj?.event_location_id_random}"
+                >
+                <span class="fas fa-paper-plane"></span>
+                {@html $lq__event_session_obj.event_location_name ? $lq__event_session_obj.event_location_name : ae_snip.html__not_set}
+            </a>
+        {:else}
+            {@html $lq__event_session_obj.event_location_name ? $lq__event_session_obj.event_location_name : ae_snip.html__not_set}
+        {/if}
 
         {#if $ae_loc.trusted_access && $ae_loc.edit_mode}
         <Element_ae_crud
diff --git a/src/routes/events_speakers/+page.svelte b/src/routes/events_speakers/+page.svelte
index b6058420..ec500d20 100644
--- a/src/routes/events_speakers/+page.svelte
+++ b/src/routes/events_speakers/+page.svelte
@@ -104,7 +104,10 @@ let ae_event_presenter_obj_get_promise: Promise<any>;
 
 // This might need to be reviewed and compared to sponsorships version again
 if ($slct.event_id) {
-    handle_load_ae_obj_li__event_presenter({event_id: $slct.event_id, try_cache: false});
+    handle_load_ae_obj_li__event_presenter({
+        event_id: $slct.event_id,
+        try_cache: false
+    });
     // $slct.event_id = $ae_loc.mod.events.event_id;
     // handle_load_ae_obj_id__event({event_id: $slct.event_id, try_cache: false});
 }
@@ -177,7 +180,9 @@ $: if ($slct_trigger == 'load__event_presenter_obj_li' && $slct.event_id) {
     $slct_trigger = null;
 
 	// handle_load_ae_obj_id__event({event_id: $slct.event_id, try_cache: false});
-    handle_load_ae_obj_li__event_presenter({event_id: $slct.event_id, try_cache: false});
+    handle_load_ae_obj_li__event_presenter({
+        event_id: $slct.event_id, try_cache: false
+    });
 }
 
 async function handle_load_ae_obj_li__event_presenter({event_id, try_cache=true}) {
@@ -266,7 +271,9 @@ $: if ($slct_trigger == 'load__event_presenter_obj' && $slct.event_presenter_id)
 
     $slct_trigger = null;
 
-    handle_load_ae_obj_id__event_presenter({event_presenter_id: $slct.event_presenter_id, try_cache: false});
+    handle_load_ae_obj_id__event_presenter({
+        event_presenter_id: $slct.event_presenter_id, try_cache: false
+    });
 }
 
 
diff --git a/src/routes/events_speakers/[slug]/+page.svelte b/src/routes/events_speakers/[slug]/+page.svelte
index fc94fcb2..475262c5 100644
--- a/src/routes/events_speakers/[slug]/+page.svelte
+++ b/src/routes/events_speakers/[slug]/+page.svelte
@@ -166,7 +166,9 @@ $: if ($slct_trigger == 'load__event_presenter' && $slct.event_presenter_id) {
 
     $slct_trigger = null;
 
-    handle_load_ae_obj_id__event_presenter({event_presenter_id: $slct.event_presenter_id, try_cache: false});
+    handle_load_ae_obj_id__event_presenter({
+        event_presenter_id: $slct.event_presenter_id, try_cache: false
+    });
 
     // modalStore.trigger(modal_edit__event_presenter);
     // $slct_trigger = 'show_edit__event_presenter';