diff --git a/src/lib/ae_events_stores.ts b/src/lib/ae_events_stores.ts
index b8919eae..9f55e7f8 100644
--- a/src/lib/ae_events_stores.ts
+++ b/src/lib/ae_events_stores.ts
@@ -56,6 +56,7 @@ let events_local_data_struct: key_val = {
         auto_hide_on_sign_in: true,
 
         show_hidden: false, // These are hidden (archived) leads so the list is not as long.
+        show_not_enabled: false,
 
         // The entered_passcode is the exhibit booths shared passcode for staff. This is used to initially access the lead retrieval service.
         entered_passcode: null,
diff --git a/src/routes/events_leads/exhibit/[slug]/leads_list.svelte b/src/routes/events_leads/exhibit/[slug]/leads_list.svelte
index f57dafc1..12db120d 100644
--- a/src/routes/events_leads/exhibit/[slug]/leads_list.svelte
+++ b/src/routes/events_leads/exhibit/[slug]/leads_list.svelte
@@ -71,9 +71,11 @@ let lq__event_exhibit_obj = liveQuery(
 let lq__event_exhibit_tracking_obj_li = liveQuery(
     () => db_events.exhibit_tracking
         .where({event_exhibit_id_random: $events_slct.exhibit_id})
-        .and((x) => (x.enable === true && x.hide === false))
-        .reverse()
-        .sortBy('priority')
+        .and((x) => (x.enable == !$events_loc.leads.show_not_enabled))
+        .sortBy('sort')
+        // .reverse()
+        // .sortBy('priority')
+
         // .orderBy("priority")
         // .orderBy("sort")
         // .orderBy("created_on", "desc")
@@ -94,40 +96,55 @@ let lq__event_exhibit_tracking_obj_li = liveQuery(
 <section class="tab__leads_list flex flex-col wrap justify-center items-center space-y-4">
 
 {#if $events_slct.exhibit_id && $events_slct.exhibit_obj}
-    <h2 class="h3">
-        <span class="fas fa-clipboard-list-check"></span>
-        Leads for {$lq__event_exhibit_obj?.name}
-    </h2>
+<h2 class="h3">
+    <span class="fas fa-clipboard-list-check"></span>
+    {$lq__event_exhibit_tracking_obj_li?.length}
+    Leads for {$lq__event_exhibit_obj?.name}
+</h2>
 
-    <div class="border border-slate-500/10 p-2 variant-soft-warning">This section is not fully enabled for ISHLT 2024 at this time. You can not add new leads and changes are limited.</div>
+<div class="border border-slate-500/10 p-2 variant-soft-warning">This section is not fully enabled for ISHLT 2024 at this time. You can not add new leads and changes are limited.</div>
 
 
-    {#if $ae_loc.trusted_access}
-
-
-    <button
-        on:click={async () => {
-            console.log('Show Hidden Leads');
-            // $events_loc.leads.show_hidden = !$events_loc.leads.show_hidden;
-
-            console.log('$events_loc.leads.show_hidden:', $events_loc.leads.show_hidden);
-
-            // await db.friends.update(friendId, {age: 99});
-
-            await db_events.exhibits.update($events_slct.exhibit_id, {name: $lq__event_exhibit_obj?.name + ' TEST'});
-
-            // event_exhibit_obj.set.name = $lq__event_exhibit_obj.name + ' TEST';
-
-
-        }}
-        class="btn btn-sm variant-soft"
-        >
-        {$events_loc.leads.show_hidden ? 'Hide' : 'Show'} Hidden Leads
-    </button>
-    {$events_loc.leads.show_hidden}
+<div class="flex flex-row gap-1">
+{#if $ae_loc.trusted_access}
 
+<button
+    on:click={async () => {
+        console.log('Show Hidden Leads');
+        $events_loc.leads.show_hidden = !$events_loc.leads.show_hidden;
 
+        console.log('$events_loc.leads.show_hidden:', $events_loc.leads.show_hidden);
+    }}
+    class="btn btn-sm variant-soft"
+    >
+    {#if $events_loc.leads.show_hidden}
+        <span class="fas fa-eye-slash m-1"></span>
+        Hide Archived?
+    {:else}
+        <span class="fas fa-eye m-1"></span>
+        Show All Leads?
     {/if}
+</button>
+
+{/if}
+
+{#if $ae_loc.trusted_access}
+<button
+    on:click={async () => {
+        console.log('Show Enabled Leads');
+        $events_loc.leads.show_not_enabled = !$events_loc.leads.show_not_enabled;
+
+        console.log('$events_loc.leads.show_not_enabled:', $events_loc.leads.show_not_enabled);
+    }}
+    class="btn btn-sm variant-soft"
+    >
+    <span class="fas fa-eye m-1"></span>
+    {$events_loc.leads.show_not_enabled ? 'Show Enabled' : 'Show Not Enabled'} Leads?
+</button>
+{/if}
+
+</div> <!-- END: flex flex-row -->
+
 
 {#if $lq__event_exhibit_tracking_obj_li}
 <table class="table table-compact table-hover">
@@ -144,7 +161,7 @@ let lq__event_exhibit_tracking_obj_li = liveQuery(
 {#each $lq__event_exhibit_tracking_obj_li as event_exhibit_tracking_obj, index}
 <!-- flex flex-row justify-center items-center m-auto -->
 <tr
-    class:hidden={$events_loc.leads.show_hidden}
+    class:hidden={event_exhibit_tracking_obj.hide && !$events_loc.leads.show_hidden}
     class:test_dim={event_exhibit_tracking_obj.hide}
     >
     <td class="star text-center">
@@ -181,10 +198,6 @@ let lq__event_exhibit_tracking_obj_li = liveQuery(
                     $events_slct.exhibit_tracking_obj.priority = !$events_slct.exhibit_tracking_obj.priority;
 
                     ae_triggers.priority[event_exhibit_tracking_obj?.event_exhibit_tracking_id_random] = true;
-
-                    // ae_triggers.priority[event_exhibit_tracking_obj?.event_exhibit_tracking_id_random].new_val = !event_exhibit_tracking_obj?.priority;
-
-                    console.log(`ae_triggers.priority: ${ae_triggers.priority[event_exhibit_tracking_obj?.event_exhibit_tracking_id_random]}`);
                 }}
                 class="btn btn-sm variant-soft-tertiary"
                 >
@@ -196,30 +209,95 @@ let lq__event_exhibit_tracking_obj_li = liveQuery(
     <!-- text-center align-middle -->
     <td class="ranking text-center"> <!-- BEGIN: Ranking in table -->
         <div class="ranking_container flex flex-col lg:flex-row justify-stretch items-center">
-            <button
-                on:click={() => {
-                    $events_slct.exhibit_tracking_id = event_exhibit_tracking_obj.event_exhibit_tracking_id_random;
+            <!-- Sort (ranking) means this should be sorted in the list based on the number. 0 is the top of the list. -->
 
-                    db_events.exhibit_tracking.get($events_slct.exhibit_tracking_id)
-                    .then((event_exhibit_tracking_obj) => {
-                        console.log('event_exhibit_tracking_obj:', event_exhibit_tracking_obj);
-                        if (event_exhibit_tracking_obj.sort < 1) {
-                            event_exhibit_tracking_obj.sort = 0;
-                        } else {
-                            event_exhibit_tracking_obj.sort -= 1;
-                        }
-                        db_events.exhibit_tracking.put(event_exhibit_tracking_obj);
-                    });
+            <Element_ae_crud
+                bind:trigger_patch={ae_triggers.sort[event_exhibit_tracking_obj?.event_exhibit_tracking_id_random]}
+                api_cfg={$ae_api}
+                object_type={'event_exhibit_tracking'}
+                object_id={event_exhibit_tracking_obj?.event_exhibit_tracking_id_random}
+                field_name={'sort'}
+                field_type={'button'}
+                field_value={$events_slct.exhibit_tracking_obj.sort}
+                allow_null={false}
+                hide_edit_btn={true}
+                outline_element={false}
+                show_crud={false}
+                display_inline={true}
+                class_li={'m-1'}
+                on:ae_crud_updated={e => {
+                    console.log(`ae_crud_updated event:`, e.detail);
+                    events_func.handle_load_ae_obj_id__exhibit_tracking({api_cfg: $ae_api, exhibit_tracking_id: $events_slct.exhibit_tracking_id});
                 }}
-                disabled={event_exhibit_tracking_obj.sort < 1}
-                class="btn btn-sm variant-soft-secondary"
                 >
-                <span class="fas fa-arrow-up" title="Move up"></span>
-            </button>
+                <button
+                    type="button"
+                    on:click={() => {
+                        console.log(`Updating sort for event_exhibit_tracking_id: ${event_exhibit_tracking_obj?.event_exhibit_tracking_id_random}`);
+
+                        $events_slct.exhibit_tracking_id = event_exhibit_tracking_obj.event_exhibit_tracking_id_random;
+                        $events_slct.exhibit_tracking_obj = event_exhibit_tracking_obj;
+
+                        if ($events_slct.exhibit_tracking_obj.sort < 1) {
+                            $events_slct.exhibit_tracking_obj.sort = 0;
+                        } else {
+                            $events_slct.exhibit_tracking_obj.sort -= 1;
+                        }
+
+                        ae_triggers.sort[event_exhibit_tracking_obj?.event_exhibit_tracking_id_random] = true;
+                    }}
+                    disabled={event_exhibit_tracking_obj?.sort < 1}
+                    class="btn btn-sm variant-soft-secondary"
+                    >
+                    <span class="fas fa-arrow-up" title="Move up"></span>
+                </button>
+            </Element_ae_crud>
 
             <span class="exhibit_tracking__sort m-0 lg:mx-1">{event_exhibit_tracking_obj.sort ?? ''}</span>
 
-            <button
+            <Element_ae_crud
+                bind:trigger_patch={ae_triggers.sort[event_exhibit_tracking_obj?.event_exhibit_tracking_id_random]}
+                api_cfg={$ae_api}
+                object_type={'event_exhibit_tracking'}
+                object_id={event_exhibit_tracking_obj?.event_exhibit_tracking_id_random}
+                field_name={'sort'}
+                field_type={'button'}
+                field_value={$events_slct.exhibit_tracking_obj.sort}
+                allow_null={false}
+                hide_edit_btn={true}
+                outline_element={false}
+                show_crud={false}
+                display_inline={true}
+                class_li={'m-1'}
+                on:ae_crud_updated={e => {
+                    console.log(`ae_crud_updated event:`, e.detail);
+                    events_func.handle_load_ae_obj_id__exhibit_tracking({api_cfg: $ae_api, exhibit_tracking_id: $events_slct.exhibit_tracking_id});
+                }}
+                >
+                <button
+                    type="button"
+                    on:click={() => {
+                        console.log(`Updating sort for event_exhibit_tracking_id: ${event_exhibit_tracking_obj?.event_exhibit_tracking_id_random}`);
+
+                        $events_slct.exhibit_tracking_id = event_exhibit_tracking_obj.event_exhibit_tracking_id_random;
+                        $events_slct.exhibit_tracking_obj = event_exhibit_tracking_obj;
+
+                        if ($events_slct.exhibit_tracking_obj.sort >= 5) {
+                            $events_slct.exhibit_tracking_obj.sort = 5;
+                        } else {
+                            $events_slct.exhibit_tracking_obj.sort += 1;
+                        }
+
+                        ae_triggers.sort[event_exhibit_tracking_obj?.event_exhibit_tracking_id_random] = true;
+                    }}
+                    disabled={event_exhibit_tracking_obj.sort >= 5}
+                    class="btn btn-sm variant-soft-secondary"
+                    >
+                    <span class="fas fa-arrow-down" title="Move down"></span>
+                </button>
+            </Element_ae_crud>
+
+            <!-- <button
                 on:click={() => {
                     $events_slct.exhibit_tracking_id = event_exhibit_tracking_obj.event_exhibit_tracking_id_random;
 
@@ -238,7 +316,7 @@ let lq__event_exhibit_tracking_obj_li = liveQuery(
                 class="btn btn-sm variant-soft-secondary"
                 >
                 <span class="fas fa-arrow-down" title="Move down"></span>
-            </button>
+            </button> -->
         </div>
     </td> <!-- END: Ranking in table -->
 
@@ -299,7 +377,10 @@ let lq__event_exhibit_tracking_obj_li = liveQuery(
 
 <style lang="postcss">
 .test_dim {
-    opacity: 0.25;
+    opacity: 0.5;
+}
+.test_dim:hover {
+    opacity: 1;
 }
 
 /* Use the div.ae_quick_modal_container to block background clicks when using the section.ae_quick_popover. */