diff --git a/src/app.css b/src/app.css
index 16e08345..ecf8a184 100644
--- a/src/app.css
+++ b/src/app.css
@@ -315,9 +315,15 @@ html.trusted_access #appShell {
 .ae_btn_secondary_outlined {
     @apply preset-outlined-secondary-200-800 hover:preset-filled-secondary-400-600 text-secondary-950-50 transition-all;
 }
+.ae_btn_success_filled {
+    @apply preset-filled-success-200-800 border border-success-500 transition-all;
+}
 .ae_btn_success_outlined {
     @apply preset-outlined-success-200-800 hover:preset-filled-success-400-600 text-success-950-50 transition-all;
 }
+.ae_btn_warning_filled {
+    @apply preset-filled-warning-200-800 border border-warning-500 transition-all;
+}
 .ae_btn_warning_outlined {
     @apply preset-outlined-warning-200-800 hover:preset-filled-warning-400-600 text-warning-950-50 transition-all;
 }
@@ -374,7 +380,7 @@ html.trusted_access #appShell {
     bg-cyan-50 dark:bg-cyan-950 hover:bg-cyan-100 dark:hover:bg-cyan-900
     border border-cyan-200 dark:border-cyan-800 hover:border-cyan-400 dark:hover:border-cyan-600
     rounded-md
-    flex flex-row items-center justify-around
+    flex flex-row flex-wrap items-center justify-around
     w-full max-w-full
     p-2
     transition-all;
diff --git a/src/routes/events/[event_id]/event_page_menu.svelte b/src/routes/events/[event_id]/event_page_menu.svelte
index 37b955a2..ce78bc94 100644
--- a/src/routes/events/[event_id]/event_page_menu.svelte
+++ b/src/routes/events/[event_id]/event_page_menu.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 // export let data: any;
+export let log_lvl: number = 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';
@@ -18,10 +19,9 @@ export let lq__event_obj: any;
 </script>
 
 
-<!-- New standard page specific menu 2024-08-01 -->
+<!-- New standard page specific menu 2025-06-20 -->
 <div
-    class="pres_mgmt__session_search {ae_snip.classes__events_pres_mgmt_menu}"
-    class:border-gray-100={!$events_loc.pres_mgmt.show_menu__session_search}
+    class="pres_mgmt__session_search_menu ae_container_module_menu"
     >
 
     <!-- BEGIN: The menu button options -->
@@ -82,11 +82,11 @@ export let lq__event_obj: any;
                     $events_loc.pres_mgmt.show_menu__session_search = 'options';
                 }
             }}
-            class="{ae_snip.classes__events_pres_mgmt_menu__button}"
-            class:preset-filled-secondary-500={$events_loc.pres_mgmt.show_menu__session_search == 'options'}
-            class:preset-tonal-secondary={$events_loc.pres_mgmt.show_menu__session_search != 'options'}
+            class="btn btn-sm mx-1"
+            class:ae_btn_info_filled={$events_loc.pres_mgmt.show_menu__session_search == 'options'}
+            class:ae_btn_info={$events_loc.pres_mgmt.show_menu__session_search != 'options'}
             class:hidden={!$ae_loc.trusted_access}
-            title="Options for the presenter"
+            title="Options for the event session search"
             >
             <span class="fas fa-cog m-1"></span>
             {#if $events_loc.pres_mgmt.show_menu__session_search == 'options'}
@@ -108,9 +108,9 @@ export let lq__event_obj: any;
                     $events_loc.pres_mgmt.show_menu__session_search = 'help';
                 }
             }}
-            class="{ae_snip.classes__events_pres_mgmt_menu__button}"
-            class:preset-filled-secondary-500={$events_loc.pres_mgmt.show_menu__session_search == 'help'}
-            class:preset-tonal-secondary={$events_loc.pres_mgmt.show_menu__session_search != 'help'}
+            class="btn btn-sm mx-1"
+            class:ae_btn_info_filled={$events_loc.pres_mgmt.show_menu__session_search == 'help'}
+            class:ae_btn_info={$events_loc.pres_mgmt.show_menu__session_search != 'help'}
             title="Help and information about the session search"
             >
             <span class="fas fa-question-circle m-1"></span>
@@ -135,7 +135,7 @@ export let lq__event_obj: any;
 
     <!-- BEGIN: The expanded menu area for information and options -->
     <div
-        class="flex flex-row flex-wrap gap-1 items-center justify-around w-full bg-blue-100 hover:bg-blue-200 border border-blue-200 hover:border-blue-400 p-2 rounded-md"
+        class:ae_container_module_options={$events_loc.pres_mgmt.show_menu__session_search == 'options'}
         class:hidden={$events_loc.pres_mgmt.show_menu__session_search != 'options'}
         >
 
@@ -149,8 +149,8 @@ export let lq__event_obj: any;
                     $events_loc.pres_mgmt.save_search_text = !$events_loc.pres_mgmt.save_search_text;
                 }}
                 class="btn btn-sm"
-                class:preset-tonal-success={$events_loc.pres_mgmt.save_search_text}
-                class:preset-tonal-warning={!$events_loc.pres_mgmt.save_search_text}
+                class:ae_btn_surface={$events_loc.pres_mgmt.save_search_text}
+                class:ae_btn_surface_outlined={!$events_loc.pres_mgmt.save_search_text}
                 title="Save the search text for this session search?"
                 >
                 {#if $events_loc.pres_mgmt.save_search_text}
@@ -180,7 +180,7 @@ export let lq__event_obj: any;
                 <select
                     id="qry_limit__presenters"
                     bind:value={$events_loc.pres_mgmt.qry_limit__presenters}
-                    class="select w-20 text-sm"
+                    class="select w-20 text-sm preset-tonal-surface"
                     >
                     <option value={25}>25</option>
                     <option value={50}>50</option>
@@ -203,7 +203,7 @@ export let lq__event_obj: any;
                 <select
                     id="qry_limit__sessions"
                     bind:value={$events_loc.pres_mgmt.qry_limit__sessions}
-                    class="select w-20 text-sm"
+                    class="select w-20 text-sm preset-tonal-surface"
                     >
                     <option value={25}>25</option>
                     <option value={50}>50</option>
@@ -226,7 +226,7 @@ export let lq__event_obj: any;
                 <select
                     id="qry_limit__files"
                     bind:value={$events_loc.pres_mgmt.qry_limit__files}
-                    class="select w-20 text-sm"
+                    class="select w-20 text-sm preset-tonal-surface"
                     >
                     <option value={25}>25</option>
                     <option value={50}>50</option>
@@ -251,7 +251,7 @@ export let lq__event_obj: any;
                         $events_loc.pres_mgmt.show__launcher_link_legacy = false;
                         $events_loc.pres_mgmt.show__location_link = false;
                     }}
-                    class="btn btn-sm preset-tonal-success border border-success-500"
+                    class="btn btn-sm ae_btn_surface"
                     >
                     <span class="fas fa-toggle-on m-1"></span>
                     Showing Links
@@ -264,7 +264,7 @@ export let lq__event_obj: any;
                         $events_loc.pres_mgmt.show__launcher_link_legacy = true;
                         $events_loc.pres_mgmt.show__location_link = true;
                     }}
-                    class="btn btn-sm preset-outlined-warning-500"
+                    class="btn btn-sm ae_btn_surface_outlined"
                     >
                     <span class="fas fa-toggle-off m-1"></span>
                     Show Links?
@@ -278,7 +278,7 @@ export let lq__event_obj: any;
                     on:click={() => {
                         $events_loc.pres_mgmt.hide__session_li_poc_field = true;
                     }}
-                    class="btn btn-sm preset-tonal-success border border-success-500"
+                    class="btn btn-sm ae_btn_surface"
                     >
                     <span class="fas fa-toggle-on m-1"></span>
                     Showing POC
