diff --git a/src/components/CardGrid.astro b/src/components/CardGrid.astro
index 7fad952..70b8417 100644
--- a/src/components/CardGrid.astro
+++ b/src/components/CardGrid.astro
@@ -187,7 +187,7 @@ import BackToTop from "./BackToTop.astro"
 
   // ── Sort dropdown ─────────────────────────────────────────────────────────
   document.addEventListener('click', (e) => {
-    const btn = e.target.closest('#sortBy [data-bs-toggle="dropdown"]');
+    const btn = e.target.closest('#sortBy [data-toggle="sort-dropdown"]');
     if (btn) {
       e.preventDefault();
       e.stopPropagation();
diff --git a/src/components/Search.astro b/src/components/Search.astro
index 7619a05..afb516b 100644
--- a/src/components/Search.astro
+++ b/src/components/Search.astro
@@ -38,12 +38,12 @@ import { Show } from '@clerk/astro/components'
     >
         <div class="input-group">
             {Astro.url.pathname === '/pokemon' && (
-                <button class="btn btn-purple" data-bs-toggle="offcanvas" href="#filterBar" type="button" role="button" aria-controls="filterBar" aria-label="filter">
+                <a class="btn btn-purple" data-bs-toggle="offcanvas" href="#filterBar" type="button" role="button" aria-controls="filterBar" aria-label="filter">
                     <span class="d-block d-md-none filter-icon py-2">
                         <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><path d="M528.8 96.3C558.6 90.8 571.2 118.9 568.9 142.2C572.3 173.4 570.8 207 553.9 230.8C513.9 283.2 459.3 315.9 414.3 364.3C414.9 418.3 419.8 459.8 423.6 511.2C427.6 552.4 388.7 586.8 346.6 570.1C303.2 550.5 259.4 527.5 230.4 493.3C217 453.1 225.9 407.5 222.2 365.3C222.2 365.3 222.1 365.1 222 365C151.4 319.6 59.3 250.9 61 158.4C59.9 121 91.8 96.1 123.8 96.5C259.3 98.5 394.1 104.4 528.8 96.3zM506.1 161.4C378.3 168.2 252 162.1 125.2 160.5C128.6 227 199 270.8 250 306.8C305.5 335.4 281.6 410.5 288.3 461.7C310.8 478.9 334.6 494.6 358.9 505.8C355.4 458 350.7 415.4 350.2 364.6C349.9 349.2 355.3 333.7 366.5 321.7C384.3 302.6 402.8 287.8 421.5 270.1C446.1 245.2 477.9 225.1 499.7 196.7C509 182.2 504.7 174.5 506 161.5z"/></svg>
                     </span>
                     <span class="d-none d-md-block fw-medium">Filters</span>
-                </button>
+                </a>
             )}
             <input type="hidden" name="start" id="start" value="0" />
             <input type="hidden" name="sort" id="sortInput" value="" />
diff --git a/src/pages/dashboard.astro b/src/pages/dashboard.astro
index c0c69ff..9315141 100644
--- a/src/pages/dashboard.astro
+++ b/src/pages/dashboard.astro
@@ -76,7 +76,7 @@ const totalGain = summary.totalGain || 0;
 
     <main class="col-12 col-md-10 p-4">
       <div class="d-flex flex-wrap gap-2 align-items-center mb-4">
-        <div class="d-flex align-items-center gap-1">
+        <!--div class="d-flex align-items-center gap-1">
           <button id="btnGrid" type="button" class="btn btn-sm btn-link text-secondary px-1 view-toggle-btn active" title="Images view">
             <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
               <path d="M1 2.5A1.5 1.5 0 0 1 2.5 1h3A1.5 1.5 0 0 1 7 2.5v3A1.5 1.5 0 0 1 5.5 7h-3A1.5 1.5 0 0 1 1 5.5v-3zm8 0A1.5 1.5 0 0 1 10.5 1h3A1.5 1.5 0 0 1 15 2.5v3A1.5 1.5 0 0 1 13.5 7h-3A1.5 1.5 0 0 1 9 5.5v-3zm-8 8A1.5 1.5 0 0 1 2.5 9h3A1.5 1.5 0 0 1 7 10.5v3A1.5 1.5 0 0 1 5.5 15h-3A1.5 1.5 0 0 1 1 13.5v-3zm8 0A1.5 1.5 0 0 1 10.5 9h3A1.5 1.5 0 0 1 15 10.5v3A1.5 1.5 0 0 1 13.5 15h-3A1.5 1.5 0 0 1 9 13.5v-3z"/>
@@ -89,16 +89,11 @@ const totalGain = summary.totalGain || 0;
             </svg>
             <span class="small ms-1">List</span>
           </button>
-        </div>
+        </div>-->
 
         <div class="vr opacity-25 mx-1"></div>
 
-        <button
-          type="button"
-          class="btn btn-sm btn-vendor"
-          data-bs-toggle="modal"
-          data-bs-target="#addCardModal"
-        >+ Add Card</button>
+        <a href="/pokemon" class="btn btn-sm btn-vendor">+ Add Card</a>
 
         <button
           type="button"
diff --git a/src/pages/partials/cards.astro b/src/pages/partials/cards.astro
index 733d8e4..c0967dc 100644
--- a/src/pages/partials/cards.astro
+++ b/src/pages/partials/cards.astro
@@ -203,7 +203,7 @@ const facets = searchResults.results.slice(1).map((result: any) => {
     </div>
     <div id="sortBy" class="d-flex flex-fill align-items-center me-auto gap-2" hx-swap-oob="true">
         <div class="dropdown">
-            <button class="btn btn-sm btn-dark dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">Sort by</button>
+            <button class="btn btn-sm btn-dark dropdown-toggle" data-toggle="sort-dropdown" aria-expanded="false">Sort by</button>
             <ul class="dropdown-menu dropdown-menu-dark">
                 <li><a class="dropdown-item sort-option" href="#" data-sort="releaseDate:desc,number:asc" data-label="Set: Newest to Oldest">Set: Newest to Oldest</a></li>
                 <li><a class="dropdown-item sort-option" href="#" data-sort="releaseDate:asc,number:asc"  data-label="Set: Oldest to Newest">Set: Oldest to Newest</a></li>