diff --git a/templates/watchlist.gohtml b/templates/watchlist.gohtml
index 12147db..ecd5593 100644
--- a/templates/watchlist.gohtml
+++ b/templates/watchlist.gohtml
@@ -13,14 +13,32 @@
       <button class="text-sm transition-colors text-neutral-400 hover:text-white" onclick="filterWatchlist('dropped', this)">Dropped</button>
     </div>
 
-    <div class="flex items-center gap-4">
-      <ui-dropdown class="relative block" data-align="right" data-width="min-w-[150px]">
+<div class="flex items-center gap-4">
+      <button type="button" id="sort-order-btn" class="text-neutral-400 transition-colors hover:text-white" onclick="toggleSortOrder(this)">
+        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="transition-transform duration-200 rotate-0"><path d="m21 16-4 4-4-4"></path><path d="M17 20V4"></path><path d="m3 8 4-4 4 4"></path><path d="M7 4v16"></path></svg>
+      </button>
+
+      <ui-dropdown class="relative block" data-align="right" data-width="min-w-[120px]">
         <div data-trigger>
           <button type="button" class="flex items-center gap-2 text-sm text-neutral-400 transition-colors hover:text-white">
-            <span>Sort by: <span id="sort-by-display">Date Added</span></span>
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 5h20"></path><path d="M6 12h12"></path><path d="M9 19h6"></path></svg>
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="1"/><circle cx="19" cy="12" r="1"/><circle cx="5" cy="12" r="1"/></svg>
           </button>
         </div>
+        <div data-content class="hidden absolute z-50 min-w-[120px] bg-background-button rounded-none shadow-2xl right-0 top-full mt-2">
+          <div class="flex flex-col py-1">
+            <button class="flex w-full items-center gap-2 px-4 py-2 text-sm text-neutral-400 transition-colors hover:bg-white/10 hover:text-white" onclick="exportWatchlistCSV()">
+              <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>
+              Export CSV
+            </button>
+            <button class="flex w-full items-center gap-2 px-4 py-2 text-sm text-neutral-400 transition-colors hover:bg-white/10 hover:text-white" onclick="document.getElementById('import-input').click()">
+              <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="17 8 12 3 7 8"/><line x1="12" y1="3" x2="12" y2="15"/></svg>
+              Import CSV
+            </button>
+            <input type="file" id="import-input" class="hidden" accept=".csv" onchange="importWatchlistCSV(this)">
+          </div>
+        </div>
+      </ui-dropdown>
+    </div>
         <div data-content class="hidden absolute z-50 min-w-[150px] bg-background-button rounded-none shadow-2xl right-0 top-full mt-2">
           <div class="flex flex-col py-1">
             <button class="flex w-full items-center px-4 py-2 text-sm text-white transition-colors hover:bg-white/10" onclick="setSortBy('date', this)">Date Added</button>
@@ -50,7 +68,7 @@
 
   <div id="watchlist-items" class="grid grid-cols-2 gap-4 md:grid-cols-3 lg:grid-cols-4 2xl:grid-cols-6">
     {{range $.AllEntries}}
-      <div class="watchlist-item flex w-full flex-col gap-2" data-status="{{.Status}}" data-updated-at="{{.UpdatedAt.Unix}}">
+      <div class="watchlist-item flex w-full flex-col gap-2" data-status="{{.Status}}" data-updated-at="{{.UpdatedAt.Unix}}" data-episode="{{.CurrentEpisode.Int64}}" data-time="{{.CurrentTimeSeconds}}">
         <div class="group relative flex aspect-2/3 w-full flex-col overflow-hidden bg-white/5 after:absolute after:inset-0 after:bg-black/80 after:opacity-0 hover:after:opacity-100 after:transition-opacity">
           <a href="/anime/{{.AnimeID}}" class="absolute inset-0 z-10"></a>
           <img src="{{.ImageUrl}}" alt="{{.DisplayTitle}}" class="h-full w-full object-cover" loading="lazy" />