@@ -289,10 +289,10 @@ export let lq__event_obj: any;
                     on:click={() => {
                         $events_loc.pres_mgmt.hide__session_li_poc_field = false;
                     }}
-                    class="btn btn-sm preset-outlined-warning-500"
+                    class="btn btn-sm ae_btn_surface_outlined"
                     >
                     <span class="fas fa-toggle-off m-1"></span>
-                    Show POC
+                    Show POC?
                 </button>
             {/if}
 
@@ -307,7 +307,7 @@ export let lq__event_obj: any;
                             $events_loc.pres_mgmt.qry_hidden = 'all';
                         }
                     }}
-                    class="btn btn-sm preset-tonal-success border border-success-500"
+                    class="btn btn-sm ae_btn_surface"
                     title="Hide sessions marked as hidden?"
                     >
                     <span class="fas fa-eye-slash m-1"></span>
@@ -323,7 +323,7 @@ export let lq__event_obj: any;
                             $events_loc.pres_mgmt.qry_hidden = 'all';
                         }
                     }}
-                    class="btn btn-sm preset-tonal-warning border border-warning-500"
+                    class="btn btn-sm ae_btn_surface_outlined"
                     title="Show all (hidden) sessions?"
                     >
                     <span class="fas fa-eye m-1"></span>
@@ -342,7 +342,7 @@ export let lq__event_obj: any;
                                 $events_loc.pres_mgmt.qry_enabled = 'all';
                             }
                         }}
-                        class="btn btn-sm preset-tonal-success border border-success-500"
+                        class="btn btn-sm ae_btn_surface"
                         title="Hide disabled sessions?"
                         >
                         <span class="fas fa-eye-slash m-1"></span>
@@ -358,7 +358,7 @@ export let lq__event_obj: any;
                                 $events_loc.pres_mgmt.qry_enabled = 'all';
                             }
                         }}
-                        class="btn btn-sm preset-tonal-warning border border-warning-500"
+                        class="btn btn-sm ae_btn_surface_outlined"
                         title="Show disabled sessions?"
                         >
                         <span class="fas fa-eye m-1"></span>
@@ -378,7 +378,7 @@ export let lq__event_obj: any;
         ds_type="html"
         for_type="event"
         for_id={$events_slct.event_id}
-        class_li="bg-yellow-100 border border-yellow-400 p-2 rounded-md max-w-xl"
+        class_li="ae_container_module_help"
         show_edit={false}
         show_edit_btn={true}
         hide={$events_loc.pres_mgmt.show_menu__session_search != 'help'}
@@ -390,7 +390,7 @@ export let lq__event_obj: any;
             on:click={() => {
                 $events_loc.pres_mgmt.show_menu__session_search = !$events_loc.pres_mgmt.show_menu__session_search;
             }}
-            class="btn btn-sm mx-1 preset-tonal-error border border-error-500 hover:preset-filled-error-500"
+            class="btn btn-sm mx-1 ae_btn_info_filled"
             class:hidden={!$events_loc.pres_mgmt.show_menu__session_search}
             title="Collapse the expanded menu"
             >
diff --git a/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte b/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte
index 4efbf3bc..aa81b7cc 100644
--- a/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte
+++ b/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte
@@ -22,10 +22,9 @@ let ae_triggers: key_val = {};
 </script>
 
 
-<!-- New standard page specific menu 2024-08-01 -->
+<!-- New standard page specific menu 2025-06-20 -->
 <div
     class="pres_mgmt__location_menu ae_container_module_menu"
-
     >
 
     <!-- BEGIN: The menu button options -->
@@ -225,7 +224,7 @@ let ae_triggers: key_val = {};
                     // $events_slct.exhibit_tracking_obj.hide = !$lq__event_location_obj?.hide;
                     ae_triggers.hide = true;
                 }}
-                class="btn btn-sm m-1 transition-all hover:transition-all *:hover:inline"
+                class="btn btn-sm m-1 *:hover:inline"
                 class:ae_btn_success_outlined={!$lq__event_location_obj?.hide}
                 class:ae_btn_warning={$lq__event_location_obj?.hide}
                 disabled={!$ae_loc.trusted_access}
diff --git a/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte b/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte
index 09501a89..e2abd3ae 100644
--- a/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte
+++ b/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte
@@ -143,7 +143,7 @@ if (!$events_loc.pres_mgmt?.location_kv) {
                 >
                 <!-- <strong class="text-sm">Name/Title:</strong> -->
                  <span class="fas fa-map-marker-alt m-1"></span>
-                "{event_location_obj?.name}"
+                "{event_location_obj?.name ?? '-- not set --'}"
             </Element_ae_crud>
             <!-- "{event_location_obj.name}" -->
             {#if event_location_obj?.code && !$events_loc.pres_mgmt?.hide__location_code}
diff --git a/src/routes/events/[event_id]/locations/locations_page_menu.svelte b/src/routes/events/[event_id]/locations/locations_page_menu.svelte
index 6a00f1b3..391c95a6 100644
--- a/src/routes/events/[event_id]/locations/locations_page_menu.svelte
+++ b/src/routes/events/[event_id]/locations/locations_page_menu.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    // export let data: any;
 export let log_lvl: number = 0;
 
 import type { key_val } from '$lib/ae_stores';
@@ -20,10 +21,9 @@ export let lq__event_obj: any;
 </script>
 
 
-<!-- New standard page specific menu 2024-08-01 -->
+<!-- New standard page specific menu 2025-06-20 -->
 <div
-    class="pres_mgmt__location_menu {ae_snip.classes__events_pres_mgmt_menu}"
-    class:border-gray-100={!$events_loc.pres_mgmt.show_menu__location}
+    class="pres_mgmt__location_menu ae_container_module_menu"
     >
 
     <!-- BEGIN: The menu button options -->
@@ -51,11 +51,11 @@ export let lq__event_obj: any;
                     $events_loc.pres_mgmt.show_menu__location = 'options';
                 }
             }}
-            class="{ae_snip.classes__events_pres_mgmt_menu__button}"
-            class:preset-filled-secondary-500={$events_loc.pres_mgmt.show_menu__location == 'options'}
-            class:preset-tonal-secondary={$events_loc.pres_mgmt.show_menu__location != 'options'}
+            class="btn btn-sm mx-1"
+            class:ae_btn_info_filled={$events_loc.pres_mgmt.show_menu__location == 'options'}
+            class:ae_btn_info={$events_loc.pres_mgmt.show_menu__location != 'options'}
             class:hidden={!$ae_loc.trusted_access}
-            title="Options for the location"
+            title="Options for the event locations"
             >
             <span class="fas fa-cog m-1"></span>
             {#if $events_loc.pres_mgmt.show_menu__location == 'options'}
@@ -75,9 +75,9 @@ export let lq__event_obj: any;
                     $events_loc.pres_mgmt.show_menu__location = 'help';
                 }
             }}
-            class="{ae_snip.classes__events_pres_mgmt_menu__button}"
-            class:preset-filled-secondary-500={$events_loc.pres_mgmt.show_menu__location == 'help'}
-            class:preset-tonal-secondary={$events_loc.pres_mgmt.show_menu__location != 'help'}
+            class="btn btn-sm mx-1"
+            class:ae_btn_info_filled={$events_loc.pres_mgmt.show_menu__location == 'help'}
+            class:ae_btn_info={$events_loc.pres_mgmt.show_menu__location != 'help'}
             title="Help and information about the location"
             >
             <span class="fas fa-question-circle m-1"></span>
@@ -91,15 +91,16 @@ export let lq__event_obj: any;
 
     </div> <!-- END: The menu button options -->
 
+
     <!-- BEGIN: The expanded menu area for information and options -->
     <div
