diff --git a/src/lib/ae_archives/ae_archives__archive_content.ts b/src/lib/ae_archives/ae_archives__archive_content.ts
index dc3bf184..69949854 100644
--- a/src/lib/ae_archives/ae_archives__archive_content.ts
+++ b/src/lib/ae_archives/ae_archives__archive_content.ts
@@ -625,8 +625,8 @@ export async function process_ae_obj__archive_content_props({
             updated_on: obj.updated_on,
 
             // Generated fields for sorting locally only
-            tmp_sort_1: `${obj.original_datetime}_${obj.group}_${obj.priority}_${obj.sort}`,
-            tmp_sort_2: `${obj.group}_${obj.original_datetime}_${obj.priority}_${obj.sort}`,
+            tmp_sort_1: `${obj.original_datetime ?? ''}_${obj.group ?? ''}_${obj.priority ? '1' : '0'}_${obj.sort?.toString().padStart(2, '0') ?? ''}`,
+            tmp_sort_2: `${obj.group ?? ''}_${obj.original_datetime ?? ''}_${obj.priority ? '1' : '0'}_${obj.sort?.toString().padStart(2, '0') ?? ''}`,
             // tmp_sort_a: `${obj.group}_${obj.priority}_${obj.sort}_${obj.updated_on ?? obj.created_on}`,
             // tmp_sort_b: `${obj.group}_${obj.priority}_${obj.sort}_${obj.updated_on}_${obj.created_on}`,
 
diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte
index b0bed4b6..b7694b9e 100644
--- a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte
+++ b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte
@@ -1,8 +1,6 @@
 <script lang="ts">
-import { run } from 'svelte/legacy';
 
 // *** Import Svelte core
-import { onMount } from 'svelte';
 import { fade } from 'svelte/transition';
 
 // *** Import Aether core variables and functions
diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_li.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_li.svelte
index dd401c38..03a3b2e5 100644
--- a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_li.svelte
+++ b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_li.svelte
@@ -19,6 +19,34 @@ let ae_promises: key_val = $state({});
 // let ae_tmp: key_val = {};
 // let ae_triggers: key_val = {};
 
+// This should be moved to a better location. Turn into a function?
+let file_icons:any = $state({})
+file_icons['ac3'] = 'file-audio';
+file_icons['aac'] = 'file-audio';
+file_icons['csv'] = 'file-csv';
+file_icons['doc'] = 'file-word';
+file_icons['docx'] = 'file-word';
+file_icons['gif'] = 'file-image';
+file_icons['htm'] = 'file-code';
+file_icons['html'] = 'file-code';
+file_icons['jpeg'] = 'file-image';
+file_icons['jpg'] = 'file-image';
+file_icons['key'] = 'file-powerpoint';
+file_icons['m4a'] = 'file-audio';
+file_icons['mkv'] = 'file-video';
+file_icons['mov'] = 'file-video';
+file_icons['mp3'] = 'file-audio';
+file_icons['mp4'] = 'file-video';
+file_icons['pdf'] = 'file-pdf';
+file_icons['png'] = 'file-image';
+file_icons['ppt'] = 'file-powerpoint';
+file_icons['pptx'] = 'file-powerpoint';
+file_icons['txt'] = 'file-alt';
+file_icons['wav'] = 'file-audio';
+file_icons['webp'] = 'file-image';
+file_icons['xls'] = 'file-excel';
+file_icons['xlsx'] = 'file-excel';
+file_icons['zip'] = 'file-archive';
 </script>
 
 
@@ -122,10 +150,15 @@ let ae_promises: key_val = $state({});
                     $idaa_sess.archives.show__modal_edit__archive_content_id = false;
                 }}
                 class="novi_btn btn btn-md btn-secondary preset-tonal-primary border border-primary-500 hover:preset-filled-primary-500 transition"
-                title={`View: ${idaa_archive_content_obj?.name}`}
+                title={`Play/View: ${idaa_archive_content_obj?.name}`}
                 >
                 <span class="fas fa-play m-1 text-neutral-800/80"></span>
-                Play/View
+                {#if (file_icons[idaa_archive_content_obj.file_extension] == 'file-audio' || file_icons[idaa_archive_content_obj.file_extension] == 'file-video')}
+                    Play
+                {:else}
+                    View
+                {/if}
+                <span class="fas fa-{ae_util.file_extension_icon(idaa_archive_content_obj?.file_extension)}"></span>
             </button>
 
             {#if $ae_loc.trusted_access && idaa_archive_content_obj?.hosted_file_id}
@@ -139,7 +172,6 @@ let ae_promises: key_val = $state({});
                             return_file: true,
                             filename: idaa_archive_content_obj.filename,
                             auto_download: true,
-                            log_lvl: 0
                         });
 
                         // window.postMessage({ type: 'download_event_file', hosted_file_id: idaa_archive_content_obj.hosted_file_id, filename: idaa_archive_content_obj.filename, auto_download: true }, '*');
diff --git a/src/routes/idaa/(idaa)/archives/ae_idaa_comp__media_player.svelte b/src/routes/idaa/(idaa)/archives/ae_idaa_comp__media_player.svelte
index 010e07da..b0e38109 100644
--- a/src/routes/idaa/(idaa)/archives/ae_idaa_comp__media_player.svelte
+++ b/src/routes/idaa/(idaa)/archives/ae_idaa_comp__media_player.svelte
@@ -15,6 +15,7 @@ interface Props {
 
 let { lq__archive_content_obj }: Props = $props();
 
+// This should be moved to a better location. Turn into a function?
 let file_icons:any = $state({})
 file_icons['ac3'] = 'file-audio';
 file_icons['aac'] = 'file-audio';