@@ -139,15 +157,19 @@
   }
 
   function exportWatchlistCSV() {
-    const entries = {{json .AllEntries}};
-    if (!entries || entries.length === 0) {
+    const items = document.querySelectorAll('.watchlist-item');
+    if (items.length === 0) {
       alert('Watchlist is empty');
       return;
     }
 
     let csv = 'anime_id,status,current_episode,current_time_seconds\n';
-    entries.forEach(e => {
-      csv += `${e.AnimeID},${e.Status},${e.CurrentEpisode.Int64},${e.CurrentTimeSeconds}\n`;
+    items.forEach(function(item) {
+      const animeId = item.querySelector('a').href.split('/').pop();
+      const status = item.dataset.status || 'plan_to_watch';
+      const episode = item.dataset.episode || '0';
+      const time = item.dataset.time || '0';
+      csv += `${animeId},${status},${episode},${time}\n`;
     });
 
     const blob = new Blob([csv], { type: 'text/csv' });
diff --git a/templates/watchlist_partial.gohtml b/templates/watchlist_partial.gohtml
index b0b5c36..54815d3 100644
--- a/templates/watchlist_partial.gohtml
+++ b/templates/watchlist_partial.gohtml
@@ -32,18 +32,26 @@
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="transition-transform duration-200 rotate-0"><path d="m21 16-4 4-4-4"></path><path d="M17 20V4"></path><path d="m3 8 4-4 4 4"></path><path d="M7 4v16"></path></svg>
       </button>
 
-      <div class="flex bg-white/5 p-1 rounded-md border border-white/10">
-        <button type="button" class="px-3 py-1 text-xs hover:bg-white/10 transition-colors flex items-center gap-2 text-neutral-400 hover:text-white" onclick="exportWatchlistCSV()">
-          <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>
-          Export
-        </button>
-        <div class="w-px h-4 bg-white/10 self-center"></div>
-        <button type="button" class="px-3 py-1 text-xs hover:bg-white/10 transition-colors flex items-center gap-2 text-neutral-400 hover:text-white" onclick="document.getElementById('import-input').click()">
-          <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="17 8 12 3 7 8"/><line x1="12" y1="3" x2="12" y2="15"/></svg>
-          Import
-        </button>
-        <input type="file" id="import-input" class="hidden" accept=".csv" onchange="importWatchlistCSV(this)">
-      </div>
+      <ui-dropdown class="relative block" data-align="right" data-width="min-w-[120px]">
+        <div data-trigger>
+          <button type="button" class="flex items-center gap-2 text-sm text-neutral-400 transition-colors hover:text-white">
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="1"/><circle cx="19" cy="12" r="1"/><circle cx="5" cy="12" r="1"/></svg>
+          </button>
+        </div>
+        <div data-content class="hidden absolute z-50 min-w-[120px] bg-background-button rounded-none shadow-2xl right-0 top-full mt-2">
+          <div class="flex flex-col py-1">
+            <button class="flex w-full items-center gap-2 px-4 py-2 text-sm text-neutral-400 transition-colors hover:bg-white/10 hover:text-white" onclick="exportWatchlistCSV()">
+              <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>
+              Export CSV
+            </button>
+            <button class="flex w-full items-center gap-2 px-4 py-2 text-sm text-neutral-400 transition-colors hover:bg-white/10 hover:text-white" onclick="document.getElementById('import-input').click()">
+              <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="17 8 12 3 7 8"/><line x1="12" y1="3" x2="12" y2="15"/></svg>
+              Import CSV
+            </button>
+            <input type="file" id="import-input" class="hidden" accept=".csv" onchange="importWatchlistCSV(this)">
+          </div>
+        </div>
+      </ui-dropdown>
     </div>
   </div>
 
@@ -54,7 +62,7 @@
         <div class="watchlist-section" data-status="{{$status}}">
           <div class="grid grid-cols-2 gap-4 md:grid-cols-3 lg:grid-cols-4 2xl:grid-cols-6">
             {{range $entries}}
-              <div class="watchlist-item flex w-full flex-col gap-2" data-updated-at="{{.UpdatedAt.Unix}}">
+              <div class="watchlist-item flex w-full flex-col gap-2" data-status="{{.Status}}" data-updated-at="{{.UpdatedAt.Unix}}" data-episode="{{.CurrentEpisode.Int64}}" data-time="{{.CurrentTimeSeconds}}">
                 <div class="group relative flex aspect-2/3 w-full flex-col overflow-hidden bg-white/5 after:absolute after:inset-0 after:bg-black/80 after:opacity-0 hover:after:opacity-100 after:transition-opacity">
                   <a href="/anime/{{.AnimeID}}" class="absolute inset-0"></a>
                   <img src="{{.ImageUrl}}" alt="{{.DisplayTitle}}" class="h-full w-full object-cover" loading="lazy" />
@@ -141,15 +149,19 @@
   }
 
   function exportWatchlistCSV() {
-    const entries = {{json .AllEntries}};
-    if (!entries || entries.length === 0) {
+    const items = document.querySelectorAll('.watchlist-item');
+    if (items.length === 0) {
       alert('Watchlist is empty');
       return;
     }
 
     let csv = 'anime_id,status,current_episode,current_time_seconds\n';
-    entries.forEach(e => {
-      csv += `${e.AnimeID},${e.Status},${e.CurrentEpisode.Int64},${e.CurrentTimeSeconds}\n`;
+    items.forEach(function(item) {
+      const animeId = item.querySelector('a').href.split('/').pop();
+      const status = item.dataset.status || 'plan_to_watch';
+      const episode = item.dataset.episode || '0';
+      const time = item.dataset.time || '0';
+      csv += `${animeId},${status},${episode},${time}\n`;
     });
 
     const blob = new Blob([csv], { type: 'text/csv' });