-        class="flex flex-row items-center justify-around w-full bg-blue-100 hover:bg-blue-200 border border-blue-200 hover:border-blue-400 p-2 rounded-md transition-all duration-1000 ease-in-out overflow-hidden"
+        class="flex flex-row items-center justify-around w-full bg-blue-100 hover:bg-blue-200 border border-blue-200 hover:border-blue-400 p-2 rounded-md"
         class:hidden={$events_loc.pres_mgmt.show_menu__location != 'options'}
         >
 
-        <div
+        <!-- <div
             class="flex flex-row flex-wrap gap-1 items-center justify-center w-full"
-            >
+            > -->
             <!-- Show the session list or device list -->
             <button
                 type="button"
@@ -111,16 +112,16 @@ export let lq__event_obj: any;
                     }
                 }}
                 class="btn btn-sm"
-                class:ae_btn_success={$events_loc.pres_mgmt?.show_content__location_devices_sessions== 'sessions'}
-                class:ae_btn_warning={$events_loc.pres_mgmt?.show_content__location_devices_sessions== 'devices'}
-                title="Show the session list or device list."
+                class:ae_btn_surface={$events_loc.pres_mgmt?.show_content__location_devices_sessions== 'sessions'}
+                class:ae_btn_surface_outlined={$events_loc.pres_mgmt?.show_content__location_devices_sessions== 'devices'}
+                title="Show the session list or device list for each location."
                 >
                 {#if $events_loc.pres_mgmt.show_content__location_devices_sessions == 'sessions'}
                     <span class="fas fa-toggle-on m-1"></span>
-                    Session List
+                    Location's Session List
                 {:else}
                     <span class="fas fa-toggle-off m-1"></span>
-                    Device List
+                    Location's Device List
                 {/if}
             </button>
 
@@ -131,8 +132,8 @@ export let lq__event_obj: any;
                     $events_loc.pres_mgmt.hide__device_code = !$events_loc.pres_mgmt.hide__device_code;
                 }}
                 class="btn btn-sm"
-                class:ae_btn_success={!$events_loc.pres_mgmt?.hide__device_code}
-                class:ae_btn_warning={$events_loc.pres_mgmt?.hide__device_code}
+                class:ae_btn_surface={!$events_loc.pres_mgmt?.hide__device_code}
+                class:ae_btn_surface_outlined={$events_loc.pres_mgmt?.hide__device_code}
                 title="Show or hide the device code."
                 >
                 {#if !$events_loc.pres_mgmt.hide__device_code}
@@ -151,16 +152,16 @@ export let lq__event_obj: any;
                     $events_loc.pres_mgmt.hide__location_code = !$events_loc.pres_mgmt.hide__location_code;
                 }}
                 class="btn btn-sm"
-                class:ae_btn_success={!$events_loc.pres_mgmt?.hide__location_code}
-                class:ae_btn_warning={$events_loc.pres_mgmt?.hide__location_code}
+                class:ae_btn_surface={!$events_loc.pres_mgmt?.hide__location_code}
+                class:ae_btn_surface_outlined={$events_loc.pres_mgmt?.hide__location_code}
                 title="Show or hide the location code."
                 >
                 {#if !$events_loc.pres_mgmt.hide__location_code}
                     <span class="fas fa-toggle-on m-1"></span>
-                    Location Code
+                    Showing Location Code
                 {:else}
                     <span class="fas fa-toggle-off m-1"></span>
-                    Location Code
+                    Show Location Code?
                 {/if}
             </button>
 
@@ -171,19 +172,19 @@ export let lq__event_obj: any;
                     $events_loc.pres_mgmt.hide__session_code = !$events_loc.pres_mgmt.hide__session_code;
                 }}
                 class="btn btn-sm"
-                class:ae_btn_success={!$events_loc.pres_mgmt?.hide__session_code}
-                class:ae_btn_warning={$events_loc.pres_mgmt?.hide__session_code}
+                class:ae_btn_surface={!$events_loc.pres_mgmt?.hide__session_code}
+                class:ae_btn_surface_outlined={$events_loc.pres_mgmt?.hide__session_code}
                 title="Show or hide the session code."
                 >
                 {#if !$events_loc.pres_mgmt.hide__session_code}
                     <span class="fas fa-toggle-on m-1"></span>
-                    Session Code
+                    Showing Session Code
                 {:else}
                     <span class="fas fa-toggle-off m-1"></span>
-                    Session Code
+                    Show Session Code?
                 {/if}
             </button>
-        </div>
+        <!-- </div> -->
 
     </div> <!-- END: The expanded menu area for information and options -->
 
diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte
index 77dba3cb..1269cc3a 100644
--- a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte
+++ b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-export let data: any;
+// export let data: any;
+export let log_lvl: number = 0;
 
 import { goto } from '$app/navigation';
 
@@ -23,10 +24,9 @@ let ae_triggers: key_val = {};
 </script>
 
 
-<!-- New standard page specific menu 2024-08-01 -->
+<!-- New standard page specific menu 2025-06-20 -->
 <div
-    class="pres_mgmt__presenter_view_menu {ae_snip.classes__events_pres_mgmt_menu}"
-    class:border-gray-100={!$events_loc.pres_mgmt.show_menu__presenter}
+    class="pres_mgmt__presenter_view_menu ae_container_module_menu"
     >
 
     <!-- BEGIN: The menu button options -->
@@ -86,9 +86,9 @@ let ae_triggers: key_val = {};
                     $events_loc.pres_mgmt.show_menu__presenter = 'options';
                 }
             }}
-            class="{ae_snip.classes__events_pres_mgmt_menu__button}"
-            class:preset-filled-secondary-500={$events_loc.pres_mgmt.show_menu__presenter == 'options'}
-            class:preset-tonal-secondary={$events_loc.pres_mgmt.show_menu__presenter != 'options'}
+            class="btn btn-sm mx-1"
+            class:ae_btn_info_filled={$events_loc.pres_mgmt.show_menu__presenter == 'options'}
+            class:ae_btn_info={$events_loc.pres_mgmt.show_menu__presenter != 'options'}
             class:hidden={!$ae_loc.trusted_access}
             title="Options for the presenter"
             >
@@ -112,21 +112,16 @@ let ae_triggers: key_val = {};
                     $events_loc.pres_mgmt.show_menu__presenter = 'help';
                 }
             }}
-            class="{ae_snip.classes__events_pres_mgmt_menu__button} transition-all hover:transition-all *:hover:inline"
-            class:preset-filled-secondary-500={$events_loc.pres_mgmt.show_menu__presenter == 'help'}
-            class:preset-tonal-secondary={$events_loc.pres_mgmt.show_menu__presenter != 'help'}
+            class="btn btn-sm mx-1"
+            class:ae_btn_info_filled={$events_loc.pres_mgmt.show_menu__presenter == 'help'}
+            class:ae_btn_info={$events_loc.pres_mgmt.show_menu__presenter != 'help'}
             title="Help and information about the presenter"
             >
             <span class="fas fa-question-circle m-1"></span>
             {#if $events_loc.pres_mgmt.show_menu__presenter == 'help'}
                 Hide Help?
             {:else}
-                <!-- <span class="hidden m-0 p-0">
-                Show
-                </span> -->
-                <!-- <span class="m-0 p-0"> -->
                 Help?
-                <!-- </span> -->
             {/if}
         </button>
     </span>
@@ -151,11 +146,13 @@ let ae_triggers: key_val = {};
                         $events_sess.pres_mgmt.show_modal__presenter_agree = $lq__event_presenter_obj?.event_presenter_id_random;
                     }
                 }
-                class="{ae_snip.classes__events_pres_mgmt_menu__button} hover:preset-filled-success-500"
+                class="btn btn-sm mx-1 font-bold ae_btn_success_filled"
                 title="Agreed to terms and conditions"
                 >
                 <span class="fas fa-check text-green-500 px-1" title="Agreed to terms and conditions"></span>
