diff --git a/src/lib/ae_events__event_session.ts b/src/lib/ae_events__event_session.ts
index 6905bd22..b77bba78 100644
--- a/src/lib/ae_events__event_session.ts
+++ b/src/lib/ae_events__event_session.ts
@@ -98,7 +98,7 @@ export async function load_ae_obj_id__event_session(
         let load_event_presentation_obj_li = load_ae_obj_li__event_presentation({
             api_cfg: api_cfg,
             event_session_id: event_session_id,
-            params: {qry__enabled: 'all', qry__limit: 15},
+            params: {qry__enabled: 'all', qry__limit: 25},
             try_cache: try_cache,
             log_lvl: log_lvl
         })
@@ -245,7 +245,7 @@ export async function load_ae_obj_li__event_session(
                 for_obj_id: event_session_id,
                 inc_file_li: false, // This will need to be changed.
                 inc_presenter_li: false, // This will need to be changed.
-                params: {qry__enabled: 'all', qry__limit: 15},
+                params: {qry__enabled: 'all', qry__limit: 25},
                 try_cache: try_cache,
                 log_lvl: log_lvl
             })
diff --git a/src/lib/ae_events_stores.ts b/src/lib/ae_events_stores.ts
index 4994e4d7..18e11cd5 100644
--- a/src/lib/ae_events_stores.ts
+++ b/src/lib/ae_events_stores.ts
@@ -101,7 +101,7 @@ let events_local_data_struct: key_val = {
 
     // Event Presentation Launcher (and native Electron app)
     'launcher': {
-        qry_limit__sessions: 75,
+        qry_limit__sessions: 50,
         qry_limit__presentations: 25,
         qry_limit__presenters: 75,
         qry_limit__files: 75,
@@ -183,7 +183,7 @@ let events_local_data_struct: key_val = {
         qry_limit__files: 75,
         qry_limit__presentations: 25,
         qry_limit__presenters: 75,
-        qry_limit__sessions: 75,
+        qry_limit__sessions: 100,
         qry_max: 500, // This is the max number the limit is allowed to be set to.
 
         qry_and__file_count: true, // Essentially it should be greater than 0
@@ -192,6 +192,8 @@ let events_local_data_struct: key_val = {
         saved_search__session: null,
 
         // show_content__agree_text: false,
+        show_content__launcher_link: false,
+        show_content__location_link: false,
         show_content__location_qr: false,
         show_content__presentation_description: false,
         show_content__presenter_page_help: true,
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 22dc9593..ec76ec45 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
@@ -152,7 +152,7 @@ onMount(() => {
         >
         <span class="fas fa-sync-alt m-1"></span>
         <span class="hidden">
-        Presenters
+        Presenters x
         </span>
     </button>
 </div>
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 1d9c6a5d..a05ef5c2 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
@@ -25,6 +25,8 @@ export let link_to_id: string;
 export let event_session_id_random_li: Array<string> = ['']; // ['']
 export let hide__session_location: boolean = false;
 export let hide__session_poc: boolean = false;
+export let show__launcher_link: boolean = false;
+export let show__location_link: boolean = false;
 // export let allow_basic: boolean = false;
 // export let allow_moderator: boolean = false;
 
@@ -142,7 +144,7 @@ let lq_kv__event_session_obj_li = liveQuery(
             href="/events_pres_mgmt/session/{session_obj?.event_session_id_random}"
             class="
                 btn btn-md
-                variant-ghost-secondary hover:variant-filled-secondary
+                variant-ghost-primary hover:variant-filled-primary
                 min-w-full max-w-md
                 sm:w-80
                 md:max-w-xs md:p-2
@@ -219,13 +221,13 @@ let lq_kv__event_session_obj_li = liveQuery(
         class:hidden={hide__session_location}
         >
         <!-- Minimum level access to see the link here is "trusted". -->
-        {#if $ae_loc.manager_access || $ae_loc.trusted_access && $lq__event_obj?.mod_pres_mgmt_json?.show__launcher_link}
+        {#if show__launcher_link}
             <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"
+                class="btn btn-sm variant-glass-surface hover:variant-filled-secondary"
                 title="Launcher: {session_obj?.event_location_name} {session_obj?.event_location_id_random}"
                 >
-                <span class="fas fa-paper-plane"></span>
+                <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}
@@ -233,13 +235,13 @@ let lq_kv__event_session_obj_li = liveQuery(
                 {session_obj?.event_location_name ?? '-- not set --'}
             </span>
         {/if}
-        {#if $ae_loc.manager_access}
+        {#if show__location_link}
             <a
                 href="/events_pres_mgmt/location/{session_obj?.event_location_id_random}"
-                class="btn btn-sm variant-ghost-secondary hover:variant-filled-secondary"
+                class="btn btn-sm variant-glass-surface hover:variant-filled-tertiary"
                 title="Location: {session_obj?.event_location_name} {session_obj?.event_location_id_random}"
                 >
-                <span class="fas fa-map-marker-alt mx-1"></span>
+                <span class="fas fa-map-marker-alt m-1"></span>
                 <!-- {@html session_obj?.event_location_name ? session_obj?.event_location_name : ae_snip.html__not_set} -->
             </a>
         {/if}
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 2243a1ac..c1dd0f65 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
@@ -26,6 +26,8 @@ export let link_to_id: string; // This is probably not needed???
 export let event_session_id_random_li: Array<string>; // ['']
 export let hide__session_location: boolean = false;
 export let hide__session_poc: boolean = false;
+export let show__launcher_link: boolean = false;
+export let show__location_link: boolean = false;
 export let show__session_files: boolean = false;
 export let show__session_presentations: boolean = false;
 // export let allow_basic: boolean = false;
@@ -222,13 +224,13 @@ if (browser) {
         class:hidden={hide__session_location}
         >
         <!-- Minimum level access to see the link here is "trusted". -->
-        {#if $ae_loc.manager_access || $ae_loc.trusted_access && $lq__event_obj?.mod_pres_mgmt_json?.show__launcher_link}
+        {#if show__launcher_link}
             <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"
+                class="btn btn-sm variant-glass-surface hover:variant-filled-secondary"
                 title="Launcher: {session_obj?.event_location_name} {session_obj?.event_location_id_random}"
                 >
-                <span class="fas fa-paper-plane"></span>
+                <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}
@@ -236,13 +238,13 @@ if (browser) {
                 {session_obj?.event_location_name ?? '-- not set --'}
             </span>
         {/if}
-        {#if $ae_loc.manager_access}
+        {#if show__location_link}
             <a
                 href="/events_pres_mgmt/location/{session_obj?.event_location_id_random}"
-                class="btn btn-sm variant-ghost-secondary hover:variant-filled-secondary"
+                class="btn btn-sm variant-glass-surface hover:variant-filled-tertiary"
                 title="Location: {session_obj?.event_location_name} {session_obj?.event_location_id_random}"
                 >
-                <span class="fas fa-map-marker-alt mx-1"></span>
+                <span class="fas fa-map-marker-alt m-1"></span>
                 <!-- {@html session_obj?.event_location_name ? session_obj?.event_location_name : ae_snip.html__not_set} -->
             </a>
         {/if}
diff --git a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
index 82d64dbe..56796a53 100644
--- a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
@@ -442,7 +442,10 @@ async function handle_search__event_session(
     link_to_type={'event'}
     link_to_id={$events_slct.event_id}
     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 && $lq__event_obj?.mod_pres_mgmt_json?.show__launcher_link}
+    show__location_link={$events_loc.pres_mgmt.show_content__location_link}
     />
 </div>
 {:else}
diff --git a/src/routes/events_pres_mgmt/event_page_menu.svelte b/src/routes/events_pres_mgmt/event_page_menu.svelte
index 20363f1b..e9c459a6 100644
--- a/src/routes/events_pres_mgmt/event_page_menu.svelte
+++ b/src/routes/events_pres_mgmt/event_page_menu.svelte
@@ -300,7 +300,35 @@ let ae_triggers: key_val = {};
         {/if}
 
         {#if $ae_loc.authenticated_access}
-            <div class="flex flex-col gap-1 items-center">
+        <div class="flex flex-col gap-1 items-center">
+
+            <!-- Button to toggle between showing and not showing the launcher and location links -->
+            {#if $events_loc.pres_mgmt.show_content__launcher_link || $events_loc.pres_mgmt.show_content__location_link}
+                <button
+                    disabled={!$ae_loc.administrator_access}
+                    on:click={() => {
+                        $events_loc.pres_mgmt.show_content__launcher_link = false;
+                        $events_loc.pres_mgmt.show_content__location_link = false;
+                    }}
+                    class="btn btn-sm variant-ghost-success"
+                    >
+                    <span class="fas fa-toggle-on m-1"></span>
+                    Showing Links
+                </button>
+            {:else}
+                <button
+                    disabled={!$ae_loc.administrator_access}
+                    on:click={() => {
+                        $events_loc.pres_mgmt.show_content__launcher_link = true;
+                        $events_loc.pres_mgmt.show_content__location_link = true;
+                    }}
+                    class="btn btn-sm variant-ringed-warning"
+                    >
+                    <span class="fas fa-toggle-off m-1"></span>
+                    Show Links?
+                </button>
+            {/if}
+
             <!-- Button to toggle between the showing hidden sessions -->
             {#if $events_loc.pres_mgmt.qry_hidden == 'all'}
                 <button
@@ -371,7 +399,7 @@ let ae_triggers: key_val = {};
                     </button>
                 {/if}
             {/if}
-            </div>
+        </div>
         {/if}
 
     </div> <!-- END: The expanded menu area for information and options -->
diff --git a/src/routes/events_pres_mgmt/location/[slug]/+page.svelte b/src/routes/events_pres_mgmt/location/[slug]/+page.svelte
index 5e5bac5c..eb706f24 100644
--- a/src/routes/events_pres_mgmt/location/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/location/[slug]/+page.svelte
@@ -166,6 +166,7 @@ onMount(() => {
 
     <!-- General information about the location -->
     <Location_view
+        show__launcher_link={$events_loc.pres_mgmt.show_content__launcher_link}
         event_location_id={$lq__event_location_obj?.event_location_id}
         lq__event_obj={lq__event_obj}
         lq__event_location_obj={lq__event_location_obj}
@@ -186,6 +187,8 @@ 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__location_link={$events_loc.pres_mgmt.show_content__location_link}
                 >
             </Comp_event_session_obj_li>
         {:else if $lq__event_session_obj_li && $lq__event_session_obj_li?.length == 0}
diff --git a/src/routes/events_pres_mgmt/location/[slug]/+page.ts b/src/routes/events_pres_mgmt/location/[slug]/+page.ts
index 8a60d6a2..615d3c5d 100644
--- a/src/routes/events_pres_mgmt/location/[slug]/+page.ts
+++ b/src/routes/events_pres_mgmt/location/[slug]/+page.ts
@@ -62,7 +62,7 @@ export async function load({ params, parent }) { // route
                     api_cfg: ae_acct.api,
                     for_obj_type: 'event_session',
                     for_obj_id: event_session_id,
-                    params: {qry__enabled: 'all', qry__limit: 15},
+                    params: {qry__enabled: 'all', qry__limit: 25},
                     try_cache: true
                 });
                 if (log_lvl) {
diff --git a/src/routes/events_pres_mgmt/location_page_menu.svelte b/src/routes/events_pres_mgmt/location_page_menu.svelte
index 18d1d16f..54182da3 100644
--- a/src/routes/events_pres_mgmt/location_page_menu.svelte
+++ b/src/routes/events_pres_mgmt/location_page_menu.svelte
@@ -301,8 +301,10 @@ let ae_triggers: key_val = {};
 
         <!-- Group -->
 
-
         {#if $ae_loc.administrator_access}
+        <div
+            class="flex flex-col gap-1 items-center"
+            >
             <!-- {#if $events_loc.pres_mgmt.show_content__location_qr}
                 <button
                     disabled={!$ae_loc.manager_access}
@@ -327,6 +329,33 @@ let ae_triggers: key_val = {};
                 </button>
             {/if} -->
 
+            <!-- Button to toggle between showing and not showing the launcher and location links -->
+            {#if $events_loc.pres_mgmt.show_content__launcher_link || $events_loc.pres_mgmt.show_content__location_link}
+                <button
+                    disabled={!$ae_loc.administrator_access}
+                    on:click={() => {
+                        $events_loc.pres_mgmt.show_content__launcher_link = false;
+                        $events_loc.pres_mgmt.show_content__location_link = false;
+                    }}
+                    class="btn btn-sm variant-ghost-success"
+                    >
+                    <span class="fas fa-toggle-on m-1"></span>
+                    Showing Links
+                </button>
+            {:else}
+                <button
+                    disabled={!$ae_loc.administrator_access}
+                    on:click={() => {
+                        $events_loc.pres_mgmt.show_content__launcher_link = true;
+                        $events_loc.pres_mgmt.show_content__location_link = true;
+                    }}
+                    class="btn btn-sm variant-ringed-warning"
+                    >
+                    <span class="fas fa-toggle-off m-1"></span>
+                    Show Links?
+                </button>
+            {/if}
+
             {#if $events_loc.pres_mgmt.show_content__session_files}
                 <button
                     disabled={!$ae_loc.manager_access}
@@ -374,6 +403,7 @@ let ae_triggers: key_val = {};
                     Show Presentations?
                 </button>
             {/if}
+        </div>
         {/if}
 
         {#if $ae_loc.trusted_access}
diff --git a/src/routes/events_pres_mgmt/location_view.svelte b/src/routes/events_pres_mgmt/location_view.svelte
index ba1d4744..3515da2e 100644
--- a/src/routes/events_pres_mgmt/location_view.svelte
+++ b/src/routes/events_pres_mgmt/location_view.svelte
@@ -41,6 +41,8 @@ if (!$events_sess.pres_mgmt) {
 // $events_sess.pres_mgmt.show_content__agree_text = false;
 // $events_sess.pres_mgmt.show_content__presentation_start = false;
 
+export let show__launcher_link: boolean = true;
+
 export let lq__event_obj: any;
 
 export let lq__event_location_obj: any;
@@ -241,7 +243,7 @@ $: if ($lq__event_location_obj) {
                 });
             }}
             >
-            <strong class="text-sm">Name/Title:</strong> {$lq__event_location_obj.name}
+            <strong class="text-sm">Name (room or area):</strong> {$lq__event_location_obj.name}
         </Element_ae_crud>
 
         {#if !$lq__event_obj?.mod_pres_mgmt_json?.hide__location_code && $events_loc.pres_mgmt.show_content__location_code}
@@ -280,6 +282,20 @@ $: if ($lq__event_location_obj) {
             </span>
         </Element_ae_crud>
         {/if}
+
+
+
+        {#if show__launcher_link}
+            <a
+                data-sveltekit-preload-data="false"
+                href="/events_pres_mgmt/launcher/{$lq__event_location_obj?.event_id_random}?location_id={$lq__event_location_obj?.event_location_id_random}"
+                class="btn btn-sm variant-glass-secondary hover:variant-filled-secondary"
+                title="Launcher: {$lq__event_location_obj?.name} {$lq__event_location_obj?.event_location_id_random}"
+                >
+                <span class="fas fa-paper-plane m-1"></span>
+                {@html $lq__event_location_obj?.name ? $lq__event_obj?.name : ae_snip.html__not_set}
+            </a>
+        {/if}
     </li>
 
     {#if $ae_loc.administrator_access}
diff --git a/src/routes/events_pres_mgmt/session/[slug]/+page.ts b/src/routes/events_pres_mgmt/session/[slug]/+page.ts
index 59a9cd49..3e8d7911 100644
--- a/src/routes/events_pres_mgmt/session/[slug]/+page.ts
+++ b/src/routes/events_pres_mgmt/session/[slug]/+page.ts
@@ -44,7 +44,8 @@ export async function load({ params, parent }) { // route
         // Load event presentations for the session
         let load_event_presentation_obj_li = events_func.load_ae_obj_li__event_presentation({
             api_cfg: ae_acct.api,
-            event_session_id: event_session_id,
+            for_obj_type: 'event_session',
+            for_obj_id: event_session_id,
             params: {qry__enabled: 'all', qry__limit: 50},
             try_cache: true
         })