diff --git a/src/routes/events_pres_mgmt/presenter/[slug]/+page.svelte b/src/routes/events_pres_mgmt/presenter/[slug]/+page.svelte
index 6910c860..978fa2c3 100644
--- a/src/routes/events_pres_mgmt/presenter/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/presenter/[slug]/+page.svelte
@@ -104,6 +104,27 @@ if (!$ae_loc.authenticated_access && $events_loc.pres_mgmt.show_content__present
         lq__event_presentation_obj={lq__event_presentation_obj}
         />
 
+    <h3 class="h5">
+        <span class="fas fa-upload m-1"></span>
+        Manage and Upload Session Files:
+    </h3>
+
+    <!-- Yes... This is a duplicate of what is shown when they press "Presenter Files" button. It can be cleaned up later. -->
+    <Comp_event_files_upload
+        link_to_type="event_presenter"
+        link_to_id={$lq__event_presenter_obj.event_presenter_id}
+        />
+
+    <div class="overflow-x-auto w-max max-w-full">
+        <Element_manage_event_file_li
+            link_to_type={'event_presenter'}
+            link_to_id={$lq__event_presenter_obj?.event_presenter_id_random}
+            allow_basic={$events_loc.auth__kv.presenter[$lq__event_presenter_obj.event_presenter_id_random] || $events_loc.auth__kv.presenter[$lq__event_presenter_obj?.event_presenter_id_random]}
+            allow_moderator={$events_loc.auth__kv.presenter[$lq__event_presenter_obj.event_presenter_id_random]}
+            container_class_li={''}
+            />
+    </div>
+
 {:else if $events_loc.pres_mgmt.show_content__presenter_view == 'manage_files' && $ae_loc.authenticated_access}
     <div>
         <h3 class="h5">
diff --git a/src/routes/events_pres_mgmt/presenter_view.svelte b/src/routes/events_pres_mgmt/presenter_view.svelte
index b99621b2..f1b50e49 100644
--- a/src/routes/events_pres_mgmt/presenter_view.svelte
+++ b/src/routes/events_pres_mgmt/presenter_view.svelte
@@ -521,7 +521,7 @@ $: if ($lq__event_presenter_obj) {
             </span>
         </Element_ae_crud>
 
-        {#if $lq__event_presenter_obj.external_id != $lq__event_presenter_obj.person_external_id}
+        {#if $lq__event_presenter_obj.person_id_random && $lq__event_presenter_obj.external_id != $lq__event_presenter_obj.person_external_id}
             <div>
             <Element_ae_crud
                 api_cfg={$ae_api}
@@ -702,18 +702,18 @@ $: if ($lq__event_presenter_obj) {
             }}
             >
             <span class="fas fa-envelope"></span>
-            <span class="font-bold">
             {#if $lq__event_presenter_obj.email}
+                <span class="font-bold">
                 <a
                     href="mailto:{$lq__event_presenter_obj.email}"
                     class="text-blue-500 hover:text-blue-800 hover:underline"
                     title="Presenter's email address"
                     >{$lq__event_presenter_obj.email}</a>
+                </span>
             {:else}
                 email
                 {@html ae_snip.html__not_set}
             {/if}
-            </span>
         </Element_ae_crud>
 
         {#if $lq__event_presenter_obj.person_primary_email && $lq__event_presenter_obj.person_primary_email != $lq__event_presenter_obj.email}
@@ -745,17 +745,19 @@ $: if ($lq__event_presenter_obj) {
                 >
                 <span class="fas fa-star-of-life"></span>
                 <span class="fas fa-envelope"></span>
-                <span class="font-bold">
                 {#if $lq__event_presenter_obj.person_primary_email}
+                    <span class="font-bold">
                     <a
                         href="mailto:{$lq__event_presenter_obj.person_primary_email}"
                         class="text-blue-500 hover:text-blue-800 hover:underline"
                         title="Person's primary email address"
                         >{$lq__event_presenter_obj.person_primary_email}</a>
+                    </span>
                 {:else}
                     email
                     {@html ae_snip.html__not_set}
                 {/if}
+
                 <!-- <a
                     href="mailto:{$lq__event_presenter_obj.person_primary_email}"
                     class="text-blue-500 underline hover:text-blue-800"
@@ -839,12 +841,17 @@ $: if ($lq__event_presenter_obj) {
             }}
             >
             <span class="fas fa-building"></span>
-            <span class="font-bold">
-            {@html $lq__event_presenter_obj.affiliations ?? 'affiliations'+ae_snip.html__not_set}
-            </span>
+            {#if $lq__event_presenter_obj.affiliations && $lq__event_presenter_obj.affiliations.length}
+                <span class="font-bold">
+                {$lq__event_presenter_obj.affiliations}
+                </span>
+            {:else}
+                affiliations
+                {@html ae_snip.html__not_set}
+            {/if}
         </Element_ae_crud>
 
-        {#if $lq__event_presenter_obj.person_affiliations != $lq__event_presenter_obj.affiliations}
+        {#if $lq__event_presenter_obj.person_id_random && $lq__event_presenter_obj.person_affiliations != $lq__event_presenter_obj.affiliations}
             <div>
             <Element_ae_crud
                 api_cfg={$ae_api}
@@ -948,12 +955,17 @@ $: if ($lq__event_presenter_obj) {
             }}
             >
             <span class="fas fa-user-tag"></span>
-            <span class="font-bold">
-            {@html $lq__event_presenter_obj.professional_title && $lq__event_presenter_obj.professional_title.length ? $lq__event_presenter_obj.professional_title : 'professional title'+ae_snip.html__not_set}
-            </span>
+            {#if $lq__event_presenter_obj.professional_title && $lq__event_presenter_obj.professional_title.length}
+                <span class="font-bold">
+                {$lq__event_presenter_obj.professional_title}
+                </span>
+            {:else}
+                professional title
+                {@html ae_snip.html__not_set}
+            {/if}
         </Element_ae_crud>
 
-        {#if $lq__event_presenter_obj.person_professional_title != $lq__event_presenter_obj.professional_title}
+        {#if $lq__event_presenter_obj.person_id_random && $lq__event_presenter_obj.person_professional_title != $lq__event_presenter_obj.professional_title}
             <div>
             <Element_ae_crud
                 api_cfg={$ae_api}
@@ -1419,10 +1431,10 @@ $: if ($lq__event_presenter_obj) {
     </li>
 </ul>
 
-<h3 class="h4">
+<!-- <h3 class="h4">
     Upload File(s):
-</h3>
-<button
+</h3> -->
+<!-- <button
     type="button"
     on:click={() => {
         console.log('*** Refresh button clicked ***');
@@ -1435,12 +1447,12 @@ $: if ($lq__event_presenter_obj) {
     >
     <span class="fas fa-sync-alt mx-1"></span>
     Refresh Files
-</button>
+</button> -->
 
-<div class="text-sm text-center bg-orange-100 rounded-md p-2">
+<!-- <div class="text-sm text-center bg-orange-100 rounded-md p-2">
 WARNING: The file upload and management is a work in progress. You can upload and delete files, but not yet rename them. You may need to refresh the page if your changes are not showing up.
-</div>
-<form
+</div> -->
+<!-- <form
     on:submit|preventDefault={handle_submit_form_files}
     class:hidden={!$ae_loc.trusted_access && !$events_loc.auth__kv.presenter[$lq__event_presenter_obj?.event_presenter_id_random] && !$events_loc.auth__kv.session[$lq__event_presenter_obj.event_session_id_random]}
     class="modal-form {$ae_loc.hub.classes__form} flex flex-col space-y-2 items-center w-full"
@@ -1498,20 +1510,15 @@ WARNING: The file upload and management is a work in progress. You can upload an
         <span class="text-sm">
         Upload:
         </span>
-        <!-- <span class="fas fa-save mx-1"></span> -->
         <span class="grow">
             File
         </span>
     {/await}
-    <!-- <span class="fas fa-save mx-1"></span>
-    <span class="grow">
-    Upload File
-    </span> -->
 </button>
 
-</form>
+</form> -->
 
-<div class="overflow-x-auto w-max max-w-full">
+<!-- <div class="overflow-x-auto w-max max-w-full">
 <Element_manage_event_file_li
     link_to_type={'event_presenter'}
     link_to_id={$lq__event_presenter_obj?.event_presenter_id_random}
@@ -1519,7 +1526,7 @@ WARNING: The file upload and management is a work in progress. You can upload an
     allow_moderator={$events_loc.auth__kv.session[$lq__event_presenter_obj.event_session_id_random]}
     container_class_li={''}
     />
-</div>
+</div> -->
 
 </section>