+                <span>
                 Agreed
+                </span>
             </button>
         {:else}
             <button
@@ -172,11 +169,13 @@ let ae_triggers: key_val = {};
                         $events_sess.pres_mgmt.show_modal__presenter_agree = $lq__event_presenter_obj?.event_presenter_id_random;
                     }
                 }
-                class="{ae_snip.classes__events_pres_mgmt_menu__button_warning_special} hover:preset-filled-warning-500"
+                class="btn btn-sm mx-1 font-bold ae_btn_warning_filled"
                 title="View terms and conditions"
                 >
                 <span class="fas fa-times bg-red-500 text-white px-1 mx-1" title="Not agreed to terms and conditions"></span>
+                <span>
                 Not yet agreed
+                </span>
             </button>
         {/if}
     </span>
@@ -211,7 +210,7 @@ let ae_triggers: key_val = {};
                 events_func.load_ae_obj_id__event_presenter({
                     api_cfg: $ae_api,
                     event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random,
-                    log_lvl: 1
+                    log_lvl: log_lvl
                 });
             }}
             >
@@ -222,9 +221,9 @@ let ae_triggers: key_val = {};
 
                     ae_triggers.priority = true;
                 }}
-                class="btn btn-sm m-1 transition-all hover:transition-all *:hover:inline"
-                class:preset-outlined-surface-500={!$lq__event_presenter_obj?.priority}
-                class:preset-tonal-success={$lq__event_presenter_obj?.priority}
+                class="btn btn-sm m-1 *:hover:inline"
+                class:ae_btn_surface_outlined={!$lq__event_presenter_obj?.priority}
+                class:ae_btn_success={$lq__event_presenter_obj?.priority}
                 >
                 {#if $lq__event_presenter_obj?.priority}
                     <span class="fas fa-star m-1"></span>
@@ -264,7 +263,7 @@ let ae_triggers: key_val = {};
                 events_func.load_ae_obj_id__event_presenter({
                     api_cfg: $ae_api,
                     event_presenter_id: $lq__event_presenter_obj?.event_presenter_id_random,
-                    log_lvl: 1
+                    log_lvl: log_lvl
                 });
             }}
             >
@@ -276,9 +275,9 @@ let ae_triggers: key_val = {};
                     // $events_slct.exhibit_tracking_obj.hide = !$lq__event_presenter_obj?.hide;
                     ae_triggers.hide = true;
                 }}
-                class="btn btn-sm m-1 transition-all hover:transition-all *:hover:inline"
-                class:preset-tonal-success={!$lq__event_presenter_obj?.hide}
-                class:preset-outlined-warning-500={$lq__event_presenter_obj?.hide}
+                class="btn btn-sm m-1 *:hover:inline"
+                class:ae_btn_success_outlined={!$lq__event_presenter_obj?.hide}
+                class:ae_btn_warning={$lq__event_presenter_obj?.hide}
                 disabled={!$ae_loc.trusted_access}
                 >
                 {#if $lq__event_presenter_obj?.hide}
@@ -333,8 +332,8 @@ let ae_triggers: key_val = {};
                     ae_triggers.enable = true;
                 }}
                 class="btn btn-sm"
-                class:preset-tonal-success={$lq__event_presenter_obj?.enable}
-                class:preset-outlined-warning-500={!$lq__event_presenter_obj?.enable}
+                class:ae_btn_success_outlined={$lq__event_presenter_obj?.enable}
+                class:ae_btn_error={!$lq__event_presenter_obj?.enable}
                 disabled={!$ae_loc.manager_access}
                 >
                 {#if $lq__event_presenter_obj?.enable}
@@ -358,20 +357,21 @@ let ae_triggers: key_val = {};
         {#if $ae_loc.manager_access}
         <button
             on:click={() => {
-                if (!confirm('Are you sure you want to delete this speaker?')) {return false;}
+                if (!confirm('Are you sure you want to delete this presenter?')) {return false;}
+
                 events_func.delete_ae_obj_id__event_presenter({
                     api_cfg: $ae_api,
-                    event_presenter_id: $lq__event_presenter_obj.event_presenter_id_random,
+                    event_presenter_id: $lq__event_presenter_obj.event_presenter_id,
                     method: 'delete'
                 })
                 .then(function (delete_results) {
                     $events_slct.event_presenter_id = null;
                     $events_slct.event_presenter_obj = {};
 
-                    goto(`/events/${$lq__event_presenter_obj.event_id}/session/${$lq__event_presenter_obj.event_session_id_random}`);
+                    goto(`/events/${$lq__event_presenter_obj.event_id}/session/${$lq__event_presenter_obj.event_session_id}`);
                 });
             }}
-            class="btn btn-sm preset-tonal-error border border-error-500 mx-1" type="button"
+            class="btn btn-sm mx-1 ae_btn_error" type="button"
             title="Delete record permanently"
             >
             <span class="fas fa-minus-circle mx-1"></span>
@@ -380,20 +380,20 @@ let ae_triggers: key_val = {};
         {:else if $ae_loc.administrator_access}
         <button
             on:click={() => {
-                if (!confirm('Are you sure you want to remove (disable) this speaker?')) {return false;}
+                if (!confirm('Are you sure you want to remove (disable) this presenter?')) {return false;}
                 events_func.delete_ae_obj_id__event_presenter({
                     api_cfg: $ae_api,
-                    event_presenter_id: $lq__event_presenter_obj.event_presenter_id_random,
+                    event_presenter_id: $lq__event_presenter_obj.event_presenter_id,
                     method: 'disable'
                 })
                 .then(function (delete_results) {
                     $events_slct.event_presenter_id = null;
                     $events_slct.event_presenter_obj = {};
 
-                    goto(`/events/${$lq__event_presenter_obj.event_id}/session/${$lq__event_presenter_obj.event_session_id_random}`);
+                    goto(`/events/${$lq__event_presenter_obj.event_id}/session/${$lq__event_presenter_obj.event_session_id}`);
                 });
             }}
-            class="btn btn-sm preset-tonal-warning border border-warning-500 mx-1" type="button"
+            class="btn btn-sm mx-1 ae_btn_warning" type="button"
             title="Disable record"
             >
             <span class="fas fa-minus mx-1"></span>
@@ -407,7 +407,7 @@ let ae_triggers: key_val = {};
                     on:click={() => {
                         $events_loc.pres_mgmt.show_content__presenter_qr = false;
                     }}
-                    class="btn btn-sm preset-tonal-success border border-success-500"
+                    class="btn btn-sm ae_btn_surface"
                     >
                     <span class="fas fa-toggle-on m-1"></span>
                     Showing QR Code
@@ -417,7 +417,7 @@ let ae_triggers: key_val = {};
                     on:click={() => {
                         $events_loc.pres_mgmt.show_content__presenter_qr = true;
                     }}
-                    class="btn btn-sm preset-outlined-warning-500"
+                    class="btn btn-sm ae_btn_surface_outlined"
                     >
                     <span class="fas fa-toggle-off m-1"></span>
                     Show QR Code?
@@ -431,7 +431,7 @@ let ae_triggers: key_val = {};
                     on:click={() => {
                         $ae_loc.edit_mode = false;
                     }}
-                    class="btn btn-sm preset-tonal-success border border-success-500"
+                    class="btn btn-sm ae_btn_warning"
                     >
                     <!-- <span class="fas fa-toggle-on m-1"></span> -->
                     <span class="fas fa-edit m-1"></span>
@@ -442,7 +442,7 @@ let ae_triggers: key_val = {};
                     on:click={() => {
                         $ae_loc.edit_mode = true;
                     }}
-                    class="btn btn-sm preset-outlined-warning-500"
+                    class="btn btn-sm ae_btn_warning_outlined"
                     >
                     <span class="fas fa-toggle-off m-1"></span>
                     <!-- <span class="fas fa-edit m-1"></span> -->
@@ -459,8 +459,8 @@ let ae_triggers: key_val = {};
         ds_name="Default: Events - Pres Mgmt Presenter Page Help"
         ds_type="html"
         for_type="event"
-        for_id={$lq__event_presenter_obj?.event_id_random}
-        class_li="bg-yellow-100 border border-yellow-400 p-2 rounded-md max-w-xl"
+        for_id={$lq__event_presenter_obj?.event_id}
+        class_li="ae_container_module_help"
         show_edit={false}
         show_edit_btn={true}
         hide={$events_loc.pres_mgmt.show_menu__presenter != 'help'}
@@ -472,7 +472,7 @@ let ae_triggers: key_val = {};
             on:click={() => {
                 $events_loc.pres_mgmt.show_menu__presenter = !$events_loc.pres_mgmt.show_menu__presenter;
             }}
-            class="btn btn-sm mx-1 preset-tonal-error border border-error-500 hover:preset-filled-error-500"
+            class="btn btn-sm mx-1 ae_btn_info_filled"
             class:hidden={!$events_loc.pres_mgmt.show_menu__presenter}
             title="Collapse the expanded menu"
             >
diff --git a/src/routes/events/[event_id]/reports/+page.svelte b/src/routes/events/[event_id]/reports/+page.svelte
index 6486bc80..00ad9ac7 100644
--- a/src/routes/events/[event_id]/reports/+page.svelte
+++ b/src/routes/events/[event_id]/reports/+page.svelte
@@ -76,6 +76,13 @@ if ($events_loc.pres_mgmt.show_report == 'sessions_poc_agree') {
         lk_search_str: '',
         log_lvl: log_lvl,
     });
+} else if ($events_loc.pres_mgmt.show_report == 'presenters_overview') {
+    // NOT READY YET: Show overview of presenters' statuses. (for LCI)
+    handle_search__event_presenter({
+        ft_search_str: '',
+        lk_search_str: '',
+        log_lvl: log_lvl,
+    });
 } else if ($events_loc.pres_mgmt.show_report == 'recent_files') {
     handle_qry__event_file({
         created_on_offset: $events_loc.pres_mgmt.qry__files_offset_seconds ?? 0,
@@ -703,9 +710,9 @@ async function handle_qry__event_session(
                 });
                 $events_loc.pres_mgmt.show_report = 'presenters_overview';
             }}
