diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 331532ed..554363c4 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -203,7 +203,10 @@ $: if ($slct_trigger == 'set_access_code_li' && !$ae_loc.ds['hub__page__access_c
 <!-- regionFooter="flex justify-end space-x-2" -->
 
 <Modal components={modalRegistry}
-    regionFooter='flex justify-between space-x-2'
+    regionBackdrop=''
+    regionBody=''
+    regionHeader='modal-header card-header text-2xl font-bold'
+    regionFooter='modal-footer flex justify-between space-x-2'
     />
 
 
diff --git a/src/routes/events_speakers/+page.svelte b/src/routes/events_speakers/+page.svelte
index b30360b9..1e821258 100644
--- a/src/routes/events_speakers/+page.svelte
+++ b/src/routes/events_speakers/+page.svelte
@@ -27,7 +27,7 @@ import View_modal_event_presenter_obj from './10_view_modal__event_presenter_obj
 
 
 // Editing
-const modalComponentEditEventPresenterObj: ModalComponent = { ref: Edit_modal_event_presenter_obj, props: {container_class_li: 'w-full p-4 space-y-4 card', container_header_class_li: 'card-header text-2xl font-bold'} };
+const modalComponentEditEventPresenterObj: ModalComponent = { ref: Edit_modal_event_presenter_obj, props: {container_class_li: 'w-full p-4 space-y-4 card'} };
 
 const modal_edit__event_presenter_obj: ModalSettings = {
 	type: 'component',
@@ -39,7 +39,7 @@ const modal_edit__event_presenter_obj: ModalSettings = {
 };
 
 // Viewing
-const modalComponentViewEventPresenterObj: ModalComponent = { ref: View_modal_event_presenter_obj, props: {container_class_li: 'w-full p-4 space-y-4 card', container_header_class_li: 'card-header text-2xl font-bold'} };
+const modalComponentViewEventPresenterObj: ModalComponent = { ref: View_modal_event_presenter_obj, props: {container_class_li: 'w-full p-4 space-y-4 card'} };
 
 const modal_view__event_presenter_obj: ModalSettings = {
     type: 'component',
diff --git a/src/routes/events_speakers/10_edit_modal__event_presenter_obj.svelte b/src/routes/events_speakers/10_edit_modal__event_presenter_obj.svelte
index d8413b54..79dd8696 100644
--- a/src/routes/events_speakers/10_edit_modal__event_presenter_obj.svelte
+++ b/src/routes/events_speakers/10_edit_modal__event_presenter_obj.svelte
@@ -30,7 +30,6 @@ import { getModalStore, FileDropzone, TabGroup, Tab, TabAnchor } from '@skeleton
 /** Exposes parent props to this component. */
 export let parent: SvelteComponent;
 export let container_class_li = '';
-export let container_header_class_li = '';
 
 const modalStore = getModalStore();
 
@@ -42,7 +41,7 @@ import type { key_val } from '$lib/ae_stores';
 
 
 onMount(() => {
-    console.log('** Component Mounted: ** View Modal - Sponsorship Obj');
+    console.log('** Component Mounted: ** View Modal - Presenter Obj');
 
     if ($slct.event_presenter_id && $ae_loc.href_url) {
         $ae_loc.mod.events.presenter_link = `${$ae_loc.href_url}/load?ae_id=${$slct.event_presenter_id}`;
@@ -50,15 +49,6 @@ onMount(() => {
     }
 });
 
-// // Form Data
-// const formData = {
-//     name: 'Jane Doe',
-//     tel: '214-555-1234',
-//     email: 'jdoe@email.com'
-// };
-
-// const form_data = $slct.event_presenter_obj;
-
 // We've created a custom submit function to pass the response and close the modal.
 // function onFormSubmit(): void {
 //     if ($modalStore[0].response) $modalStore[0].response(formData);
@@ -66,39 +56,36 @@ onMount(() => {
 // }
 
 // Base Classes
-const cBase = 'card p-4 shadow-xl space-y-4 ae_modal_scrollfix';
+// const cBase = 'card p-4 shadow-xl space-y-4 ae_modal_scrollfix';
 // w-modal-wide
 // const cBase = 'bg-surface-100-800-token w-screen h-screen';
 // const cBase = 'card h-screen';
 // const cBase = 'card p-4 w-modal-wide h-screen shadow-xl space-y-4';
 
-const cHeader = 'text-2xl font-bold';
 const cForm = 'border border-surface-500 p-4 space-y-4 rounded-container-token';
 
 
-
 $ae_loc.mod.events.disable_submit__event_presenter_obj = false;
 let placeholder_li: key_val = {
     file_logo_primary: '-- No File Selected --',
     file_logo_secondary: '-- No File Selected --',
     file_media_promo_video: '-- No File Selected --',
 };
-let ae_promises_init: key_val = {};
 let ae_promises: key_val = {};
 // let ae_promises.api_create__event_presenter_obj: Promise<any>;
 
 if ($slct.event_presenter_id) {
-    console.log(`Sponsorship ID selected: ${$slct.event_presenter_id}`);
-    console.log(`Sponsorship object selected:`, $slct.event_presenter_obj);
+    console.log(`Presenter ID selected: ${$slct.event_presenter_id}`);
+    console.log(`Presenter object selected:`, $slct.event_presenter_obj);
 
     // $slct_trigger = 'load__event_presenter_obj';
 
     // $ae_loc.mod.events.presenter_link = `${$ae_loc.href_url}/load?ae_id=${$slct.event_presenter_id}`;
-    // console.log('Sponsorship link:', $ae_loc.mod.events.presenter_link);
+    // console.log('Presenter link:', $ae_loc.mod.events.presenter_link);
 } else {
     $slct.event_presenter_id = null;
     $slct.event_presenter_obj = {
-        sponsorship_cfg_id_random: $ae_loc.mod.events.sponsorship_cfg_id,
+        event_id_random: $ae_loc.mod.events.event_id,
 
         name: null,
         description: null,
@@ -121,7 +108,6 @@ if ($slct.event_presenter_id) {
 }
 
 
-
 $: if ($slct.event_presenter_obj) {
     // Logo related
     if ($slct.event_presenter_obj.logo_li_json) {
@@ -149,41 +135,41 @@ async function handle_submit_form(event) {
     let form_data = new FormData(event.target);
     console.log(form_data);
 
-    let sponsorship_di: key_val = ae_util.extract_prefixed_form_data({prefix: null, form_data: form_data, trim_values: true, bool_tf_str: true, log_lvl: 0});
-    console.log(sponsorship_di);
+    let event_presenter_di: key_val = ae_util.extract_prefixed_form_data({prefix: null, form_data: form_data, trim_values: true, bool_tf_str: true, log_lvl: 0});
+    console.log(event_presenter_di);
 
     // Data out
-    let sponsorship_do: key_val = {};
+    let event_presenter_do: key_val = {};
 
     if (!$slct.event_presenter_id) {
-        // sponsorship_do['account_id_random'] = $ae_loc.account_id;
-        sponsorship_do['sponsorship_cfg_id_random'] = $slct.sponsorship_cfg_id;
-        // sponsorship_do['enable'] = true;
+        // event_presenter_do['account_id_random'] = $ae_loc.account_id;
+        event_presenter_do['event_presenter_cfg_id_random'] = $slct.event_presenter_cfg_id;
+        // event_presenter_do['enable'] = true;
     }
 
-    if (sponsorship_di.poc_full_name || sponsorship_di.poc_email) {
-        sponsorship_do['poc_json'] = {
-            full_name: sponsorship_di.poc_full_name,
-            email: sponsorship_di.poc_email,
-            phone_mobile: sponsorship_di.poc_phone_mobile,
+    if (event_presenter_di.poc_full_name || event_presenter_di.poc_email) {
+        event_presenter_do['poc_json'] = {
+            full_name: event_presenter_di.poc_full_name,
+            email: event_presenter_di.poc_email,
+            phone_mobile: event_presenter_di.poc_phone_mobile,
         };
     }
 
-    if (sponsorship_di.organization_name) {
-        // Using the organization_name field to store the name of the sponsorship.
-        sponsorship_do['name'] = sponsorship_di.organization_name;
+    if (event_presenter_di.organization_name) {
+        // Using the organization_name field to store the name of the event_presenter.
+        event_presenter_do['name'] = event_presenter_di.organization_name;
     }
-    // if (sponsorship_di.description) {
-    //     sponsorship_do['description'] = sponsorship_di.description;
+    // if (event_presenter_di.description) {
+    //     event_presenter_do['description'] = event_presenter_di.description;
     // }
 
-    if (sponsorship_di.level_num) {
-        sponsorship_do['level_num'] = Number(sponsorship_di.level_num);
-        let level_num = sponsorship_do['level_num'];
+    if (event_presenter_di.level_num) {
+        event_presenter_do['level_num'] = Number(event_presenter_di.level_num);
+        let level_num = event_presenter_do['level_num'];
 
-        if ($slct.sponsorship_cfg_obj.level_li_json) {
-            let level_str = `${$slct.sponsorship_cfg_obj.level_li_json[level_num].name} - ${$slct.sponsorship_cfg_obj.level_li_json[level_num].amount}`;
-            sponsorship_do['level_str'] = level_str;
+        if ($slct.event_presenter_cfg_obj.level_li_json) {
+            let level_str = `${$slct.event_presenter_cfg_obj.level_li_json[level_num].name} - ${$slct.event_presenter_cfg_obj.level_li_json[level_num].amount}`;
+            event_presenter_do['level_str'] = level_str;
         }
     }
 
@@ -191,71 +177,71 @@ async function handle_submit_form(event) {
 
     let temp_guest_li = [];
     for (let i = 0; i < 20; i++) {
-        if (sponsorship_di[`guest_${i}_full_name`] || sponsorship_di[`guest_${i}_given_name`]) {
-            let guest_x_full_name = sponsorship_di[`guest_${i}_given_name`] + ' ' + sponsorship_di[`guest_${i}_family_name`];
+        if (event_presenter_di[`guest_${i}_full_name`] || event_presenter_di[`guest_${i}_given_name`]) {
+            let guest_x_full_name = event_presenter_di[`guest_${i}_given_name`] + ' ' + event_presenter_di[`guest_${i}_family_name`];
             temp_guest_li.push({
-                given_name: sponsorship_di[`guest_${i}_given_name`],
-                family_name: sponsorship_di[`guest_${i}_family_name`],
+                given_name: event_presenter_di[`guest_${i}_given_name`],
+                family_name: event_presenter_di[`guest_${i}_family_name`],
                 full_name: guest_x_full_name,
-                email: sponsorship_di[`guest_${i}_email`],
-                phone_mobile: sponsorship_di[`guest_${i}_phone_mobile`],
-                phone_home: sponsorship_di[`guest_${i}_phone_home`],
-                phone_office: sponsorship_di[`guest_${i}_phone_office`],
-                city: sponsorship_di[`guest_${i}_city`],
-                other_text: sponsorship_di[`guest_${i}_other_text`],
+                email: event_presenter_di[`guest_${i}_email`],
+                phone_mobile: event_presenter_di[`guest_${i}_phone_mobile`],
+                phone_home: event_presenter_di[`guest_${i}_phone_home`],
+                phone_office: event_presenter_di[`guest_${i}_phone_office`],
+                city: event_presenter_di[`guest_${i}_city`],
+                other_text: event_presenter_di[`guest_${i}_other_text`],
             });
         }
     }
     if (temp_guest_li.length) {
-        sponsorship_do['guest_li_json'] = temp_guest_li;
+        event_presenter_do['guest_li_json'] = temp_guest_li;
     }
 
-    if (sponsorship_di.social_media_facebook || sponsorship_di.social_media_twitter || sponsorship_di.social_media_instagram || sponsorship_di.social_media_linkedin) {
-        sponsorship_do['social_li_json'] = {
-            facebook: sponsorship_di.social_media_facebook,
-            twitter: sponsorship_di.social_media_twitter,
-            instagram: sponsorship_di.social_media_instagram,
-            linkedin: sponsorship_di.social_media_linkedin,
+    if (event_presenter_di.social_media_facebook || event_presenter_di.social_media_twitter || event_presenter_di.social_media_instagram || event_presenter_di.social_media_linkedin) {
+        event_presenter_do['social_li_json'] = {
+            facebook: event_presenter_di.social_media_facebook,
+            twitter: event_presenter_di.social_media_twitter,
+            instagram: event_presenter_di.social_media_instagram,
+            linkedin: event_presenter_di.social_media_linkedin,
         };
     }
 
-    sponsorship_do['hide'] = !!sponsorship_di.hide;
-    sponsorship_do['priority'] = !!sponsorship_di.priority;
-    if (sponsorship_di.sort) {
+    event_presenter_do['hide'] = !!event_presenter_di.hide;
+    event_presenter_do['priority'] = !!event_presenter_di.priority;
+    if (event_presenter_di.sort) {
         // Change this to a number type
-        sponsorship_do['sort'] = Number(sponsorship_di.sort);
+        event_presenter_do['sort'] = Number(event_presenter_di.sort);
     } else {
-        sponsorship_do['sort'] = null;
+        event_presenter_do['sort'] = null;
     }
-    if (sponsorship_di.group) {
-        sponsorship_do['group'] = sponsorship_di.group;
+    if (event_presenter_di.group) {
+        event_presenter_do['group'] = event_presenter_di.group;
     } else {
-        sponsorship_do['group'] = null;
+        event_presenter_do['group'] = null;
     }
-    if (sponsorship_do['enable']) {
-        sponsorship_do['enable'] = !!sponsorship_di.enable;
+    if (event_presenter_do['enable']) {
+        event_presenter_do['enable'] = !!event_presenter_di.enable;
     }
 
     // if (tinyMCE.get('notes')) {
-    //     sponsorship_do['notes'] = tinyMCE.get('notes').getContent();
+    //     event_presenter_do['notes'] = tinyMCE.get('notes').getContent();
     // } else {
-        sponsorship_do['notes'] = sponsorship_di.notes;
+        event_presenter_do['notes'] = event_presenter_di.notes;
     // }
 
-    console.log(sponsorship_do);
+    console.log(event_presenter_do);
 
     if (!$slct.event_presenter_id) {
-        ae_promises.create__sponsorship = await handle_create__sponsorship({
-            obj_type: 'sponsorship',
-            data: sponsorship_do
+        ae_promises.create__event_presenter = await handle_create__event_presenter({
+            obj_type: 'event_presenter',
+            data: event_presenter_do
         });
         $ae_loc.mod.events.disable_submit__event_presenter_obj = false;
 
     } else {
-        ae_promises.update__event_presenter_obj = await handle_update__sponsorship({
-            obj_type: 'sponsorship',
+        ae_promises.update__event_presenter_obj = await handle_update__event_presenter({
+            obj_type: 'event_presenter',
             obj_id: $slct.event_presenter_id,
-            data: sponsorship_do
+            data: event_presenter_do
         });
         $ae_loc.mod.events.disable_submit__event_presenter_obj = false;
     }
@@ -264,22 +250,22 @@ async function handle_submit_form(event) {
 async function handle_submit_form_files(event) {
     console.log('*** handle_submit_form() ***');
 
-    let sponsorship_do: key_val = {};
+    let event_presenter_do: key_val = {};
 
     if ($slct.event_presenter_obj.logo_li_json) {
         console.log('The logo_li_json was found.');
-        sponsorship_do.logo_li_json = $slct.event_presenter_obj.logo_li_json;
+        event_presenter_do.logo_li_json = $slct.event_presenter_obj.logo_li_json;
     } else {
         console.log('The logo_li_json was not found or is empty.');
-        sponsorship_do.logo_li_json = {};
+        event_presenter_do.logo_li_json = {};
     }
 
     if ($slct.event_presenter_obj.media_li_json) {
         console.log('The media_li_json was found.');
-        sponsorship_do.media_li_json = $slct.event_presenter_obj.media_li_json;
+        event_presenter_do.media_li_json = $slct.event_presenter_obj.media_li_json;
     } else {
         console.log('The media_li_json was not found or is empty.');
-        sponsorship_do.media_li_json = {};
+        event_presenter_do.media_li_json = {};
     }
 
     let hosted_file_results;
@@ -291,9 +277,9 @@ async function handle_submit_form_files(event) {
         hosted_file_results = await handle_input_upload_files(event.target.file_logo_primary.files);
 
         if (hosted_file_results) {
-            sponsorship_do.logo_li_json.primary = hosted_file_results[0];
-            console.log(sponsorship_do.logo_li_json);
-            placeholder_li.file_logo_primary = `<img src="/hosted_file/download/${sponsorship_do.logo_li_json.primary.hosted_file_id_random}">${sponsorship_do.logo_li_json.primary.filename}`;
+            event_presenter_do.logo_li_json.primary = hosted_file_results[0];
+            console.log(event_presenter_do.logo_li_json);
+            placeholder_li.file_logo_primary = `<img src="/hosted_file/download/${event_presenter_do.logo_li_json.primary.hosted_file_id_random}">${event_presenter_do.logo_li_json.primary.filename}`;
         }
     }
 
@@ -302,8 +288,8 @@ async function handle_submit_form_files(event) {
         hosted_file_results = await handle_input_upload_files(event.target.file_logo_secondary.files);
 
         if (hosted_file_results) {
-            sponsorship_do.logo_li_json.secondary = hosted_file_results[0];
-            console.log(sponsorship_do.logo_li_json);
+            event_presenter_do.logo_li_json.secondary = hosted_file_results[0];
+            console.log(event_presenter_do.logo_li_json);
         }
     }
 
@@ -312,21 +298,21 @@ async function handle_submit_form_files(event) {
         hosted_file_results = await handle_input_upload_files(event.target.file_media_promo_video.files);
 
         if (hosted_file_results) {
-            sponsorship_do.media_li_json.promo_video = hosted_file_results[0];
-            console.log(sponsorship_do.media_li_json);
+            event_presenter_do.media_li_json.promo_video = hosted_file_results[0];
+            console.log(event_presenter_do.media_li_json);
         }
     }
 
-    console.log(sponsorship_do);
+    console.log(event_presenter_do);
 
 
-    ae_promises.update__event_presenter_obj = await handle_update__sponsorship({
-        obj_type: 'sponsorship',
+    ae_promises.update__event_presenter_obj = await handle_update__event_presenter({
+        obj_type: 'event_presenter',
         obj_id: $slct.event_presenter_id,
-        data: sponsorship_do
+        data: event_presenter_do
     });
 
-    // let sponsorship_do: key_val = {
+    // let event_presenter_do: key_val = {
     //     logo_li_json: {
     //         primary: hosted_file_results[0],
     //     }
@@ -334,15 +320,15 @@ async function handle_submit_form_files(event) {
     // };
 
 
-    // sponsorship_do['logo_li_json'] = hosted_file_result;
+    // event_presenter_do['logo_li_json'] = hosted_file_result;
 
-    // sponsorship_do['notes'] = 'Update after file upload!';
+    // event_presenter_do['notes'] = 'Update after file upload!';
 
     // update_event_presenter_obj_promise = await api.update_ae_obj_id_crud({
     //     api_cfg: $ae_api,
-    //     obj_type: 'sponsorship',
+    //     obj_type: 'event_presenter',
     //     obj_id: $slct.event_presenter_id,
-    //     fields: sponsorship_do,
+    //     fields: event_presenter_do,
     //     key: $ae_api.api_crud_super_key,
     //     log_lvl: 1
     //     })
@@ -368,7 +354,7 @@ async function handle_input_upload_files(input_upload_files) {
     const form_data = new FormData();
 
     form_data.append('account_id', $ae_loc.account_id);
-    form_data.append('link_to_type', 'sponsorship');
+    form_data.append('link_to_type', 'event_presenter');
     form_data.append('link_to_id', $slct.event_presenter_id);
 
     for (let i = 0; i < input_upload_files.length; i++) {
@@ -394,11 +380,11 @@ async function handle_input_upload_files(input_upload_files) {
 }
 
 
-async function handle_create__sponsorship({
+async function handle_create__event_presenter({
     obj_type,
     data
     }) {
-    console.log('*** handle_create__sponsorship() ***');
+    console.log('*** handle_create__event_presenter() ***');
 
     ae_promises.api_create__event_presenter_obj = api.create_ae_obj_crud({
             api_cfg: $ae_api,
@@ -424,12 +410,12 @@ async function handle_create__sponsorship({
 }
 
 
-async function handle_update__sponsorship({
+async function handle_update__event_presenter({
     obj_type,
     obj_id,
     data
     }) {
-    console.log('*** handle_update__sponsorship() ***');
+    console.log('*** handle_update__event_presenter() ***');
 
     ae_promises.update__event_presenter_obj = api.update_ae_obj_id_crud({
             api_cfg: $ae_api,
@@ -459,8 +445,8 @@ async function handle_update__sponsorship({
 <!-- @component This is the Event Presenters modal edit form. -->
 
 {#if $modalStore[0]}
-<div class="svelte_component ae_edit_modal ae_obj__event_presenter {container_class_li}">
-    <header class={container_header_class_li}>
+<section class="svelte_component ae_edit_modal ae_obj__event_presenter {container_class_li}">
+    <header class="{parent.regionHeader}">
         {$modalStore[0].title ?? '-- No Title --'}
 
         {#await ae_promises.update__event_presenter_obj}
@@ -673,7 +659,7 @@ async function handle_update__sponsorship({
         disabled={($ae_loc.mod.events.disable_submit__event_presenter_obj)}
         on:click={() => {
             console.log('*** Save start button clicked ***');
-            // if (!confirm('Are you sure you want to save this sponsorship?')) {return false;}
+            // if (!confirm('Are you sure you want to save this event_presenter?')) {return false;}
             // handle_submit_form();
             // handle_submit_form;
         }}
@@ -752,7 +738,7 @@ async function handle_update__sponsorship({
         disabled={($ae_loc.mod.events.disable_submit__event_presenter_obj)}
         on:click={() => {
             console.log('*** Save button clicked ***');
-            // if (!confirm('Are you sure you want to save this sponsorship?')) {return false;}
+            // if (!confirm('Are you sure you want to save this event_presenter?')) {return false;}
             // handle_submit_form();
             // handle_submit_form;
         }}
@@ -783,7 +769,7 @@ async function handle_update__sponsorship({
             disabled={($ae_loc.mod.events.disable_submit__event_presenter_obj)}
             on:click={() => {
                 console.log('*** Save button clicked ***');
-                // if (!confirm('Are you sure you want to save this sponsorship?')) {return false;}
+                // if (!confirm('Are you sure you want to save this event_presenter?')) {return false;}
                 // handle_submit_form();
                 // handle_submit_form;
             }}
@@ -808,7 +794,7 @@ async function handle_update__sponsorship({
         >
     <!-- Ask for common social media URLs. (Twitter, Facebook, Instagram, etc) -->
     {#if $slct.event_presenter_obj.social_li_json}
-    <fieldset class="sponsorship__social_media">
+    <fieldset class="event_presenter__social_media">
         <legend class="legend">Social Media</legend>
 
         <label for="social_media_twitter" class="label">Twitter
@@ -826,7 +812,7 @@ async function handle_update__sponsorship({
     </fieldset>
     {/if}
 
-    <fieldset class="sponsorship__more_questions">
+    <fieldset class="event_presenter__more_questions">
         <legend class="legend">More Questions</legend>
 
         <label for="question" class="label">This is another question?
@@ -845,8 +831,8 @@ async function handle_update__sponsorship({
             </div>
         </label>
 
-        <label class="label ae_label sponsorship__comments">Comments
-            <textarea name="comments" id="comments" class="textarea ae_value sponsorship__comments tinymce_editor editor_basic" rows="5" cols="70" bind:value={$slct.event_presenter_obj.comments} placeholder="Any comments or questions about sponsorship."></textarea>
+        <label class="label ae_label event_presenter__comments">Comments
+            <textarea name="comments" id="comments" class="textarea ae_value event_presenter__comments tinymce_editor editor_basic" rows="5" cols="70" bind:value={$slct.event_presenter_obj.comments} placeholder="Any comments or questions about event_presenter."></textarea>
         </label>
     </fieldset>
 
@@ -856,7 +842,7 @@ async function handle_update__sponsorship({
         disabled={($ae_loc.mod.events.disable_submit__event_presenter_obj)}
         on:click={() => {
             console.log('*** Save more button clicked ***');
-            // if (!confirm('Are you sure you want to save this sponsorship?')) {return false;}
+            // if (!confirm('Are you sure you want to save this event_presenter?')) {return false;}
             // handle_submit_form();
             // handle_submit_form;
         }}
@@ -874,7 +860,7 @@ async function handle_update__sponsorship({
 
     <!-- </form> -->
 
-    <footer class="modal-footer {parent.regionFooter}">
+    <footer class="{parent.regionFooter}">
         {#if $slct.event_presenter_id}
         <!-- {#if $ae_loc.trusted_access} -->
         <button
@@ -904,7 +890,7 @@ async function handle_update__sponsorship({
                 disabled={($ae_loc.mod.events.disable_submit__event_presenter_obj)}
                 on:click={() => {
                     console.log('*** Save button clicked ***');
-                    if (!confirm('Are you sure you want to save this sponsorship?')) {return false;}
+                    if (!confirm('Are you sure you want to save this event_presenter?')) {return false;}
                     handle_submit_form();
                 }}
                 >
@@ -917,7 +903,7 @@ async function handle_update__sponsorship({
                 class="ae_btn btn_primary"
                 disabled={($ae_loc.mod.events.disable_submit__event_presenter_obj)}
                 on:click={() => {
-                    if (!confirm('Are you sure you want to create this sponsorship?')) {return false;}
+                    if (!confirm('Are you sure you want to create this event_presenter?')) {return false;}
                 }}
                 >
                 <span class="fas fa-plus mx-1"></span>
@@ -925,7 +911,7 @@ async function handle_update__sponsorship({
             </button>
         {/if} -->
     </footer>
-</div>
+</section>
 {/if}
 
 
diff --git a/src/routes/events_speakers/10_view_modal__event_presenter_obj.svelte b/src/routes/events_speakers/10_view_modal__event_presenter_obj.svelte
index 9752961c..ef15f530 100644
--- a/src/routes/events_speakers/10_view_modal__event_presenter_obj.svelte
+++ b/src/routes/events_speakers/10_view_modal__event_presenter_obj.svelte
@@ -1,9 +1,8 @@
 <script lang="ts">
 import type { SvelteComponent } from 'svelte';
-import { createEventDispatcher, onMount } from 'svelte';
+import { onMount } from 'svelte';
 
 // Stores
-// import { getModalStore } from '@skeletonlabs/skeleton';
 
 import { ae_util } from '$lib/ae_utils';
 import { api } from '$lib/api';
@@ -14,9 +13,6 @@ import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 export let parent: SvelteComponent;
 console.log(`Parent:`, parent);
 export let container_class_li = '';
-export let container_header_class_li = '';
-
-// const dispatch = createEventDispatcher();
 
 if ($slct.event_presenter_id) {
     console.log(`Presenter ID selected: ${$slct.event_presenter_id}`);
@@ -35,7 +31,9 @@ onMount(() => {
 
 <section class="svelte_component ae_view_modal ae_obj__event_presenter {container_class_li}">
 
-<header class={container_header_class_li}>{@html $slct.event_presenter_obj.full_name}</header>
+<header class={parent.regionHeader}>
+    {@html $slct.event_presenter_obj.full_name}
+</header>
 
 <div class="event_presenter__content">
     <div
@@ -76,7 +74,6 @@ onMount(() => {
     </div>
 
 
-
     <div class="ae_list event_presenter__guests">
         <h2>More Information</h2>
 
diff --git a/src/routes/sponsorships/+page.svelte b/src/routes/sponsorships/+page.svelte
index e67fa694..5716c3e2 100644
--- a/src/routes/sponsorships/+page.svelte
+++ b/src/routes/sponsorships/+page.svelte
@@ -28,7 +28,7 @@ import View_modal_sponsorship_obj from './10_view_modal__sponsorship_obj.svelte'
 
 
 // Editing
-const modalComponentEditSponsorshipObj: ModalComponent = { ref: Edit_modal_sponsorship_obj, props: {container_class_li: 'w-full p-4 space-y-4 card', container_header_class_li: 'card-header text-2xl font-bold'} };
+const modalComponentEditSponsorshipObj: ModalComponent = { ref: Edit_modal_sponsorship_obj, props: {container_class_li: 'w-full p-4 space-y-4 card'} };
 
 const modal_edit__sponsorship_obj: ModalSettings = {
 	type: 'component',
@@ -40,7 +40,7 @@ const modal_edit__sponsorship_obj: ModalSettings = {
 };
 
 // Viewing
-const modalComponentViewSponsorshipObj: ModalComponent = { ref: View_modal_sponsorship_obj, props: {container_class_li: 'w-full p-4 space-y-4 card', container_header_class_li: 'card-header text-2xl font-bold'} };
+const modalComponentViewSponsorshipObj: ModalComponent = { ref: View_modal_sponsorship_obj, props: {container_class_li: 'w-full p-4 space-y-4 card'} };
 
 const modal_view__sponsorship_obj: ModalSettings = {
 	type: 'component',
diff --git a/src/routes/sponsorships/10_edit_modal__sponsorship_obj.svelte b/src/routes/sponsorships/10_edit_modal__sponsorship_obj.svelte
index 139bfd25..d1010684 100644
--- a/src/routes/sponsorships/10_edit_modal__sponsorship_obj.svelte
+++ b/src/routes/sponsorships/10_edit_modal__sponsorship_obj.svelte
@@ -30,7 +30,6 @@ import { getModalStore, FileDropzone, TabGroup, Tab, TabAnchor } from '@skeleton
 /** Exposes parent props to this component. */
 export let parent: SvelteComponent;
 export let container_class_li = '';
-export let container_header_class_li = '';
 
 const modalStore = getModalStore();
 
@@ -50,15 +49,6 @@ onMount(() => {
     }
 });
 
-// // Form Data
-// const formData = {
-//     name: 'Jane Doe',
-//     tel: '214-555-1234',
-//     email: 'jdoe@email.com'
-// };
-
-// const form_data = $slct.sponsorship_obj;
-
 // We've created a custom submit function to pass the response and close the modal.
 // function onFormSubmit(): void {
 //     if ($modalStore[0].response) $modalStore[0].response(formData);
@@ -66,24 +56,21 @@ onMount(() => {
 // }
 
 // Base Classes
-const cBase = 'card p-4 shadow-xl space-y-4 ae_modal_scrollfix';
+// const cBase = 'card p-4 shadow-xl space-y-4 ae_modal_scrollfix';
 // w-modal-wide
 // const cBase = 'bg-surface-100-800-token w-screen h-screen';
 // const cBase = 'card h-screen';
 // const cBase = 'card p-4 w-modal-wide h-screen shadow-xl space-y-4';
 
-const cHeader = 'text-2xl font-bold';
 const cForm = 'border border-surface-500 p-4 space-y-4 rounded-container-token';
 
 
-
 $ae_loc.mod.sponsorships.disable_submit__sponsorship_obj = false;
 let placeholder_li: key_val = {
     file_logo_primary: '-- No File Selected --',
     file_logo_secondary: '-- No File Selected --',
     file_media_promo_video: '-- No File Selected --',
 };
-let ae_promises_init: key_val = {};
 let ae_promises: key_val = {};
 // let ae_promises.api_create__sponsorship_obj: Promise<any>;
 
@@ -121,7 +108,6 @@ if ($slct.sponsorship_id) {
 }
 
 
-
 $: if ($slct.sponsorship_obj) {
     // Logo related
     if ($slct.sponsorship_obj.logo_li_json) {
@@ -460,7 +446,7 @@ async function handle_update__sponsorship({
 
 {#if $modalStore[0]}
 <div class="svelte_component ae_edit_modal ae_obj__sponsorship {container_class_li}">
-    <header class={container_header_class_li}>
+    <header class={parent.regionHeader}>
         {$modalStore[0].title ?? '-- No Title --'}
 
         {#await ae_promises.update__sponsorship_obj}
@@ -542,7 +528,7 @@ async function handle_update__sponsorship({
         <legend class="legend">General Information</legend>
 
         <label for="organization_name" class="label">Name of organization/company
-            <input type="text" id="organization_name" name="organization_name" required max="200" value={$slct.sponsorship_obj.organization_name ?? ''} placeholder="Name of organization/company" autocomplete="off" class="input" />
+            <input type="text" id="organization_name" name="organization_name" required max="200" value={$slct.sponsorship_obj.name ?? ''} placeholder="Name of organization/company" autocomplete="off" class="input" />
             </label>
 
         <!-- <label class="label ae_label sponsorship__description">Short description
diff --git a/src/routes/sponsorships/10_view_modal__sponsorship_obj.svelte b/src/routes/sponsorships/10_view_modal__sponsorship_obj.svelte
index 3eea99b2..d18f73db 100644
--- a/src/routes/sponsorships/10_view_modal__sponsorship_obj.svelte
+++ b/src/routes/sponsorships/10_view_modal__sponsorship_obj.svelte
@@ -1,9 +1,8 @@
 <script lang="ts">
 import type { SvelteComponent } from 'svelte';
-import { createEventDispatcher, onMount } from 'svelte';
+import { onMount } from 'svelte';
 
 // Stores
-// import { getModalStore } from '@skeletonlabs/skeleton';
 
 import { ae_util } from '$lib/ae_utils';
 import { api } from '$lib/api';
@@ -14,9 +13,6 @@ import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 export let parent: SvelteComponent;
 console.log(`Parent:`, parent);
 export let container_class_li = '';
-export let container_header_class_li = '';
-
-// const dispatch = createEventDispatcher();
 
 if ($slct.sponsorship_id) {
     console.log(`Sponsorship ID selected: ${$slct.sponsorship_id}`);
@@ -35,7 +31,9 @@ onMount(() => {
 
 <section class="svelte_component ae_view_modal ae_obj__sponsorship_obj {container_class_li}">
 
-<header class={container_header_class_li}>{@html $slct.sponsorship_obj.name}</header>
+<header class={parent.regionHeader}>
+    {@html $slct.sponsorship_obj.name}
+</header>
 
 <div class="sponsorship__content">
     <div class="sponsorship__poc">