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 b25ceeb4..06208a82 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
@@ -244,6 +244,10 @@ let lq_kv__event_session_obj_li = liveQuery(
                 <span class="fas fa-paper-plane m-1"></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}
         <!-- END: Legacy Link -->
 
@@ -258,9 +262,9 @@ let lq_kv__event_session_obj_li = liveQuery(
                 {@html session_obj?.event_location_name ? session_obj?.event_location_name : ae_snip.html__not_set}
             </a>
         {:else}
-            <span>
+            <!-- <span>
                 {session_obj?.event_location_name ?? '-- not set --'}
-            </span>
+            </span> -->
         {/if}
 
         {#if show__location_link}
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li_v2.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li_v2.svelte
index 2f86381e..14de5097 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li_v2.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li_v2.svelte
@@ -238,6 +238,10 @@ if (browser) {
                 <span class="fas fa-paper-plane m-1"></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}
         <!-- END: Legacy Link -->
 
@@ -251,9 +255,9 @@ if (browser) {
                 {@html session_obj?.event_location_name ? session_obj?.event_location_name : ae_snip.html__not_set}
             </a>
         {:else}
-            <span>
+            <!-- <span>
                 {session_obj?.event_location_name ?? '-- not set --'}
-            </span>
+            </span> -->
         {/if}
         {#if show__location_link}
             <a
diff --git a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
index b2fe5ecd..11060130 100644
--- a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
@@ -404,6 +404,7 @@ async function handle_search__event_session(
             $events_sess.pres_mgmt.location_name_qry_str = '';
             $events_loc.pres_mgmt.show_content__session_search_room_name = !$events_loc.pres_mgmt.show_content__session_search_room_name;
         }}
+        title="Search by location name"
         >
         <span class="fas fa-search-location"></span>
     </button>
@@ -450,6 +451,7 @@ async function handle_search__event_session(
             $events_sess.pres_mgmt.fulltext_search_qry_str = '';
             $events_trigger = 'load__event_session_obj_li';
         }}
+        title="Clear search text"
         >
         <!-- <span class="fas fa-backspace"></span> -->
         <!-- <span class="fas fa-broom"></span> -->
@@ -479,6 +481,7 @@ async function handle_search__event_session(
         on:click={() => {
 
         }}
+        title="Search for a session"
         >
         {#if $events_sess.pres_mgmt.status_qry__search == 'loading'}
             <span class="fas fa-spinner fa-spin"></span>
@@ -519,7 +522,7 @@ async function handle_search__event_session(
     event_session_id_random_li={event_session_id_random_li}
     hide__session_location={$events_loc.pres_mgmt.hide__session_location}
     hide__session_poc={$events_loc.pres_mgmt.hide__session_poc}
-    show__launcher_link={$ae_loc.manager_access || $ae_loc.trusted_access && $events_loc.pres_mgmt.show__launcher_link}
+    show__launcher_link={$ae_loc.manager_access || $ae_loc.administrator_access && $events_loc.pres_mgmt.show__launcher_link}
     show__launcher_link_legacy={$ae_loc.manager_access || $ae_loc.trusted_access && $events_loc.pres_mgmt.show__launcher_link_legacy}
     show__location_link={$events_loc.pres_mgmt.show_content__location_link}
     />
diff --git a/src/routes/events_pres_mgmt/location/[slug]/+page.svelte b/src/routes/events_pres_mgmt/location/[slug]/+page.svelte
index 4f18ac01..0ac52e2c 100644
--- a/src/routes/events_pres_mgmt/location/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/location/[slug]/+page.svelte
@@ -188,7 +188,7 @@ onMount(() => {
                 hide__session_location={true}
                 show__session_files={$events_loc.pres_mgmt.show_content__session_files}
                 show__session_presentations={$events_loc.pres_mgmt.show_content__session_presentations}
-                show__launcher_link={$events_loc.pres_mgmt.show_content__launcher_link}
+                show__launcher_link={$ae_loc.administrator_access && $events_loc.pres_mgmt.show_content__launcher_link}
                 show__launcher_link_legacy={$events_loc.pres_mgmt.show_content__launcher_link_legacy}
                 show__location_link={$events_loc.pres_mgmt.show_content__location_link}
                 >
diff --git a/src/routes/events_pres_mgmt/session_view.svelte b/src/routes/events_pres_mgmt/session_view.svelte
index 8beebc0c..0c019384 100644
--- a/src/routes/events_pres_mgmt/session_view.svelte
+++ b/src/routes/events_pres_mgmt/session_view.svelte
@@ -278,15 +278,18 @@ $: if ($lq__event_session_obj) {
 
         <!-- BEGIN: Legacy link -->
         {#if $ae_loc.administrator_access || $ae_loc.authenticated_access && $events_loc.pres_mgmt.show__launcher_link_legacy}
+            <!-- class="text-blue-500 hover:text-blue-800 hover:underline" -->
             <a
                 data-sveltekit-preload-data="false"
                 href="/event/{$lq__event_session_obj?.event_id_random}/launcher/{$lq__event_session_obj?.event_location_id_random}"
-                class="text-blue-500 hover:text-blue-800 hover:underline"
+                class="btn btn-sm variant-glass-secondary hover:variant-filled-secondary"
                 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}
         <!-- END: Legacy link -->
 
@@ -300,7 +303,7 @@ $: if ($lq__event_session_obj) {
                 <!-- {@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}
+            <!-- {@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}