-            class:hidden={$lq__event_obj?.mod_pres_mgmt_json?.hide__report_kv.presenter_overview}
+            class:hidden={$lq__event_obj?.mod_pres_mgmt_json?.hide__report_kv.presenter_overview || !$ae_loc.administrator_access}
             class="btn btn-sm preset-tonal-success border border-success-500 hover:preset-filled-success-500 transition-all m-1"
-            title="NOT READY YET: Show overview of presenters' statuses."
+            title="NOT READY YET: Show overview of presenters' statuses. (for LCI)"
             >
             {#if $events_sess.pres_mgmt?.show_report == 'presenters_overview' &&  $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt?.show_report] == 'loading'}
                 <span class="fas fa-spinner fa-spin"></span>
@@ -896,7 +903,7 @@ async function handle_qry__event_session(
         Sort by:
 
     <select
-        class="select text-sm w-36 preset-tonal-warning hover:preset-tonal-warning border border-warning-500 transition-all m-1"
+        class="inline-block select text-sm w-36 m-1 ae_btn_info"
         bind:value={$events_loc.pres_mgmt.qry__presenter_sort}
         on:change={
             (event) => {
@@ -1004,7 +1011,7 @@ async function handle_qry__event_session(
     Recent File Uploads
     <!-- Show list of offsets: 10 minutes, 1 hours, 6 hours, 12 hours, 24 hours, 48 hours, 72 hours -->
     <select
-        class="select text-sm w-28 preset-tonal-warning hover:preset-tonal-warning border border-warning-500 transition-all m-1"
+        class="inline-block select text-sm w-28 m-1 ae_btn_info"
         bind:value={$events_loc.pres_mgmt.qry__files_offset_seconds}
         on:change={
             () => {
@@ -1065,7 +1072,7 @@ async function handle_qry__event_session(
 <h3 class="h4 text-center">
     Large File Uploads
     <select
-        class="select text-sm w-28 preset-tonal-warning hover:preset-tonal-warning border border-warning-500 transition-all m-1"
+        class="inline-block select text-sm w-28 m-1 ae_btn_info"
         bind:value={$events_loc.pres_mgmt.qry__files_min_size}
         on:change={
             () => {
diff --git a/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte b/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte
index 14c0245c..e48410f7 100644
--- a/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte
@@ -2,6 +2,8 @@
 export let data: any;
 export let log_lvl: number = 0;
 
+import { goto } from '$app/navigation';
+
 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';
 import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
@@ -24,10 +26,9 @@ let ae_triggers: key_val = {};
 </script>
 
 
-<!-- New standard page specific menu 2024-08-01 -->
+<!-- New standard page specific menu 2025-06-20 -->
 <div
-    class="pres_mgmt__session_menu {ae_snip.classes__events_pres_mgmt_menu}"
-    class:border-gray-100={!$events_loc.pres_mgmt.show_menu__session}
+    class="pres_mgmt__session_menu ae_container_module_menu"
     >
 
     <!-- BEGIN: The menu button options -->
@@ -90,9 +91,9 @@ let ae_triggers: key_val = {};
                     $events_loc.pres_mgmt.show_menu__session = 'options';
                 }
             }}
-            class="{ae_snip.classes__events_pres_mgmt_menu__button}"
-            class:preset-filled-secondary-500={$events_loc.pres_mgmt.show_menu__session == 'options'}
-            class:preset-tonal-secondary={$events_loc.pres_mgmt.show_menu__session != 'options'}
+            class="btn btn-sm mx-1"
+            class:ae_btn_info_filled={$events_loc.pres_mgmt.show_menu__session == 'options'}
+            class:ae_btn_info={$events_loc.pres_mgmt.show_menu__session != 'options'}
             class:hidden={!$ae_loc.trusted_access}
             title="Options for the session"
             >
@@ -114,9 +115,9 @@ let ae_triggers: key_val = {};
                     $events_loc.pres_mgmt.show_menu__session = 'help';
                 }
             }}
-            class="{ae_snip.classes__events_pres_mgmt_menu__button}"
-            class:preset-filled-secondary-500={$events_loc.pres_mgmt.show_menu__session == 'help'}
-            class:preset-tonal-secondary={$events_loc.pres_mgmt.show_menu__session != 'help'}
+            class="btn btn-sm mx-1"
+            class:ae_btn_info_filled={$events_loc.pres_mgmt.show_menu__session == 'help'}
+            class:ae_btn_info={$events_loc.pres_mgmt.show_menu__session != 'help'}
             title="Help and information about the session"
             >
             <span class="fas fa-question-circle m-1"></span>
@@ -149,7 +150,7 @@ let ae_triggers: key_val = {};
 
     <!-- BEGIN: The expanded menu area for information and options -->
     <div
-        class="w-full bg-blue-100 hover:bg-blue-200 border border-blue-200 hover:border-blue-400 p-2 rounded-md"
+        class:ae_container_module_options={$events_loc.pres_mgmt.show_menu__session == 'options'}
         class:hidden={$events_loc.pres_mgmt.show_menu__session != 'options'}
         >
 
@@ -195,9 +196,9 @@ let ae_triggers: key_val = {};
                                 // $events_slct.exhibit_tracking_obj.hide_event_launcher = !$lq__event_session_obj?.hide_event_launcher;
                                 ae_triggers.hide_event_launcher = true;
                             }}
-                            class="btn btn-sm transition-all hover:transition-all *:hover:inline"
-                            class:border-success-500={!$lq__event_session_obj?.hide_event_launcher}
-                            class:preset-outlined-warning-500={$lq__event_session_obj?.hide_event_launcher}
+                            class="btn btn-sm m-1 *:hover:inline"
+                            class:ae_btn_surface_outlined={!$lq__event_session_obj?.hide_event_launcher}
+                            class:ae_btn_success={$lq__event_session_obj?.hide_event_launcher}
                             disabled={!$ae_loc.trusted_access}
                             >
                             {#if $lq__event_session_obj?.hide_event_launcher}
@@ -249,9 +250,9 @@ let ae_triggers: key_val = {};
                                 // $events_slct.exhibit_tracking_obj.priority = !$lq__event_session_obj?.priority;
                                 ae_triggers.priority = true;
                             }}
-                            class="btn btn-sm transition-all hover:transition-all *:hover:inline"
-                            class:preset-outlined-surface-500={!$lq__event_session_obj?.priority}
-                            class:border-success-500={$lq__event_session_obj?.priority}
+                            class="btn btn-sm *:hover:inline"
+                            class:ae_btn_surface_outlined={!$lq__event_session_obj?.priority}
+                            class:ae_btn_success={$lq__event_session_obj?.priority}
                             >
                             {#if $lq__event_session_obj?.priority}
                                 <span class="fas fa-star m-1"></span>
@@ -303,9 +304,9 @@ let ae_triggers: key_val = {};
                                 // $events_slct.exhibit_tracking_obj.hide = !$lq__event_session_obj?.hide;
                                 ae_triggers.hide = true;
                             }}
