diff --git a/src/routes/events_pres_mgmt/session/[slug]/+page.svelte b/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
index 1cdad9c8..09918562 100644
--- a/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
@@ -1395,7 +1395,8 @@ $: if ($slct_trigger == 'load__event_presenter_obj_li') {
         </Element_ae_crud>
         </div>
 
-        {#await event_presentation_obj.event_presentation_id_random}
+        <!-- Show presenters for this presentation -->
+        <!-- {#await event_presentation_obj.event_presentation_id_random}
             <span class="fas fa-spinner fa-spin mx-1"></span>
         {:then result}
         <Comp_event_presenter_obj_li
@@ -1403,236 +1404,18 @@ $: if ($slct_trigger == 'load__event_presenter_obj_li') {
             link_to_id={result}
             >
         </Comp_event_presenter_obj_li>
-        {/await}
+        {/await} -->
 
-
-
-        <!-- Show presenters for this presentation -->
-        <!-- This needs to be moved to a separate component. -->
-        {#if $lq__event_presenter_obj_li?.length > 0 && 1==2}
-            <strong class="text-sm">Presenters:
-                <!-- ({$lq__event_presenter_obj_li?.length}) -->
-            </strong>
-            <ul
-                class="space-y-2 px-4"
+        {#if event_presentation_obj.event_presentation_id_random}
+            <Comp_event_presenter_obj_li
+                link_to_type={'event_presentation'}
+                link_to_id={event_presentation_obj.event_presentation_id_random}
                 >
-            {#each $lq__event_presenter_obj_li as event_presenter_obj}
-                <!-- This is a hack. I can not get the LiveQuery to work with specific presentation IDs. It only works with the session ID. I need to figure out how to get the presenters for the specific presentation. -->
-                {#if event_presenter_obj.event_presentation_id_random == event_presentation_obj.event_presentation_id_random}
-                <li>
-                    <button
-                        type="button"
-                        disabled={!($ae_loc.trusted_access || $events_loc.auth__kv.session[$events_slct.event_session_id]) && (!$events_loc.auth__kv.presenter[event_presenter_obj.event_presenter_id_random] || !event_presenter_obj.agree)}
-                        on:click={
-                            () => {
-                                console.log('View presenter details');
-
-                                $events_slct.event_presentation_id = event_presentation_obj.event_presentation_id_random;
-                                $events_slct.event_presentation_obj = event_presentation_obj;
-
-                                $events_slct.event_presenter_id = event_presenter_obj.event_presenter_id_random;
-                                $events_slct.event_presenter_obj = event_presenter_obj;
-
-                                $events_sess.pres_mgmt.show_content__presenter_start = event_presenter_obj.event_presenter_id_random;
-                            }
-                        }
-                        class="btn btn-md variant-ghost-primary hover:variant-filled-primary font-bold min-w-64"
-                        title="Person ID: {event_presenter_obj.person_id_random}; Email: {event_presenter_obj.email}"
-                    >
-                            <span class="fas fa-user mx-1"></span>
-                            <span class="text-center grow">
-                            {event_presenter_obj.full_name}
-                            </span>
-                    </button>
-
-
-
-                    {#if $ae_loc.trusted_access || !$events_loc.auth__person?.id }
-                    <button
-                        type="button"
-                        on:click={() => {
-                            console.log('Email the access link');
-                            if (!event_presenter_obj.email) {
-                                alert('No email address found for this presenter.');
-                                return;
-                            }
-                            if (confirm(`This will send the sign in email to ${event_presenter_obj.email}`)) {
-                                console.log('Send the email to the presenter.');
-                            } else {
-                                console.log('Cancelled sending the email.');
-                                return false;
-                            }
-
-                            send_init_confirm_email(
-                                {
-                                    to_email: event_presenter_obj.email,
-                                    to_name: event_presenter_obj?.full_name?? '-- not set --',
-                                    person_id: event_presenter_obj?.person_id_random?? '-- not set --',
-                                    person_passcode: event_presenter_obj.person_passcode?? '-- not set --',
-                                    presentation_id: event_presentation_obj.event_presentation_id_random,
-                                    presenter_id: event_presenter_obj.event_presenter_id_random,
-                                    presentation_name: event_presentation_obj.name,
-                                }
-                            );
-                        }}
-                        class="btn btn-md variant-ghost-primary hover:variant-filled-primary"
-                        title="Email the access link to the presenter"
-                        >
-                        <span class="fas fa-envelope mx-1"></span>
-                        Email Access Link
-                    </button>
-                    {/if}
-
-
-                    {#if event_presenter_obj.agree}
-                        <!-- {#if $ae_loc.trusted_access || $events_loc.auth__kv.presenter[event_presenter_obj.event_presenter_id_random]} -->
-                        <button
-                            type="button"
-                            disabled={!$ae_loc.trusted_access && !$events_loc.auth__kv.presenter[event_presenter_obj.event_presenter_id_random]}
-                            on:click={
-                                () => {
-                                    console.log('View terms and conditions');
-                                    $events_slct.event_presentation_id = event_presentation_obj.event_presentation_id_random;
-                                    $events_slct.event_presentation_obj = event_presentation_obj;
-
-                                    $events_slct.event_presenter_id = event_presenter_obj.event_presenter_id_random;
-                                    $events_slct.event_presenter_obj = event_presenter_obj;
-
-                                    $events_sess.pres_mgmt.show_content__agree_text = event_presenter_obj.event_presenter_id_random;
-                                }
-                            }
-                            class="btn btn-md variant-ghost-success hover:variant-filled-success"
-                            title="Agreed to terms and conditions"
-                            >
-                            <span class="fas fa-check text-green-500 px-1" title="Agreed to terms and conditions"></span>
-                            Agreed
-                        </button>
-                    {:else}
-                        <button
-                            type="button"
-                            disabled={!$ae_loc.trusted_access && !$events_loc.auth__kv.presenter[event_presenter_obj.event_presenter_id_random]}
-                            on:click={
-                                () => {
-                                    console.log('View terms and conditions');
-                                    $events_slct.event_presentation_id = event_presentation_obj.event_presentation_id_random;
-                                    $events_slct.event_presentation_obj = event_presentation_obj;
-
-                                    $events_slct.event_presenter_id = event_presenter_obj.event_presenter_id_random;
-                                    $events_slct.event_presenter_obj = event_presenter_obj;
-
-                                    $events_sess.pres_mgmt.show_content__agree_text = event_presenter_obj.event_presenter_id_random;
-                                }
-                            }
-                            class="btn btn-md variant-ghost-warning hover:variant-filled-warning"
-                            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>
-                            Not yet agreed
-                        </button>
-                    {/if}
-
-
-
-                    {#if $ae_loc.trusted_access}
-                        <!-- <span class="fas fa-envelope"></span>
-                        <a
-                            href="mailto:{event_presenter_obj.email}"
-                            class="text-blue-500"
-                            >{event_presenter_obj.email}</a> -->
-
-
-                        {#if event_presenter_obj.file_count}
-                            <span>
-                            <span class="fas fa-file mx-1"></span>
-                            {event_presenter_obj.file_count ? `(${event_presenter_obj.file_count}x files)` : '(0 files)'}
-                            </span>
-                        {/if}
-
-                        <!-- {#if event_presenter_obj.person_passcode}
-                            <span>
-                            <span class="fas fa-user-secret"></span>
-                            Passcode: {event_presenter_obj.person_passcode}
-                            </span>
-                        {/if} -->
-
-                        <!-- {#if event_presenter_obj.passcode}
-                            <span class="bg-red-100 p-1 rounded-md">
-                            <span class="fas fa-key"></span>
-                            Passcode: {event_presenter_obj.passcode}
-                            </span>
-                        {/if} -->
-                    {/if}
-
-
-                    <!-- A button to copy the access link to the clipboard. -->
-                    <!-- Example: /events_pres_mgmt/session/Wh8UnJlbIA0?person_id=fV1dl_IJ0yY&person_pass=abc123 -->
-                    <!-- {#if $ae_loc.trusted_access}
-                    <button
-                        type="button"
-                        class="btn btn-sm variant-soft-primary"
-
-                        use:clipboard={encodeURI(`${data.url.origin}/events_pres_mgmt/session/${$events_slct.event_session_id}?person_id=${event_presenter_obj.person_id_random}&person_pass=${event_presenter_obj.person_passcode}&presentation_id=${event_presentation_obj.event_presentation_id_random}&presenter_id=${event_presenter_obj.event_presenter_id_random}`)}
-                        >
-                        <span class="fas fa-copy mx-1"></span>
-                        Copy Access Link
-                    </button>
-                    {/if} -->
-
-                    <div class="float-right space-2 flex flex-row items-center">
-                        {#if $ae_loc.administrator_access && !event_presenter_obj.person_id_random}
-                        <button
-                            type="button"
-                            on:click={async () => {
-                                console.log('Add Person');
-
-                                let person_data = {
-                                    account_id_random: $slct.account_id,
-                                    // user_id_random: user_obj.user_id_random,
-                                    given_name: 'New',
-                                    family_name: 'Presenter',
-                                    primary_email: 'test+newpres@oneskyit.com',
-                                    code: 'new_presenter',
-                                    // Random number between 100000 and 999999
-                                    passcode: Math.floor(Math.random() * 900000) + 100000,
-                                    enable: true,
-                                }
-
-                                let new_person_obj = await core_func.handle_create_ae_obj__person({
-                                    api_cfg: $ae_api,
-                                    // user_id: $ae_loc.user_id,
-                                    data_kv: person_data,
-                                    log_lvl: 1,
-                                })
-
-                                console.log('new_person_obj:', new_person_obj);
-
-                                // We then need to update the event_presenter with the new person_id.
-                                events_func.handle_update_ae_obj__event_presenter({
-                                    api_cfg: $ae_api,
-                                    event_presenter_id: event_presenter_obj.event_presenter_id_random,
-                                    data_kv: {person_id_random: new_person_obj.person_id_random},
-                                    log_lvl: 1,
-                                })
-                            }}
-                            class="btn btn-sm variant-soft-warning hover:variant-filled-warning"
-                            >
-                            <span class="fas fa-plus mx-1"></span>
-                            Add Person
-                        </button>
-                        {/if}
-                    </div>
-
-                </li>
-                {/if}
-            {/each}
-            </ul>
-        {:else}
-            <!-- <p>OLD: No presenters found...!</p> -->
-            <!-- {$events_slct.event_presentation_id} -->
-            <!-- {$lq__event_presentation_obj} -->
-            <!-- {$lq__event_presenter_obj_li?.length} -->
+            </Comp_event_presenter_obj_li>
         {/if}
 
+
+        <!-- Show files for this presentation -->
         <Element_manage_event_file_li
             link_to_type={'event_presentation'}
             link_to_id={event_presentation_obj.event_presentation_id_random}