diff --git a/src/app.css b/src/app.css
index 49038ce6..0694e23f 100644
--- a/src/app.css
+++ b/src/app.css
@@ -269,6 +269,11 @@ html.trusted_access #appShell {
     backdrop-filter: blur(16px);
 } */
 
+/*
+* - tonal buttons - use these for most buttons
+* - filled buttons - use these for buttons that need to stand out
+* - outlined buttons - use these for buttons that need to be less prominent (sort of like TW v3 ghost)
+*/
 
 /* Buttons default to the tonal presets */
 /* Buttons based on Skeleton Tailwind preset classes */
diff --git a/src/lib/ae_events_stores.ts b/src/lib/ae_events_stores.ts
index 35b7ad38..4bfecce5 100644
--- a/src/lib/ae_events_stores.ts
+++ b/src/lib/ae_events_stores.ts
@@ -227,6 +227,9 @@ let events_local_data_struct: key_val = {
         save_search_text: true,
         saved_search__session: null,
 
+        require__presenter_agree: false,
+        require__session_agree: false,
+
         // show_content__agree_text: false,
         show_content__event_view: null,
         show__launcher_link: false,
diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte
index 5a945c09..c5a53497 100644
--- a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte
+++ b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte
@@ -434,7 +434,7 @@ let lq__auth__event_presenter_obj = $derived(liveQuery(async () => {
 
 <!-- Main modal -->
 <Modal
-    title="Presenter's Profile"
+    title="{$lq__event_presenter_obj?.full_name} Presenter Consent and Release and Terms and Conditions"
     bind:open={$events_sess.pres_mgmt.show_modal__presenter_agree}
     autoclose={false}
     class="bg-white dark:bg-gray-800 text-gray-800 dark:text-gray-200 rounded-lg border-gray-200 dark:border-gray-700 divide-gray-200 dark:divide-gray-700 shadow-md relative flex flex-col mx-auto w-full divide-y"
@@ -449,8 +449,8 @@ let lq__auth__event_presenter_obj = $derived(liveQuery(async () => {
 
             <button
                 onclick={() => {
-                $events_sess.pres_mgmt.show_modal__presenter_agree = false;
-            }}
+                    $events_sess.pres_mgmt.show_modal__presenter_agree = false;
+                }}
                 class="btn btn-sm preset-tonal-warning hover:preset-tonal-warning border border-warning-500"
                 >
                 <span class="fas fa-times m-1"></span>
diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
index e39e60bc..1e0661dc 100644
--- a/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
+++ b/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
@@ -137,10 +137,32 @@ async function handle_update__event_presenter({
 
 {#if $lq__event_presenter_obj}
 <h2 class="h3">
-    Presenter Agreement for:<br>
-    <strong>{$lq__event_presenter_obj.full_name} ({$lq__event_presenter_obj.email})</strong>
+    <span class="text-base">Presenter Agreement for:</span><br>
+    <strong>{$lq__event_presenter_obj?.full_name}
+        {#if $lq__event_presenter_obj?.person_primary_email}
+            ({$lq__event_presenter_obj?.person_primary_email ?? '-- not set --'})
+        {/if}
+    </strong>
 </h2>
 
+{#if !$lq__event_presenter_obj?.agree}
+    <div
+        class="text-center text-red-500"
+        >
+        <div
+            class="text-red-500"
+            >
+            <span class="fas fa-times text-red-500 m-1"></span>
+            Not Yet Agreed
+        </div>
+        <div
+            class="bg-red-100 p-4 border border-red-200 rounded-md"
+            >
+            Waiting for agreement to the Guest Speaker Consent and Release and Terms and Conditions before you can move on. Please review and mark as agreed below.
+        </div>
+    </div>
+{/if}
+
 <div class="bg-gray-100 p-4 border border-gray-200 rounded-md space-y-4">
 <Element_data_store
     ds_code="event_presenter_agree_text"
diff --git a/src/routes/events/[event_id]/session/[session_id]/+page.svelte b/src/routes/events/[event_id]/session/[session_id]/+page.svelte
index 9b5744b8..a5125511 100644
--- a/src/routes/events/[event_id]/session/[session_id]/+page.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/+page.svelte
@@ -379,7 +379,7 @@ onMount(() => {
 
 <!-- Main modal -->
 <Modal
-    title="Presenter's Profile"
+    title="{$lq__event_presenter_obj?.full_name} Presenter Consent and Release and Terms and Conditions"
     bind:open={$events_sess.pres_mgmt.show_modal__presenter_agree}
     autoclose={false}
     class="bg-white dark:bg-gray-800 text-gray-800 dark:text-gray-200 rounded-lg border-gray-200 dark:border-gray-700 divide-gray-200 dark:divide-gray-700 shadow-md relative flex flex-col mx-auto w-full divide-y"
@@ -389,7 +389,8 @@ onMount(() => {
         lq__event_presenter_obj={lq__event_presenter_obj}
         />
 
-    <footer class="flex justify-end gap-4">
+    <!-- <footer class="flex justify-end gap-4"> -->
+    {#snippet footer()}
         <div class="text-center w-full">
 
             <button
@@ -402,6 +403,7 @@ onMount(() => {
                 Close
             </button>
         </div>
-    </footer>
+    {/snippet}
+    <!-- </footer> -->
 
 </Modal>
diff --git a/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte b/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
index b0a3df31..7f09187a 100644
--- a/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
@@ -122,6 +122,15 @@ async function handle_submit_form(event) {
 
 
 {#if $lq__event_session_obj}
+<h2 class="h3">
+    <span class="text-base">{$events_loc.pres_mgmt?.label__session_poc_name} Agreement for:</span><br>
+    <strong>{$lq__event_session_obj?.poc_person_full_name}
+        {#if $lq__event_session_obj?.poc_person_primary_email}
+            ({$lq__event_session_obj?.poc_person_primary_email ?? '-- not set --'})
+        {/if}
+    </strong>
+</h2>
+
 {#if !$lq__event_session_obj?.poc_agree}
     <div
         class="text-center text-red-500"
diff --git a/src/routes/events/[event_id]/session/[session_id]/session_view.svelte b/src/routes/events/[event_id]/session/[session_id]/session_view.svelte
index eede6276..04ad7843 100644
--- a/src/routes/events/[event_id]/session/[session_id]/session_view.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/session_view.svelte
@@ -181,6 +181,7 @@ let clipboard_success = $state(false);
     class="space-y-2 px-4"
     >
     <li>
+        {#if $ae_loc.trusted_access && $ae_loc.edit_mode}
         <Element_ae_crud
             api_cfg={$ae_api}
             object_type={'event_session'}
@@ -209,6 +210,7 @@ let clipboard_success = $state(false);
             >
             <strong class="text-sm">Name/title:</strong> {$lq__event_session_obj.name}
         </Element_ae_crud>
+        {/if}
 
         {#if $ae_loc.edit_mode}
         <Element_ae_crud
@@ -516,7 +518,6 @@ let clipboard_success = $state(false);
                         />
 
                 {#snippet footer()}
-
                     <div class="text-center w-full">
                         <button
                             type="button"
@@ -530,7 +531,6 @@ let clipboard_success = $state(false);
                             Close
                         </button>
                     </div>
-
                 {/snippet}
 
             </Modal>
@@ -559,6 +559,7 @@ let clipboard_success = $state(false);
                 title="{$events_loc.pres_mgmt?.label__session_poc_name}'s Consent and Release and Terms and Conditions"
                 bind:open={$events_sess.pres_mgmt.show_modal__session_poc_agree}
                 autoclose={false}
+                class="bg-white dark:bg-gray-800 text-gray-800 dark:text-gray-200 rounded-lg border-gray-200 dark:border-gray-700 divide-gray-200 dark:divide-gray-700 shadow-md relative flex flex-col mx-auto w-full divide-y"
                 >
 
                 <Comp_event_session_poc_form_agree
@@ -570,8 +571,8 @@ let clipboard_success = $state(false);
 
                         <button
                             onclick={() => {
-                            $events_sess.pres_mgmt.show_modal__session_poc_agree = false;
-                        }}
+                                $events_sess.pres_mgmt.show_modal__session_poc_agree = false;
+                            }}
                             class="btn btn-sm preset-tonal-warning hover:preset-tonal-warning border border-warning-500"
                             >
                             <span class="fas fa-times m-1"></span>