-                            class="btn btn-sm transition-all hover:transition-all *:hover:inline"
-                            class:border-success-500={!$lq__event_session_obj?.hide}
-                            class:preset-outlined-warning-500={$lq__event_session_obj?.hide}
+                            class="btn btn-sm *:hover:inline"
+                            class:ae_btn_success_outlined={!$lq__event_session_obj?.hide}
+                            class:ae_btn_warning={$lq__event_session_obj?.hide}
                             disabled={!$ae_loc.trusted_access}
                             >
                             {#if $lq__event_session_obj?.hide}
@@ -360,9 +361,9 @@ let ae_triggers: key_val = {};
                                 // $events_slct.exhibit_tracking_obj.hide = !$lq__event_session_obj?.hide;
                                 ae_triggers.enable = true;
                             }}
-                            class="btn btn-sm transition-all hover:transition-all"
-                            class:border-success-500={$lq__event_session_obj?.enable}
-                            class:preset-outlined-warning-500={!$lq__event_session_obj?.enable}
+                            class="btn btn-sm"
+                            class:ae_btn_success_outlined={$lq__event_session_obj?.enable}
+                            class:ae_btn_error={!$lq__event_session_obj?.enable}
                             disabled={!$ae_loc.manager_access}
                             >
                             {#if $lq__event_session_obj?.enable}
@@ -382,6 +383,54 @@ let ae_triggers: key_val = {};
 
                     <!-- Group -->
 
+
+                    {#if $ae_loc.manager_access}
+                    <button
+                        on:click={() => {
+                            if (!confirm('Are you sure you want to delete this session?')) {return false;}
+
+                            events_func.delete_ae_obj_id__event_session({
+                                api_cfg: $ae_api,
+                                event_session_id: $lq__event_session_obj.event_session_id,
+                                method: 'delete'
+                            })
+                            .then(function (delete_results) {
+                                $events_slct.event_session_id = null;
+                                $events_slct.event_session_obj = {};
+
+                                goto(`/events/${$lq__event_session_obj.event_id}/session/${$lq__event_session_obj.event_session_id}`);
+                            });
+                        }}
+                        class="btn btn-sm mx-1 ae_btn_error" type="button"
+                        title="Delete record permanently"
+                        >
+                        <span class="fas fa-minus-circle mx-1"></span>
+                        Delete
+                    </button>
+                    {:else if $ae_loc.administrator_access}
+                    <button
+                        on:click={() => {
+                            if (!confirm('Are you sure you want to remove (disable) this session? This is not common.')) {return false;}
+                            events_func.delete_ae_obj_id__event_session({
+                                api_cfg: $ae_api,
+                                event_session_id: $lq__event_session_obj.event_session_id,
+                                method: 'disable'
+                            })
+                            .then(function (delete_results) {
+                                $events_slct.event_session_id = null;
+                                $events_slct.event_session_obj = {};
+
+                                goto(`/events/${$lq__event_session_obj.event_id}`);
+                            });
+                        }}
+                        class="btn btn-sm mx-1 ae_btn_warning" type="button"
+                        title="Disable record"
+                        >
+                        <span class="fas fa-minus mx-1"></span>
+                        Delete
+                    </button>
+                    {/if}
+
                 </div>
 
             </div>
@@ -405,7 +454,7 @@ let ae_triggers: key_val = {};
         ds_type="html"
         for_type="event"
         for_id={$lq__event_session_obj?.event_id}
-        class_li="bg-yellow-100 border border-yellow-400 p-2 rounded-md max-w-xl"
+        class_li="ae_container_module_help"
         show_edit={false}
         show_edit_btn={true}
         hide={$events_loc.pres_mgmt.show_menu__session != 'help'}
@@ -417,7 +466,7 @@ let ae_triggers: key_val = {};
             on:click={() => {
                 $events_loc.pres_mgmt.show_menu__session = !$events_loc.pres_mgmt.show_menu__session;
             }}
-            class="btn btn-sm mx-1 preset-tonal-error border border-error-500 hover:preset-filled-error-500"
+            class="btn btn-sm mx-1 ae_btn_info_filled"
             class:hidden={!$events_loc.pres_mgmt.show_menu__session}
             title="Collapse the expanded menu"
             >
diff --git a/src/routes/events/ae_comp__events_menu_opts.svelte b/src/routes/events/ae_comp__events_menu_opts.svelte
index 1d05db77..7c14373d 100644
--- a/src/routes/events/ae_comp__events_menu_opts.svelte
+++ b/src/routes/events/ae_comp__events_menu_opts.svelte
@@ -6,6 +6,7 @@ export let hide: boolean = true;
 </script>
 
 
+<!-- New standard events module menu 2025-06-20 -->
 <div
     class="ae_comp__pres_mgmt_menu_opts w-full border-t border-gray-300 mt-1"
     class:hidden={hide}
@@ -37,7 +38,181 @@ export let hide: boolean = true;
         class:hidden={$events_loc.pres_mgmt.hide__menu_opts}
         >
 
-        <div class="flex flex-row flex-wrap gap-1 items-center justify-evenly">
+        {#if $ae_loc.authenticated_access}
+        <div
+            class="flex flex-col gap-1 items-end justify-center"
+            >
+            <span
+                class="flex flex-col gap-1 items-end justify-center"
+                >
+                <!-- Max presenters select options -->
+                <span
+                    class="flex flex-row gap-1 items-center justify-around w-full"
+                    >
+                    <label
+                        class="text-sm w-32 text-right"
+                        for="qry_limit__presenters">
+                        Max presenters:
+                    </label>
+                    <select
+                        id="qry_limit__presenters"
+                        bind:value={$events_loc.pres_mgmt.qry_limit__presenters}
+                        class="select w-20 text-sm preset-tonal-surface"
+                        >
+                        <option value={25}>25</option>
+                        <option value={50}>50</option>
+                        <option value={75}>75</option>
+                        <option value={100}>100</option>
+                        <option value={200}>200</option>
+                        <option value={500}>500</option>
+                    </select>
+                </span>
+
+                <!-- Max sessions select options -->
+                <span
+                    class="flex flex-row gap-1 items-center justify-around w-full"
+                    >
+                    <label
+                        class="text-sm w-32 text-right"
+                        for="qry_limit__sessions">
+                        Max sessions:
+                    </label>
+                    <select
+                        id="qry_limit__sessions"
+                        bind:value={$events_loc.pres_mgmt.qry_limit__sessions}
+                        class="select w-20 text-sm preset-tonal-surface"
+                        >
+                        <option value={25}>25</option>
+                        <option value={50}>50</option>
+                        <option value={75}>75</option>
+                        <option value={100}>100</option>
+                        <option value={200}>200</option>
+                        <option value={500}>500</option>
+                    </select>
+                </span>
+
+                <!-- Max files select options -->
+                <span
+                    class="flex flex-row gap-1 items-center justify-around w-full"
+                    >
+                    <label
+                        class="text-sm w-32 text-right"
+                        for="qry_limit__files">
+                        Max files:
+                    </label>
+                    <select
+                        id="qry_limit__files"
+                        bind:value={$events_loc.pres_mgmt.qry_limit__files}
+                        class="select w-20 text-sm preset-tonal-surface"
+                        >
+                        <option value={25}>25</option>
+                        <option value={50}>50</option>
+                        <option value={75}>75</option>
+                        <option value={100}>100</option>
+                        <option value={200}>200</option>
+                        <option value={500}>500</option>
+                    </select>
+                </span>
+            </span>
+
+            <span
+                class="flex flex-col gap-1 items-end justify-center"
+                >
+                <!-- Button to toggle between the showing hidden sessions -->
+                {#if $events_loc.pres_mgmt.qry_hidden == 'all'}
+                    <button
+                        type="button"
+                        on:click={() => {
+                            if ($events_loc.pres_mgmt.qry_hidden == 'all') {
+                                $events_loc.pres_mgmt.qry_hidden = 'not_hidden';
+                            } else {
+                                $events_loc.pres_mgmt.qry_hidden = 'all';
+                            }
+                        }}
+                        class="btn btn-sm w-full ae_btn_surface"
+                        title="Hide sessions marked as hidden?"
+                        >
+                        <span class="fas fa-eye-slash m-1"></span>
+                        Hide?
+                    </button>
+                {:else}
+                    <button
+                        type="button"
+                        on:click={() => {
+                            if ($events_loc.pres_mgmt.qry_hidden == 'all') {
+                                $events_loc.pres_mgmt.qry_hidden = 'not_hidden';
+                            } else {
+                                $events_loc.pres_mgmt.qry_hidden = 'all';
+                            }
+                        }}
+                        class="btn btn-sm w-full ae_btn_surface_outlined"
+                        title="Show all (hidden) sessions?"
+                        >
+                        <span class="fas fa-eye m-1"></span>
+                        Show All (Hidden)?
+                    </button>
+                {/if}
+
+                {#if $ae_loc.manager_access}
+                    {#if $events_loc.pres_mgmt.qry_enabled == 'all'}
+                        <button
+                            type="button"
+                            on:click={() => {
+                                if ($events_loc.pres_mgmt.qry_enabled == 'all') {
+                                    $events_loc.pres_mgmt.qry_enabled = 'enabled';
+                                } else {
+                                    $events_loc.pres_mgmt.qry_enabled = 'all';
+                                }
+                            }}
+                            class="btn btn-sm w-full ae_btn_surface"
+                            title="Hide disabled sessions?"
+                            >
+                            <span class="fas fa-eye-slash m-1"></span>
+                            Hide Disabled?
+                        </button>
+                    {:else}
+                        <button
+                            type="button"
+                            on:click={() => {
+                                if ($events_loc.pres_mgmt.qry_enabled == 'all') {
+                                    $events_loc.pres_mgmt.qry_enabled = 'enabled';
+                                } else {
+                                    $events_loc.pres_mgmt.qry_enabled = 'all';
+                                }
+                            }}
+                            class="btn btn-sm w-full ae_btn_surface_outlined"
+                            title="Show disabled sessions?"
+                            >
+                            <span class="fas fa-eye m-1"></span>
+                            Show All (Disabled)?
+                        </button>
+                    {/if}
+                {/if}
+            </span>
+        </div>
+        {/if}
+
+        <div class="flex flex-col flex-wrap gap-1 items-center justify-evenly">
+
+            <button
+                type="button"
+                on:click={() => {
+                    $events_loc.pres_mgmt.save_search_text = !$events_loc.pres_mgmt.save_search_text;
+                }}
+                class="btn btn-sm w-full"
+                class:ae_btn_surface={$events_loc.pres_mgmt.save_search_text}
+                class:ae_btn_surface_outlined={!$events_loc.pres_mgmt.save_search_text}
+                title="Save the search text for this session search?"
+                >
+                {#if $events_loc.pres_mgmt.save_search_text}
+                    <span class="fas fa-toggle-on m-1"></span>
+                    Save Search Text
+                {:else}
+                    <span class="fas fa-toggle-off m-1"></span>
+                    <!-- <span class="fas fa-save m-1"></span> -->
+                    Save Search Text?
+                {/if}
+            </button>
 
             {#if $ae_loc.authenticated_access}
                 {#if !$events_loc.pres_mgmt.hide__session_msg}
@@ -46,7 +221,7 @@ export let hide: boolean = true;
                         on:click={() => {
                             $events_loc.pres_mgmt.hide__session_msg = true;
                         }}
-                        class="btn btn-sm preset-tonal-success border border-success-500"
+                        class="btn btn-sm w-full ae_btn_surface"
                         >
                         <span class="fas fa-toggle-on m-1"></span>
                         Showing Session Message
@@ -57,7 +232,7 @@ export let hide: boolean = true;
                         on:click={() => {
                             $events_loc.pres_mgmt.hide__session_msg = false;
                         }}
-                        class="btn btn-sm preset-outlined-warning-500"
+                        class="btn btn-sm w-full ae_btn_surface_outlined"
                         >
                         <span class="fas fa-toggle-off m-1"></span>
                         Show Session Message?
@@ -66,13 +241,14 @@ export let hide: boolean = true;
             {/if}
 
             {#if $ae_loc.authenticated_access}
+                <!-- Show or hide the session code -->
                 {#if !$events_loc.pres_mgmt.hide__session_code}
                     <button
                         type="button"
                         on:click={() => {
                             $events_loc.pres_mgmt.hide__session_code = true;
                         }}
-                        class="btn btn-sm preset-tonal-success border border-success-500"
+                        class="btn btn-sm w-full ae_btn_surface"
                         >
                         <span class="fas fa-toggle-on m-1"></span>
                         Showing Session Code
@@ -83,22 +259,29 @@ export let hide: boolean = true;
                         on:click={() => {
                             $events_loc.pres_mgmt.hide__session_code = false;
                         }}
-                        class="btn btn-sm preset-outlined-warning-500"
+                        class="btn btn-sm w-full ae_btn_surface_outlined"
                         >
                         <span class="fas fa-toggle-off m-1"></span>
                         Show Session Code?
                     </button>
                 {/if}
             {/if}
+        </div>
 
+        <div
+            class="flex flex-col gap-1 items-center justify-center"
+            >
             {#if $ae_loc.trusted_access}
+                <div
+                    class="flex flex-col gap-1 items-center justify-center"
+                    >
                 {#if $events_loc.pres_mgmt.show__copy_access_link}
                     <button
                         type="button"
                         on:click={() => {
                             $events_loc.pres_mgmt.show__copy_access_link = false;
                         }}
-                        class="btn btn-sm preset-tonal-success border border-success-500"
+                        class="btn btn-sm w-full ae_btn_surface"
                         >
                         <span class="fas fa-toggle-on m-1"></span>
                         Showing Copy Access Link
@@ -109,22 +292,20 @@ export let hide: boolean = true;
                         on:click={() => {
                             $events_loc.pres_mgmt.show__copy_access_link = true;
                         }}
-                        class="btn btn-sm preset-outlined-warning-500"
+                        class="btn btn-sm w-full ae_btn_surface_outlined"
                         >
                         <span class="fas fa-toggle-off m-1"></span>
                         Show Copy Access Link?
                     </button>
                 {/if}
-            {/if}
 
-            {#if $ae_loc.trusted_access}
                 {#if $events_loc.pres_mgmt.show__email_access_link}
                     <button
                         type="button"
                         on:click={() => {
                             $events_loc.pres_mgmt.show__email_access_link = false;
                         }}
-                        class="btn btn-sm preset-tonal-success border border-success-500"
+                        class="btn btn-sm w-full ae_btn_surface"
                         >
                         <span class="fas fa-toggle-on m-1"></span>
                         Showing Email Access Link
@@ -135,23 +316,27 @@ export let hide: boolean = true;
                         on:click={() => {
                             $events_loc.pres_mgmt.show__email_access_link = true;
                         }}
-                        class="btn btn-sm preset-outlined-warning-500"
+                        class="btn btn-sm w-full ae_btn_surface_outlined"
                         >
                         <span class="fas fa-toggle-off m-1"></span>
                         Show Email Access Link?
                     </button>
                 {/if}
+                </div>
             {/if}
 
-
             {#if $ae_loc.authenticated_access}
+                <div
+                    class="flex flex-col gap-1 items-end justify-center"
+                    >
                 {#if $events_loc.pres_mgmt.show_content__session_qr}
                     <button
                         type="button"
                         on:click={() => {
                             $events_loc.pres_mgmt.show_content__session_qr = false;
                         }}
-                        class="btn btn-sm preset-tonal-success border border-success-500"
+                        class="btn btn-sm w-full ae_btn_surface"
+                        title="Showing Session QR Code"
                         >
                         <span class="fas fa-toggle-on m-1"></span>
                         Showing Session QR Code
@@ -162,15 +347,128 @@ export let hide: boolean = true;
                         on:click={() => {
                             $events_loc.pres_mgmt.show_content__session_qr = true;
                         }}
-                        class="btn btn-sm preset-outlined-warning-500"
+                        class="btn btn-sm w-full ae_btn_surface_outlined"
+                        title="Show Session QR Code"
                         >
                         <span class="fas fa-toggle-off m-1"></span>
                         Show Session QR Code?
                     </button>
                 {/if}
+
+                {#if $events_loc.pres_mgmt.show_content__presenter_qr}
+                    <button
+                        on:click={() => {
+                            $events_loc.pres_mgmt.show_content__presenter_qr = false;
+                        }}
+                        class="btn btn-sm w-full ae_btn_surface"
+                        title="Showing Presenter QR Code"
+                        >
+                        <span class="fas fa-toggle-on m-1"></span>
+                        Showing Presenter QR Code
+                    </button>
+                {:else}
+                    <button
+                        on:click={() => {
+                            $events_loc.pres_mgmt.show_content__presenter_qr = true;
+                        }}
+                        class="btn btn-sm w-full ae_btn_surface_outlined"
+                        title="Show Presenter QR Code"
+                        >
+                        <span class="fas fa-toggle-off m-1"></span>
+                        Show Presenter QR Code?
+                    </button>
+                {/if}
+                </div>
+            {/if}
+        </div>
+
+
+
+        {#if $ae_loc.authenticated_access}
+        <div class="flex flex-col gap-1 items-center justify-center">
+
+            <!-- Button to toggle between showing and not showing the launcher and location links -->
+            {#if $events_loc.pres_mgmt.show__launcher_link || $events_loc.pres_mgmt.show__location_link}
+                <button
+                    disabled={!$ae_loc.administrator_access}
+                    on:click={() => {
+                        $events_loc.pres_mgmt.show__launcher_link = false;
+                        $events_loc.pres_mgmt.show__launcher_link_legacy = false;
+                        $events_loc.pres_mgmt.show__location_link = false;
+                    }}
+                    class="btn btn-sm w-full ae_btn_surface"
+                    >
+                    <span class="fas fa-toggle-on m-1"></span>
+                    Showing Launcher Links
+                </button>
+            {:else}
+                <button
+                    disabled={!$ae_loc.administrator_access}
+                    on:click={() => {
+                        $events_loc.pres_mgmt.show__launcher_link = true;
+                        $events_loc.pres_mgmt.show__launcher_link_legacy = true;
+                        $events_loc.pres_mgmt.show__location_link = true;
+                    }}
+                    class="btn btn-sm w-full ae_btn_surface_outlined"
+                    >
+                    <span class="fas fa-toggle-off m-1"></span>
+                    Show Launcher Links?
+                </button>
             {/if}
 
+            <!-- These are related to more content showing in lists. -->
+            <span class="flex flex-col flex-wrap gap-1 items-center justify-evenly">
+                {#if $events_loc.pres_mgmt.show_content__session_files}
+                    <button
+                        disabled={!$ae_loc.manager_access}
+                        on:click={() => {
+                            $events_loc.pres_mgmt.show_content__session_files = false;
+                        }}
+                        class="btn btn-sm w-full ae_btn_surface"
+                        >
+                        <span class="fas fa-toggle-on m-1"></span>
+                        Showing Files
+                    </button>
+                {:else}
+                    <button
+                        disabled={!$ae_loc.manager_access}
+                        on:click={() => {
+                            $events_loc.pres_mgmt.show_content__session_files = true;
+                        }}
+                        class="btn btn-sm w-full ae_btn_surface_outlined"
+                        >
+                        <span class="fas fa-toggle-off m-1"></span>
+                        Show Files?
+                    </button>
+                {/if}
+
+                {#if $events_loc.pres_mgmt.show_content__session_presentations}
+                    <button
+                        disabled={!$ae_loc.manager_access}
+                        on:click={() => {
+                            $events_loc.pres_mgmt.show_content__session_presentations = false;
+                        }}
+                        class="btn btn-sm w-full ae_btn_surface"
+                        >
+                        <span class="fas fa-toggle-on m-1"></span>
+                        Showing Presentations
+                    </button>
+                {:else}
+                    <button
+                        disabled={!$ae_loc.manager_access}
+                        on:click={() => {
+                            $events_loc.pres_mgmt.show_content__session_presentations = true;
+                        }}
+                        class="btn btn-sm w-full ae_btn_surface_outlined"
+                        >
+                        <span class="fas fa-toggle-off m-1"></span>
+                        Show Presentations?
+                    </button>
+                {/if}
+            </span>
         </div>
+        {/if}
+
 
         <div class="flex flex-row gap-1 items-center justify-evenly">
         {#if $ae_loc.trusted_access}
@@ -180,7 +478,7 @@ export let hide: boolean = true;
                     on:click={() => {
                         $ae_loc.edit_mode = false;
                     }}
-                    class="btn btn-sm preset-tonal-success border border-success-500"
+                    class="btn btn-sm w-full ae_btn_warning"
                     >
                     <!-- <span class="fas fa-toggle-on m-1"></span> -->
                     <span class="fas fa-edit m-1"></span>
@@ -192,7 +490,7 @@ export let hide: boolean = true;
                     on:click={() => {
                         $ae_loc.edit_mode = true;
                     }}
-                    class="btn btn-sm preset-outlined-warning-500"
+                    class="btn btn-sm w-full ae_btn_warning_outlined"
                     >
                     <span class="fas fa-toggle-off m-1"></span>
                     <!-- <span class="fas fa-edit m-1"></span> -->