diff --git a/.sqlx/query-05d7a87d04e669dc8ed1a1152be390d5abfdd0cf202744c65597aec1f2f03ff1.json b/.sqlx/query-05d7a87d04e669dc8ed1a1152be390d5abfdd0cf202744c65597aec1f2f03ff1.json
deleted file mode 100644
index 01fef587..00000000
--- a/.sqlx/query-05d7a87d04e669dc8ed1a1152be390d5abfdd0cf202744c65597aec1f2f03ff1.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT DISTINCT minter_did FROM nfts WHERE minter_did IS NOT NULL",
-  "describe": {
-    "columns": [
-      {
-        "name": "minter_did",
-        "ordinal": 0,
-        "type_info": "Blob"
-      }
-    ],
-    "parameters": {
-      "Right": 0
-    },
-    "nullable": [
-      true
-    ]
-  },
-  "hash": "05d7a87d04e669dc8ed1a1152be390d5abfdd0cf202744c65597aec1f2f03ff1"
-}
diff --git a/.sqlx/query-0df4d6f44db6d5a751b180496df02a627dc5d84bec1519e0779dc61c13ab0a26.json b/.sqlx/query-06597c3a99e3ac6448ef9ab5f46f7e80b9e84294af7b626712e4f13a7f23468b.json
similarity index 57%
rename from .sqlx/query-0df4d6f44db6d5a751b180496df02a627dc5d84bec1519e0779dc61c13ab0a26.json
rename to .sqlx/query-06597c3a99e3ac6448ef9ab5f46f7e80b9e84294af7b626712e4f13a7f23468b.json
index ce3643a2..93bef207 100644
--- a/.sqlx/query-0df4d6f44db6d5a751b180496df02a627dc5d84bec1519e0779dc61c13ab0a26.json
+++ b/.sqlx/query-06597c3a99e3ac6448ef9ab5f46f7e80b9e84294af7b626712e4f13a7f23468b.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n        SELECT `collection_id`, `did_id`, `metadata_collection_id`, `visible`, `name`, `icon`\n        FROM `collections` INDEXED BY `col_name`\n        ORDER BY `visible` DESC, `is_named` DESC, `name` ASC, `collection_id` ASC\n        LIMIT ? OFFSET ?\n        ",
+  "query": "\n        SELECT \n            collection_id, \n            did_id, \n            metadata_collection_id, \n            visible, \n            name, \n            icon,\n            COUNT(*) OVER() as total_count\n        FROM collections INDEXED BY col_name\n        ORDER BY visible DESC, is_named DESC, name ASC, collection_id ASC\n        LIMIT ? OFFSET ?\n        ",
   "describe": {
     "columns": [
       {
@@ -32,6 +32,11 @@
         "name": "icon",
         "ordinal": 5,
         "type_info": "Text"
+      },
+      {
+        "name": "total_count",
+        "ordinal": 6,
+        "type_info": "Integer"
       }
     ],
     "parameters": {
@@ -43,8 +48,9 @@
       false,
       false,
       true,
-      true
+      true,
+      false
     ]
   },
-  "hash": "0df4d6f44db6d5a751b180496df02a627dc5d84bec1519e0779dc61c13ab0a26"
+  "hash": "06597c3a99e3ac6448ef9ab5f46f7e80b9e84294af7b626712e4f13a7f23468b"
 }
diff --git a/.sqlx/query-fd9f732f3a7ed809b9d4c2ededebdeeb3765c89c9fc78576f447c646c46f445c.json b/.sqlx/query-b4ad9892410265bb0a06e51d8de8eb35e1c2bcfb1a276f633cf2493f2038231f.json
similarity index 51%
rename from .sqlx/query-fd9f732f3a7ed809b9d4c2ededebdeeb3765c89c9fc78576f447c646c46f445c.json
rename to .sqlx/query-b4ad9892410265bb0a06e51d8de8eb35e1c2bcfb1a276f633cf2493f2038231f.json
index e1af1b05..a7091555 100644
--- a/.sqlx/query-fd9f732f3a7ed809b9d4c2ededebdeeb3765c89c9fc78576f447c646c46f445c.json
+++ b/.sqlx/query-b4ad9892410265bb0a06e51d8de8eb35e1c2bcfb1a276f633cf2493f2038231f.json
@@ -1,10 +1,10 @@
 {
   "db_name": "SQLite",
-  "query": "\n        SELECT COUNT(*) AS `count` FROM `collections`\n        WHERE `visible` = 1\n        ",
+  "query": "SELECT COUNT(*) FROM collections",
   "describe": {
     "columns": [
       {
-        "name": "count",
+        "name": "COUNT(*)",
         "ordinal": 0,
         "type_info": "Integer"
       }
@@ -16,5 +16,5 @@
       false
     ]
   },
-  "hash": "fd9f732f3a7ed809b9d4c2ededebdeeb3765c89c9fc78576f447c646c46f445c"
+  "hash": "b4ad9892410265bb0a06e51d8de8eb35e1c2bcfb1a276f633cf2493f2038231f"
 }
diff --git a/.sqlx/query-c28c5534fa54f929c81d02b31276dfb5d621da40c7adc621a055e9b72d4dae30.json b/.sqlx/query-c28c5534fa54f929c81d02b31276dfb5d621da40c7adc621a055e9b72d4dae30.json
new file mode 100644
index 00000000..15255bd1
--- /dev/null
+++ b/.sqlx/query-c28c5534fa54f929c81d02b31276dfb5d621da40c7adc621a055e9b72d4dae30.json
@@ -0,0 +1,26 @@
+{
+  "db_name": "SQLite",
+  "query": "\n        WITH distinct_dids AS (\n            SELECT DISTINCT minter_did \n            FROM nfts \n            WHERE minter_did IS NOT NULL\n        )\n        SELECT \n            minter_did,\n            COUNT(*) OVER() AS total_count\n        FROM distinct_dids\n        LIMIT ? OFFSET ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "minter_did",
+        "ordinal": 0,
+        "type_info": "Blob"
+      },
+      {
+        "name": "total_count",
+        "ordinal": 1,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      true,
+      false
+    ]
+  },
+  "hash": "c28c5534fa54f929c81d02b31276dfb5d621da40c7adc621a055e9b72d4dae30"
+}
diff --git a/.sqlx/query-cc24879f9012f1e056cc0fcfc664437aee6a72b858918c0ca70776ef36b50f33.json b/.sqlx/query-cc24879f9012f1e056cc0fcfc664437aee6a72b858918c0ca70776ef36b50f33.json
new file mode 100644
index 00000000..cb6292ba
--- /dev/null
+++ b/.sqlx/query-cc24879f9012f1e056cc0fcfc664437aee6a72b858918c0ca70776ef36b50f33.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT COUNT(*) FROM collections WHERE visible = 1",
+  "describe": {
+    "columns": [
+      {
+        "name": "COUNT(*)",
+        "ordinal": 0,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "cc24879f9012f1e056cc0fcfc664437aee6a72b858918c0ca70776ef36b50f33"
+}
diff --git a/.sqlx/query-db46b3d7d5af874af5981ec8beb210085a115f7d5900802ade79722b0c4ed560.json b/.sqlx/query-dbfe6794b0d552111c01cec93995a4af753cbee36b430767e372debb5df15ce4.json
similarity index 56%
rename from .sqlx/query-db46b3d7d5af874af5981ec8beb210085a115f7d5900802ade79722b0c4ed560.json
rename to .sqlx/query-dbfe6794b0d552111c01cec93995a4af753cbee36b430767e372debb5df15ce4.json
index 46774271..f6b8b549 100644
--- a/.sqlx/query-db46b3d7d5af874af5981ec8beb210085a115f7d5900802ade79722b0c4ed560.json
+++ b/.sqlx/query-dbfe6794b0d552111c01cec93995a4af753cbee36b430767e372debb5df15ce4.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n        SELECT `collection_id`, `did_id`, `metadata_collection_id`, `visible`, `name`, `icon`\n        FROM `collections` INDEXED BY `col_name`\n        WHERE `visible` = 1\n        ORDER BY `is_named` DESC, `name` ASC, `collection_id` ASC\n        LIMIT ? OFFSET ?\n        ",
+  "query": "\n        SELECT \n            collection_id, \n            did_id, \n            metadata_collection_id, \n            visible, \n            name, \n            icon,\n            COUNT(*) OVER() as total_count\n        FROM collections INDEXED BY col_name\n        WHERE visible = 1\n        ORDER BY name IS NOT NULL DESC, name ASC, collection_id ASC\n        LIMIT ? OFFSET ?\n        ",
   "describe": {
     "columns": [
       {
@@ -32,6 +32,11 @@
         "name": "icon",
         "ordinal": 5,
         "type_info": "Text"
+      },
+      {
+        "name": "total_count",
+        "ordinal": 6,
+        "type_info": "Integer"
       }
     ],
     "parameters": {
@@ -43,8 +48,9 @@
       false,
       false,
       true,
-      true
+      true,
+      false
     ]
   },
-  "hash": "db46b3d7d5af874af5981ec8beb210085a115f7d5900802ade79722b0c4ed560"
+  "hash": "dbfe6794b0d552111c01cec93995a4af753cbee36b430767e372debb5df15ce4"
 }
diff --git a/crates/sage-api/src/requests/data.rs b/crates/sage-api/src/requests/data.rs
index 44966e62..f8fe0ac9 100644
--- a/crates/sage-api/src/requests/data.rs
+++ b/crates/sage-api/src/requests/data.rs
@@ -91,12 +91,16 @@ pub struct GetDidsResponse {
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 #[cfg_attr(feature = "tauri", derive(specta::Type))]
-pub struct GetMinterDidIds {}
+pub struct GetMinterDidIds {
+    pub offset: u32,
+    pub limit: u32,
+}
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[cfg_attr(feature = "tauri", derive(specta::Type))]
 pub struct GetMinterDidIdsResponse {
     pub did_ids: Vec<String>,
+    pub total: u32,
 }
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
@@ -147,6 +151,7 @@ pub struct GetNftCollections {
 #[cfg_attr(feature = "tauri", derive(specta::Type))]
 pub struct GetNftCollectionsResponse {
     pub collections: Vec<NftCollectionRecord>,
+    pub total: u32,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -182,6 +187,7 @@ pub struct GetNfts {
 #[cfg_attr(feature = "tauri", derive(specta::Type))]
 pub struct GetNftsResponse {
     pub nfts: Vec<NftRecord>,
+    pub total: u32,
 }
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
diff --git a/crates/sage-database/src/lib.rs b/crates/sage-database/src/lib.rs
index b2367658..2a53a2e2 100644
--- a/crates/sage-database/src/lib.rs
+++ b/crates/sage-database/src/lib.rs
@@ -73,6 +73,21 @@ impl Database {
 
         Ok(())
     }
+
+    /// Count collections, optionally including hidden ones
+    pub async fn count_collections(&self, include_hidden: bool) -> Result<i64> {
+        let count: i64 = if include_hidden {
+            sqlx::query_scalar!("SELECT COUNT(*) FROM collections")
+                .fetch_one(&self.pool)
+                .await?
+        } else {
+            sqlx::query_scalar!("SELECT COUNT(*) FROM collections WHERE visible = 1")
+                .fetch_one(&self.pool)
+                .await?
+        };
+
+        Ok(count)
+    }
 }
 
 #[derive(Debug)]
diff --git a/crates/sage-database/src/primitives/nfts.rs b/crates/sage-database/src/primitives/nfts.rs
index 15b25c2c..464cd1c1 100644
--- a/crates/sage-database/src/primitives/nfts.rs
+++ b/crates/sage-database/src/primitives/nfts.rs
@@ -48,6 +48,24 @@ pub struct NftSearchParams {
     pub name: Option<String>,
 }
 
+#[derive(sqlx::FromRow)]
+struct NftSearchRow {
+    #[sqlx(flatten)]
+    nft: NftSql,
+    total_count: i32,
+}
+
+#[derive(sqlx::FromRow)]
+struct CollectionSearchSql {
+    collection_id: Vec<u8>,
+    did_id: Vec<u8>,
+    metadata_collection_id: String,
+    visible: bool,
+    name: Option<String>,
+    icon: Option<String>,
+    total_count: i64,
+}
+
 pub fn calculate_collection_id(did_id: Bytes32, json_collection_id: &str) -> Bytes32 {
     let mut hasher = Sha256::new();
     hasher.update(hex::encode(did_id));
@@ -72,8 +90,12 @@ impl Database {
         fetch_nft_data(&self.pool, hash).await
     }
 
-    pub async fn distinct_minter_dids(&self) -> Result<Vec<Option<Bytes32>>> {
-        distinct_minter_dids(&self.pool).await
+    pub async fn distinct_minter_dids(
+        &self,
+        limit: u32,
+        offset: u32,
+    ) -> Result<(Vec<Option<Bytes32>>, u32)> {
+        distinct_minter_dids(&self.pool, limit, offset).await
     }
 
     pub async fn search_nfts(
@@ -81,7 +103,7 @@ impl Database {
         params: NftSearchParams,
         limit: u32,
         offset: u32,
-    ) -> Result<Vec<NftRow>> {
+    ) -> Result<(Vec<NftRow>, u32)> {
         search_nfts(&self.pool, params, limit, offset).await
     }
 
@@ -89,24 +111,20 @@ impl Database {
         collection(&self.pool, collection_id).await
     }
 
-    pub async fn collection_count(&self) -> Result<u32> {
-        collection_count(&self.pool).await
-    }
-
-    pub async fn visible_collection_count(&self) -> Result<u32> {
-        visible_collection_count(&self.pool).await
-    }
-
     pub async fn collections_visible_named(
         &self,
         limit: u32,
         offset: u32,
-    ) -> Result<Vec<CollectionRow>> {
-        collections_visible_named(&self.pool, offset, limit).await
+    ) -> Result<(Vec<CollectionRow>, u32)> {
+        collections_visible_named(&self.pool, limit, offset).await
     }
 
-    pub async fn collections_named(&self, limit: u32, offset: u32) -> Result<Vec<CollectionRow>> {
-        collections_named(&self.pool, offset, limit).await
+    pub async fn collections_named(
+        &self,
+        limit: u32,
+        offset: u32,
+    ) -> Result<(Vec<CollectionRow>, u32)> {
+        collections_named(&self.pool, limit, offset).await
     }
 
     pub async fn nft_row(&self, launcher_id: Bytes32) -> Result<Option<NftRow>> {
@@ -386,75 +404,91 @@ async fn collection(
 
 async fn collections_visible_named(
     conn: impl SqliteExecutor<'_>,
-    offset: u32,
     limit: u32,
-) -> Result<Vec<CollectionRow>> {
-    sqlx::query_as!(
-        CollectionSql,
-        "
-        SELECT `collection_id`, `did_id`, `metadata_collection_id`, `visible`, `name`, `icon`
-        FROM `collections` INDEXED BY `col_name`
-        WHERE `visible` = 1
-        ORDER BY `is_named` DESC, `name` ASC, `collection_id` ASC
+    offset: u32,
+) -> Result<(Vec<CollectionRow>, u32)> {
+    let rows = sqlx::query_as!(
+        CollectionSearchSql,
+        r#"
+        SELECT 
+            collection_id, 
+            did_id, 
+            metadata_collection_id, 
+            visible, 
+            name, 
+            icon,
+            COUNT(*) OVER() as total_count
+        FROM collections INDEXED BY col_name
+        WHERE visible = 1
+        ORDER BY name IS NOT NULL DESC, name ASC, collection_id ASC
         LIMIT ? OFFSET ?
-        ",
+        "#,
         limit,
         offset
     )
     .fetch_all(conn)
-    .await?
-    .into_iter()
-    .map(into_row)
-    .collect()
+    .await?;
+
+    let total = rows.first().map(|r| r.total_count as u32).unwrap_or(0);
+    let collections = rows
+        .into_iter()
+        .map(|row| {
+            into_row(CollectionSql {
+                collection_id: row.collection_id,
+                did_id: row.did_id,
+                metadata_collection_id: row.metadata_collection_id,
+                visible: row.visible,
+                name: row.name,
+                icon: row.icon,
+            })
+        })
+        .collect::<Result<Vec<_>>>()?;
+
+    Ok((collections, total))
 }
 
 async fn collections_named(
     conn: impl SqliteExecutor<'_>,
-    offset: u32,
     limit: u32,
-) -> Result<Vec<CollectionRow>> {
-    sqlx::query_as!(
-        CollectionSql,
-        "
-        SELECT `collection_id`, `did_id`, `metadata_collection_id`, `visible`, `name`, `icon`
-        FROM `collections` INDEXED BY `col_name`
-        ORDER BY `visible` DESC, `is_named` DESC, `name` ASC, `collection_id` ASC
+    offset: u32,
+) -> Result<(Vec<CollectionRow>, u32)> {
+    let rows = sqlx::query_as!(
+        CollectionSearchSql,
+        r#"
+        SELECT 
+            collection_id, 
+            did_id, 
+            metadata_collection_id, 
+            visible, 
+            name, 
+            icon,
+            COUNT(*) OVER() as total_count
+        FROM collections INDEXED BY col_name
+        ORDER BY visible DESC, is_named DESC, name ASC, collection_id ASC
         LIMIT ? OFFSET ?
-        ",
+        "#,
         limit,
         offset
     )
     .fetch_all(conn)
-    .await?
-    .into_iter()
-    .map(into_row)
-    .collect()
-}
-
-async fn collection_count(conn: impl SqliteExecutor<'_>) -> Result<u32> {
-    let row = sqlx::query!(
-        "
-        SELECT COUNT(*) AS `count` FROM `collections`
-        WHERE `visible` = 1
-        "
-    )
-    .fetch_one(conn)
     .await?;
 
-    Ok(row.count.try_into()?)
-}
-
-async fn visible_collection_count(conn: impl SqliteExecutor<'_>) -> Result<u32> {
-    let row = sqlx::query!(
-        "
-        SELECT COUNT(*) AS `count` FROM `collections`
-        WHERE `visible` = 1
-        "
-    )
-    .fetch_one(conn)
-    .await?;
-
-    Ok(row.count.try_into()?)
+    let total = rows.first().map(|r| r.total_count as u32).unwrap_or(0);
+    let collections = rows
+        .into_iter()
+        .map(|row| {
+            into_row(CollectionSql {
+                collection_id: row.collection_id,
+                did_id: row.did_id,
+                metadata_collection_id: row.metadata_collection_id,
+                visible: row.visible,
+                name: row.name,
+                icon: row.icon,
+            })
+        })
+        .collect::<Result<Vec<_>>>()?;
+
+    Ok((collections, total))
 }
 
 async fn insert_nft_uri(conn: impl SqliteExecutor<'_>, uri: String, hash: Bytes32) -> Result<()> {
@@ -553,14 +587,37 @@ async fn delete_nft_data(conn: impl SqliteExecutor<'_>, hash: Bytes32) -> Result
     Ok(())
 }
 
-async fn distinct_minter_dids(conn: impl SqliteExecutor<'_>) -> Result<Vec<Option<Bytes32>>> {
-    let rows = sqlx::query!("SELECT DISTINCT minter_did FROM nfts WHERE minter_did IS NOT NULL")
-        .fetch_all(conn)
-        .await?;
+async fn distinct_minter_dids(
+    conn: impl SqliteExecutor<'_>,
+    limit: u32,
+    offset: u32,
+) -> Result<(Vec<Option<Bytes32>>, u32)> {
+    let rows = sqlx::query!(
+        r#"
+        WITH distinct_dids AS (
+            SELECT DISTINCT minter_did 
+            FROM nfts 
+            WHERE minter_did IS NOT NULL
+        )
+        SELECT 
+            minter_did,
+            COUNT(*) OVER() AS total_count
+        FROM distinct_dids
+        LIMIT ? OFFSET ?
+        "#,
+        limit,
+        offset
+    )
+    .fetch_all(conn)
+    .await?;
 
-    rows.into_iter()
+    let total_count = rows.first().map(|row| row.total_count as u32).unwrap_or(0);
+    let dids = rows
+        .into_iter()
         .map(|row| row.minter_did.map(|bytes| to_bytes32(&bytes)).transpose())
-        .collect()
+        .collect::<Result<Vec<_>>>()?;
+
+    Ok((dids, total_count))
 }
 
 async fn fetch_nft_data(conn: impl SqliteExecutor<'_>, hash: Bytes32) -> Result<Option<NftData>> {
@@ -789,7 +846,7 @@ async fn search_nfts(
     params: NftSearchParams,
     limit: u32,
     offset: u32,
-) -> Result<Vec<NftRow>> {
+) -> Result<(Vec<NftRow>, u32)> {
     let mut conditions = vec!["is_owned = 1"];
 
     // Group filtering (Collection/DID)
@@ -870,7 +927,7 @@ async fn search_nfts(
                 WHERE name MATCH ? || '*'
                 ORDER BY rank
             )
-            SELECT nfts.* 
+            SELECT nfts.*, COUNT(*) OVER() as total_count 
             FROM nfts INDEXED BY {index}
             INNER JOIN matched_names ON nfts.launcher_id = matched_names.launcher_id
             WHERE {where_clause}
@@ -880,7 +937,7 @@ async fn search_nfts(
     } else {
         format!(
             r#"
-            SELECT * 
+            SELECT *, COUNT(*) OVER() as total_count
             FROM nfts INDEXED BY {index}
             WHERE {where_clause}
             {order_by}
@@ -889,7 +946,7 @@ async fn search_nfts(
     };
 
     // Execute query with bindings
-    let mut query = sqlx::query_as::<_, NftSql>(&query);
+    let mut query = sqlx::query_as::<_, NftSearchRow>(&query);
 
     // Bind name search if present
     if let Some(name_search) = params.name {
@@ -909,7 +966,13 @@ async fn search_nfts(
     query = query.bind(offset);
 
     let rows = query.fetch_all(conn).await?;
-    rows.into_iter().map(into_row).collect()
+    let total_count = rows.first().map(|row| row.total_count as u32).unwrap_or(0);
+    let nfts = rows
+        .into_iter()
+        .map(|row| into_row(row.nft))
+        .collect::<Result<Vec<_>>>()?;
+
+    Ok((nfts, total_count))
 }
 
 async fn insert_nft_coin(
diff --git a/crates/sage/src/endpoints/data.rs b/crates/sage/src/endpoints/data.rs
index 6461c9f1..32f05a75 100644
--- a/crates/sage/src/endpoints/data.rs
+++ b/crates/sage/src/endpoints/data.rs
@@ -247,20 +247,22 @@ impl Sage {
 
     pub async fn get_minter_did_ids(
         &self,
-        _req: GetMinterDidIds,
+        req: GetMinterDidIds,
     ) -> Result<GetMinterDidIdsResponse> {
         let wallet = self.wallet()?;
 
-        let did_ids = wallet
+        let (dids, total) = wallet
             .db
-            .distinct_minter_dids()
-            .await?
+            .distinct_minter_dids(req.limit, req.offset)
+            .await?;
+
+        let did_ids = dids
             .into_iter()
             .filter_map(|did| did.map(|d| encode_address(d.to_bytes(), "did:chia:").ok()))
             .flatten()
             .collect();
 
-        Ok(GetMinterDidIdsResponse { did_ids })
+        Ok(GetMinterDidIdsResponse { did_ids, total })
     }
 
     pub async fn get_pending_transactions(
@@ -320,10 +322,9 @@ impl Sage {
         req: GetNftCollections,
     ) -> Result<GetNftCollectionsResponse> {
         let wallet = self.wallet()?;
+        let include_hidden = req.include_hidden;
 
-        let mut records = Vec::new();
-
-        let collections = if req.include_hidden {
+        let (collections, total) = if include_hidden {
             wallet.db.collections_named(req.limit, req.offset).await?
         } else {
             wallet
@@ -332,19 +333,23 @@ impl Sage {
                 .await?
         };
 
-        for col in collections {
-            records.push(NftCollectionRecord {
-                collection_id: encode_address(col.collection_id.to_bytes(), "col")?,
-                did_id: encode_address(col.did_id.to_bytes(), "did:chia:")?,
-                metadata_collection_id: col.metadata_collection_id,
-                visible: col.visible,
-                name: col.name,
-                icon: col.icon,
-            });
-        }
+        let records = collections
+            .into_iter()
+            .map(|row| {
+                Ok(NftCollectionRecord {
+                    collection_id: encode_address(row.collection_id.to_bytes(), "col")?,
+                    did_id: encode_address(row.did_id.to_bytes(), "did:chia:")?,
+                    metadata_collection_id: row.metadata_collection_id,
+                    name: row.name,
+                    icon: row.icon,
+                    visible: row.visible,
+                })
+            })
+            .collect::<Result<Vec<_>>>()?;
 
         Ok(GetNftCollectionsResponse {
             collections: records,
+            total,
         })
     }
 
@@ -433,10 +438,7 @@ impl Sage {
             name: req.name,
         };
 
-        let nfts = wallet
-            .db
-            .search_nfts(params.clone(), req.limit, req.offset)
-            .await?;
+        let (nfts, total) = wallet.db.search_nfts(params, req.limit, req.offset).await?;
 
         for nft_row in nfts {
             let Some(nft) = wallet.db.nft(nft_row.launcher_id).await? else {
@@ -452,7 +454,10 @@ impl Sage {
             records.push(self.nft_record(nft_row, nft, collection_name)?);
         }
 
-        Ok(GetNftsResponse { nfts: records })
+        Ok(GetNftsResponse {
+            nfts: records,
+            total,
+        })
     }
 
     pub async fn get_nft(&self, req: GetNft) -> Result<GetNftResponse> {
diff --git a/src/bindings.ts b/src/bindings.ts
index bad71202..ac7b6c65 100644
--- a/src/bindings.ts
+++ b/src/bindings.ts
@@ -311,20 +311,20 @@ export type GetKey = { fingerprint?: number | null }
 export type GetKeyResponse = { key: KeyInfo | null }
 export type GetKeys = Record<string, never>
 export type GetKeysResponse = { keys: KeyInfo[] }
-export type GetMinterDidIds = Record<string, never>
-export type GetMinterDidIdsResponse = { did_ids: string[] }
+export type GetMinterDidIds = { offset: number; limit: number }
+export type GetMinterDidIdsResponse = { did_ids: string[]; total: number }
 export type GetNetworks = Record<string, never>
 export type GetNetworksResponse = { networks: { [key in string]: Network } }
 export type GetNft = { nft_id: string }
 export type GetNftCollection = { collection_id: string | null }
 export type GetNftCollectionResponse = { collection: NftCollectionRecord | null }
 export type GetNftCollections = { offset: number; limit: number; include_hidden: boolean }
-export type GetNftCollectionsResponse = { collections: NftCollectionRecord[] }
+export type GetNftCollectionsResponse = { collections: NftCollectionRecord[]; total: number }
 export type GetNftData = { nft_id: string }
 export type GetNftDataResponse = { data: NftData | null }
 export type GetNftResponse = { nft: NftRecord | null }
 export type GetNfts = { collection_id?: string | null; minter_did_id?: string | null; owner_did_id?: string | null; name?: string | null; offset: number; limit: number; sort_mode: NftSortMode; include_hidden: boolean }
-export type GetNftsResponse = { nfts: NftRecord[] }
+export type GetNftsResponse = { nfts: NftRecord[]; total: number }
 export type GetOffer = { offer_id: string }
 export type GetOfferResponse = { offer: OfferRecord }
 export type GetOffers = Record<string, never>
diff --git a/src/components/CardSizeToggle.tsx b/src/components/CardSizeToggle.tsx
new file mode 100644
index 00000000..6e830d8e
--- /dev/null
+++ b/src/components/CardSizeToggle.tsx
@@ -0,0 +1,37 @@
+import { Button } from '@/components/ui/button';
+import { CardSize } from '@/hooks/useNftParams';
+import { t } from '@lingui/core/macro';
+import { Maximize2, Minimize2 } from 'lucide-react';
+
+interface CardSizeToggleProps {
+  size: CardSize;
+  onChange: (size: CardSize) => void;
+}
+
+export function CardSizeToggle({ size, onChange }: CardSizeToggleProps) {
+  return (
+    <Button
+      variant='outline'
+      size='icon'
+      onClick={() =>
+        onChange(size === CardSize.Large ? CardSize.Small : CardSize.Large)
+      }
+      aria-label={
+        size === CardSize.Large
+          ? t`Switch to small card size`
+          : t`Switch to large card size`
+      }
+      title={
+        size === CardSize.Large
+          ? t`Switch to small card size`
+          : t`Switch to large card size`
+      }
+    >
+      {size === CardSize.Large ? (
+        <Minimize2 className='h-4 w-4' aria-hidden='true' />
+      ) : (
+        <Maximize2 className='h-4 w-4' aria-hidden='true' />
+      )}
+    </Button>
+  );
+}
diff --git a/src/components/NftCard.tsx b/src/components/NftCard.tsx
index a5cab96b..a43e7db4 100644
--- a/src/components/NftCard.tsx
+++ b/src/components/NftCard.tsx
@@ -189,10 +189,18 @@ const NftCardComponent = ({
       .finally(() => setBurnOpen(false));
   };
 
+  const nftName = nft.name ?? t`Unnamed NFT`;
+
   return (
     <>
       <div
-        className={`cursor-pointer group${!nft.visible ? ' opacity-50 grayscale' : !nft.created_height ? ' pulsate-opacity' : ''}`}
+        className={`cursor-pointer group${
+          !nft.visible
+            ? ' opacity-50 grayscale'
+            : !nft.created_height
+              ? ' pulsate-opacity'
+              : ''
+        }`}
         onClick={() => {
           if (selectionState === null) {
             navigate(`/nfts/${nft.launcher_id}`);
@@ -210,16 +218,18 @@ const NftCardComponent = ({
             }
           }
         }}
-        role='button'
+        role='article'
         tabIndex={0}
-        aria-label={nft.name ? `NFT: ${nft.name}` : t`Unnamed NFT`}
+        aria-label={nftName}
+        aria-disabled={!nft.created_height}
+        aria-selected={selectionState?.[0]}
       >
         <div className='overflow-hidden rounded-t-lg relative'>
           <TooltipProvider>
             <Tooltip>
               <TooltipTrigger asChild>
                 <img
-                  alt={nft.name ?? t`NFT artwork for unnamed NFT`}
+                  alt={t`NFT artwork for ${nftName}`}
                   loading='lazy'
                   width='150'
                   height='150'
@@ -228,7 +238,7 @@ const NftCardComponent = ({
                 />
               </TooltipTrigger>
               <TooltipContent>
-                <p>{nft.name ?? t`Unnamed`}</p>
+                <p>{nftName}</p>
               </TooltipContent>
             </Tooltip>
           </TooltipProvider>
@@ -237,20 +247,25 @@ const NftCardComponent = ({
             <Checkbox
               checked={selectionState[0]}
               className='absolute top-2 right-2 w-5 h-5'
+              aria-label={selectionState[0] ? t`Deselect NFT` : t`Select NFT`}
             />
           )}
         </div>
-        <div className='border border-neutral-200 bg-white text-neutral-950 shadow dark:border-neutral-800 dark:bg-neutral-900 dark:text-neutral-50 text-md flex items-center justify-between rounded-b-lg p-2 pl-3'>
+        <div
+          className='border border-neutral-200 bg-white text-neutral-950 shadow dark:border-neutral-800 dark:bg-neutral-900 dark:text-neutral-50 text-md flex items-center justify-between rounded-b-lg p-2 pl-3'
+          role='group'
+          aria-label={t`NFT details`}
+        >
           <span className='truncate'>
             <TooltipProvider>
               <Tooltip>
                 <TooltipTrigger asChild>
-                  <span className='font-medium leading-none truncate block'>
-                    {nft.name ?? t`Unnamed`}
-                  </span>
+                  <h3 className='font-medium leading-none truncate block'>
+                    {nftName}
+                  </h3>
                 </TooltipTrigger>
                 <TooltipContent>
-                  <p>{nft.name ?? t`Unnamed`}</p>
+                  <p>{nftName}</p>
                 </TooltipContent>
               </Tooltip>
             </TooltipProvider>
@@ -271,8 +286,13 @@ const NftCardComponent = ({
 
           <DropdownMenu>
             <DropdownMenuTrigger asChild>
-              <Button variant='ghost' size='icon' aria-label={t`NFT options`}>
-                <MoreVertical className='h-5 w-5' />
+              <Button
+                variant='ghost'
+                size='icon'
+                aria-label={t`Options for ${nftName}`}
+                onClick={(e) => e.stopPropagation()}
+              >
+                <MoreVertical className='h-5 w-5' aria-hidden='true' />
               </Button>
             </DropdownMenuTrigger>
             <DropdownMenuContent align='end'>
@@ -284,8 +304,9 @@ const NftCardComponent = ({
                     setTransferOpen(true);
                   }}
                   disabled={!nft.created_height}
+                  aria-label={t`Transfer ${nftName}`}
                 >
-                  <SendIcon className='mr-2 h-4 w-4' />
+                  <SendIcon className='mr-2 h-4 w-4' aria-hidden='true' />
                   <span>
                     <Trans>Transfer</Trans>
                   </span>
@@ -298,8 +319,11 @@ const NftCardComponent = ({
                     setAssignOpen(true);
                   }}
                   disabled={!nft.created_height}
+                  aria-label={
+                    nft.owner_did === null ? t`Assign profile` : t`Edit profile`
+                  }
                 >
-                  <UserRoundPlus className='mr-2 h-4 w-4' />
+                  <UserRoundPlus className='mr-2 h-4 w-4' aria-hidden='true' />
                   <span>
                     {nft.owner_did === null ? (
                       <Trans>Assign Profile</Trans>
@@ -317,8 +341,9 @@ const NftCardComponent = ({
                     setAddUrlOpen(true);
                   }}
                   disabled={!nft.created_height}
+                  aria-label={t`Add URL to ${nftName}`}
                 >
-                  <LinkIcon className='mr-2 h-4 w-4' />
+                  <LinkIcon className='mr-2 h-4 w-4' aria-hidden='true' />
                   <span>
                     <Trans>Add URL</Trans>
                   </span>
@@ -331,8 +356,9 @@ const NftCardComponent = ({
                     setBurnOpen(true);
                   }}
                   disabled={!nft.created_height}
+                  aria-label={t`Burn ${nftName}`}
                 >
-                  <Flame className='mr-2 h-4 w-4' />
+                  <Flame className='mr-2 h-4 w-4' aria-hidden='true' />
                   <span>
                     <Trans>Burn</Trans>
                   </span>
@@ -363,8 +389,9 @@ const NftCardComponent = ({
                       (nftId) => nftId === nft.launcher_id,
                     ) !== -1
                   }
+                  aria-label={t`Add ${nftName} to offer`}
                 >
-                  <HandCoins className='mr-2 h-4 w-4' />
+                  <HandCoins className='mr-2 h-4 w-4' aria-hidden='true' />
                   <span>
                     <Trans>Add to Offer</Trans>
                   </span>
@@ -379,10 +406,11 @@ const NftCardComponent = ({
                       .redownloadNft({ nft_id: nft.launcher_id })
                       .catch(addError);
 
-                    toast.success(t`Redownloading NFT data`);
+                    toast.success(t`Re-downloading NFT data`);
                   }}
+                  aria-label={t`Redownload ${nftName}`}
                 >
-                  <RefreshCcw className='mr-2 h-4 w-4' />
+                  <RefreshCcw className='mr-2 h-4 w-4' aria-hidden='true' />
                   <span>
                     <Trans>Redownload</Trans>
                   </span>
@@ -394,11 +422,14 @@ const NftCardComponent = ({
                     e.stopPropagation();
                     toggleVisibility();
                   }}
+                  aria-label={
+                    nft.visible ? t`Hide ${nftName}` : t`Show ${nftName}`
+                  }
                 >
                   {nft.visible ? (
-                    <EyeOff className='mr-2 h-4 w-4' />
+                    <EyeOff className='mr-2 h-4 w-4' aria-hidden='true' />
                   ) : (
-                    <EyeIcon className='mr-2 h-4 w-4' />
+                    <EyeIcon className='mr-2 h-4 w-4' aria-hidden='true' />
                   )}
                   <span>
                     {nft.visible ? <Trans>Hide</Trans> : <Trans>Show</Trans>}
@@ -414,7 +445,7 @@ const NftCardComponent = ({
                   }}
                   aria-label={t`Copy NFT ID to clipboard`}
                 >
-                  <Copy className='mr-2 h-4 w-4' />
+                  <Copy className='mr-2 h-4 w-4' aria-hidden='true' />
                   <span>
                     <Trans>Copy ID</Trans>
                   </span>
@@ -430,6 +461,7 @@ const NftCardComponent = ({
         open={transferOpen}
         setOpen={setTransferOpen}
         onSubmit={onTransferSubmit}
+        aria-label={t`Transfer ${nftName}`}
       >
         <Trans>This will send the NFT to the provided address.</Trans>
       </TransferDialog>
@@ -439,6 +471,7 @@ const NftCardComponent = ({
         open={assignOpen}
         setOpen={setAssignOpen}
         onSubmit={onAssignSubmit}
+        aria-label={t`Assign profile for ${nftName}`}
       >
         <Trans>This will assign the NFT to the selected profile.</Trans>
       </AssignNftDialog>
diff --git a/src/components/NftCardList.tsx b/src/components/NftCardList.tsx
index 7e0f8693..15f3a4c4 100644
--- a/src/components/NftCardList.tsx
+++ b/src/components/NftCardList.tsx
@@ -1,6 +1,6 @@
 import { NftCard } from '@/components/NftCard';
 import { NftGroupCard } from '@/components/NftGroupCard';
-import { NftGroupMode } from '@/hooks/useNftParams';
+import { NftGroupMode, CardSize } from '@/hooks/useNftParams';
 import { t } from '@lingui/core/macro';
 import { ReactNode, useCallback } from 'react';
 import {
@@ -18,8 +18,8 @@ interface NftCardListProps {
   group?: NftGroupMode;
   nfts: NftRecord[];
   collections: NftCollectionRecord[];
-  dids: DidRecord[];
-  pageSize: number;
+  ownerDids: DidRecord[];
+  minterDids: DidRecord[];
   updateNfts: (page: number) => void;
   page: number;
   multiSelect?: boolean;
@@ -27,6 +27,7 @@ interface NftCardListProps {
   setSelected?: React.Dispatch<React.SetStateAction<string[]>>;
   addError?: (error: Error) => void;
   children?: ReactNode;
+  cardSize?: CardSize;
 }
 
 export function NftCardList({
@@ -36,8 +37,8 @@ export function NftCardList({
   group,
   nfts,
   collections,
-  dids,
-  pageSize,
+  ownerDids,
+  minterDids,
   updateNfts,
   page,
   multiSelect = false,
@@ -45,6 +46,7 @@ export function NftCardList({
   setSelected,
   addError,
   children,
+  cardSize = CardSize.Large,
 }: NftCardListProps) {
   const handleSelection = useCallback(
     (id: string) => {
@@ -82,6 +84,7 @@ export function NftCardList({
               item={col}
               updateNfts={updateNfts}
               page={page}
+              canToggleVisibility={col.collection_id !== 'No collection'}
               onToggleVisibility={() => {
                 commands
                   .updateNftCollection({
@@ -93,22 +96,29 @@ export function NftCardList({
               }}
             />
           ))}
-          {collections.length < pageSize && (
+        </>
+      );
+    }
+
+    if (
+      !collectionId &&
+      !ownerDid &&
+      !minterDid &&
+      group === NftGroupMode.OwnerDid
+    ) {
+      return (
+        <>
+          {ownerDids.map((did, i) => (
             <NftGroupCard
-              type='collection'
-              item={{
-                name: t`No Collection`,
-                icon: '',
-                did_id: 'Miscellaneous',
-                metadata_collection_id: 'Uncategorized NFTs',
-                collection_id: 'No collection',
-                visible: true,
-              }}
-              canToggleVisibility={false}
+              key={i}
+              type='did'
+              groupMode={group}
+              item={did}
               updateNfts={updateNfts}
               page={page}
+              canToggleVisibility={false}
             />
-          )}
+          ))}
         </>
       );
     }
@@ -117,11 +127,11 @@ export function NftCardList({
       !collectionId &&
       !ownerDid &&
       !minterDid &&
-      (group === NftGroupMode.OwnerDid || group === NftGroupMode.MinterDid)
+      group === NftGroupMode.MinterDid
     ) {
       return (
         <>
-          {dids.map((did, i) => (
+          {minterDids.map((did, i) => (
             <NftGroupCard
               key={i}
               type='did'
@@ -129,28 +139,9 @@ export function NftCardList({
               item={did}
               updateNfts={updateNfts}
               page={page}
+              canToggleVisibility={false}
             />
           ))}
-          <NftGroupCard
-            type='did'
-            groupMode={group}
-            item={{
-              name:
-                group === NftGroupMode.OwnerDid
-                  ? t`Unassigned NFTs`
-                  : t`Unknown Minter`,
-              launcher_id: 'No did',
-              visible: true,
-              coin_id: 'No coin',
-              address: 'No address',
-              amount: 0,
-              created_height: 0,
-              create_transaction_id: 'No transaction',
-              recovery_hash: '',
-            }}
-            updateNfts={updateNfts}
-            page={page}
-          />
         </>
       );
     }
@@ -174,7 +165,11 @@ export function NftCardList({
 
   return (
     <div
-      className='grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-6 2xl:grid-cols-6 gap-2 md:gap-4 mt-6 mb-2'
+      className={`grid gap-2 md:gap-4 mt-6 mb-2 ${
+        cardSize === CardSize.Large
+          ? 'grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-6 2xl:grid-cols-8'
+          : 'grid-cols-3 md:grid-cols-4 lg:grid-cols-6 xl:grid-cols-8 2xl:grid-cols-12'
+      }`}
       role='grid'
       aria-label={t`NFT Gallery`}
     >
diff --git a/src/components/NftGroupCard.tsx b/src/components/NftGroupCard.tsx
index 96cf1fe7..59820781 100644
--- a/src/components/NftGroupCard.tsx
+++ b/src/components/NftGroupCard.tsx
@@ -107,6 +107,7 @@ export function NftGroupCard({
       <div
         className='border border-red-200 dark:border-red-800 rounded-lg p-4'
         role='alert'
+        aria-live='polite'
       >
         <p className='text-red-600 dark:text-red-400'>{error.message}</p>
       </div>
@@ -117,14 +118,25 @@ export function NftGroupCard({
     return (
       <div
         className='border border-neutral-200 dark:border-neutral-800 rounded-lg p-4 animate-pulse'
+        role='status'
+        aria-busy='true'
         aria-label={isCollection ? t`Loading collection` : t`Loading profile`}
       >
-        <div className='aspect-square bg-neutral-100 dark:bg-neutral-800 rounded-t-lg' />
-        <div className='h-6 bg-neutral-100 dark:bg-neutral-800 rounded mt-4' />
+        <div
+          className='aspect-square bg-neutral-100 dark:bg-neutral-800 rounded-t-lg'
+          aria-hidden='true'
+        />
+        <div
+          className='h-6 bg-neutral-100 dark:bg-neutral-800 rounded mt-4'
+          aria-hidden='true'
+        />
       </div>
     );
   }
 
+  const cardName = item.name || getDefaultName();
+  const cardId = getId();
+
   return (
     <div
       onClick={() => {
@@ -138,23 +150,21 @@ export function NftGroupCard({
           navigate(getLinkPath());
         }
       }}
-      role='button'
+      role='article'
       tabIndex={0}
       className={`cursor-pointer group border border-neutral-200 dark:border-neutral-800 rounded-lg focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary ${
         isCollection && !item.visible ? 'opacity-50' : ''
       }`}
       aria-label={
         isCollection
-          ? `Collection ${item.name || t`Unnamed`}`
+          ? t`Collection ${cardName}`
           : groupMode === NftGroupMode.OwnerDid
-            ? `Profile ${item.name || t`Untitled Profile`}`
-            : `Minter ${item.name || t`Unknown Minter`}`
-      }
-      aria-current={
-        window.location.pathname === getLinkPath() ? 'page' : undefined
+            ? t`Profile ${cardName}`
+            : t`Minter ${cardName}`
       }
+      aria-current={window.location.pathname === getLinkPath()}
     >
-      <div className='overflow-hidden rounded-t-lg relative'>
+      <div className='overflow-hidden rounded-t-lg relative' aria-hidden='true'>
         {isCollection ? (
           <div
             className='bg-neutral-100 dark:bg-neutral-800 flex items-center justify-center aspect-square'
@@ -202,11 +212,11 @@ export function NftGroupCard({
             <Tooltip>
               <TooltipTrigger asChild>
                 <h3 className='font-medium leading-none truncate block'>
-                  {item.name ?? getDefaultName()}
+                  {cardName}
                 </h3>
               </TooltipTrigger>
               <TooltipContent>
-                <p>{item.name ?? getDefaultName()}</p>
+                <p>{cardName}</p>
               </TooltipContent>
             </Tooltip>
           </TooltipProvider>
@@ -216,13 +226,13 @@ export function NftGroupCard({
               <TooltipTrigger asChild>
                 <p
                   className='text-xs text-muted-foreground truncate'
-                  aria-label={`ID: ${getId()}`}
+                  aria-label={t`ID: ${cardId}`}
                 >
-                  {getId()}
+                  {cardId}
                 </p>
               </TooltipTrigger>
               <TooltipContent>
-                <p>{getId()}</p>
+                <p>{cardId}</p>
               </TooltipContent>
             </Tooltip>
           </TooltipProvider>
@@ -233,10 +243,10 @@ export function NftGroupCard({
             <Button
               variant='ghost'
               size='icon'
-              aria-label={t`Options`}
+              aria-label={t`Options for ${cardName}`}
               onClick={(e) => e.stopPropagation()}
             >
-              <MoreVertical className='h-5 w-5' />
+              <MoreVertical className='h-5 w-5' aria-hidden='true' />
             </Button>
           </DropdownMenuTrigger>
           <DropdownMenuContent align='end'>
@@ -247,11 +257,11 @@ export function NftGroupCard({
                     className='cursor-pointer'
                     onClick={(e) => {
                       e.stopPropagation();
-                      open(`https://mintgarden.io/collections/${getId()}`);
+                      open(`https://mintgarden.io/collections/${cardId}`);
                     }}
-                    aria-label={t`View on Mintgarden`}
+                    aria-label={t`View ${cardName} on Mintgarden`}
                   >
-                    <ExternalLink className='mr-2 h-4 w-4' />
+                    <ExternalLink className='mr-2 h-4 w-4' aria-hidden='true' />
                     <span>
                       <Trans>View on Mintgarden</Trans>
                     </span>
@@ -264,17 +274,20 @@ export function NftGroupCard({
                       onToggleVisibility();
                     }}
                     disabled={!canToggleVisibility}
+                    aria-label={
+                      item.visible ? t`Hide ${cardName}` : t`Show ${cardName}`
+                    }
                   >
                     {item.visible ? (
                       <>
-                        <EyeOff className='mr-2 h-4 w-4' />
+                        <EyeOff className='mr-2 h-4 w-4' aria-hidden='true' />
                         <span>
                           <Trans>Hide</Trans>
                         </span>
                       </>
                     ) : (
                       <>
-                        <EyeIcon className='mr-2 h-4 w-4' />
+                        <EyeIcon className='mr-2 h-4 w-4' aria-hidden='true' />
                         <span>
                           <Trans>Show</Trans>
                         </span>
@@ -288,7 +301,7 @@ export function NftGroupCard({
                 className='cursor-pointer'
                 onClick={(e) => {
                   e.stopPropagation();
-                  writeText(getId());
+                  writeText(cardId);
                   toast.success(
                     isCollection
                       ? t`Collection ID copied to clipboard`
@@ -297,9 +310,9 @@ export function NftGroupCard({
                         : t`Minter ID copied to clipboard`,
                   );
                 }}
-                aria-label={t`Copy ID to clipboard`}
+                aria-label={t`Copy ${cardName} ID to clipboard`}
               >
-                <Copy className='mr-2 h-4 w-4' />
+                <Copy className='mr-2 h-4 w-4' aria-hidden='true' />
                 <span>
                   <Trans>Copy ID</Trans>
                 </span>
diff --git a/src/components/NftOptions.tsx b/src/components/NftOptions.tsx
index 53b909f8..bac0f0ba 100644
--- a/src/components/NftOptions.tsx
+++ b/src/components/NftOptions.tsx
@@ -3,14 +3,13 @@ import {
   NftParams,
   NftSortMode,
   SetNftParams,
+  CardSize,
 } from '@/hooks/useNftParams';
 import { t } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
 import {
   ArrowDownAz,
   ArrowLeftIcon,
-  ChevronLeftIcon,
-  ChevronRightIcon,
   Clock2,
   CopyPlus,
   EyeIcon,
@@ -21,6 +20,9 @@ import {
   SearchIcon,
   UserIcon,
   XIcon,
+  Maximize2,
+  Minimize2,
+  Settings2,
 } from 'lucide-react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { Button } from './ui/button';
@@ -32,6 +34,8 @@ import {
   DropdownMenuTrigger,
 } from './ui/dropdown-menu';
 import { Input } from './ui/input';
+import { Pagination } from './Pagination';
+import { CardSizeToggle } from './CardSizeToggle';
 
 export interface NftOptionsProps {
   isCollection?: boolean;
@@ -42,16 +46,18 @@ export interface NftOptionsProps {
   className?: string;
   isLoading?: boolean;
   canLoadMore: boolean;
+  total: number;
 }
 
 export function NftOptions({
   isCollection,
-  params: { page, sort, group, showHidden, query },
+  params: { page, sort, group, showHidden, query, pageSize, cardSize },
   setParams,
   multiSelect,
   setMultiSelect,
   className,
   isLoading,
+  total,
   canLoadMore,
 }: NftOptionsProps) {
   const { collection_id, owner_did, minter_did } = useParams();
@@ -69,10 +75,6 @@ export function NftOptions({
     navigate('/nfts');
   };
 
-  // For sort button
-  const sortMode = sort === NftSortMode.Name ? 'name' : 'recent';
-  const sortLabel = t`Sort options: currently sorted by ${sortMode}`;
-
   // For group button
   const groupMode =
     group === NftGroupMode.Collection
@@ -84,6 +86,9 @@ export function NftOptions({
           : 'no grouping';
   const groupLabel = t`Group options: currently grouped by ${groupMode}`;
 
+  // Add view options label
+  const viewLabel = t`View options`;
+
   return (
     <div
       className={`flex flex-col gap-4 ${className}`}
@@ -123,46 +128,19 @@ export function NftOptions({
       </div>
 
       <div className='flex items-center justify-between'>
-        <div
-          className='flex gap-3 items-center'
-          role='navigation'
-          aria-label={t`Pagination`}
-        >
-          <Button
-            variant='outline'
-            size='icon'
-            onClick={() =>
-              !isLoading &&
-              page > 1 &&
-              setParams({ page: Math.max(page - 1, 1) })
-            }
-            disabled={page === 1 || isLoading}
-            aria-label={t`Previous page`}
-            title={t`Previous page`}
-          >
-            <ChevronLeftIcon className='h-4 w-4' aria-hidden='true' />
-          </Button>
-          <p
-            className='text-sm text-muted-foreground font-medium w-[70px] text-center'
-            aria-live='polite'
-            aria-atomic='true'
-          >
-            <Trans>Page {page}</Trans>
-          </p>
-          <Button
-            variant='outline'
-            size='icon'
-            onClick={() => {
-              if (!canLoadMore) return;
-              if (!isLoading) setParams({ page: page + 1 });
-            }}
-            disabled={!canLoadMore || isLoading}
-            aria-label={t`Next page`}
-            title={t`Next page`}
-          >
-            <ChevronRightIcon className='h-4 w-4' aria-hidden='true' />
-          </Button>
-        </div>
+        <Pagination
+          page={page}
+          total={total}
+          pageSize={pageSize}
+          onPageChange={(newPage) => setParams({ page: newPage })}
+          onPageSizeChange={(newSize) =>
+            setParams({ pageSize: newSize, page: 1 })
+          }
+          pageSizeOptions={[24, 48, 72, 96]}
+          compact={true}
+          canLoadMore={canLoadMore}
+          isLoading={isLoading}
+        />
 
         <div
           className='flex gap-2 items-center'
@@ -195,67 +173,105 @@ export function NftOptions({
             />
           </Button>
 
-          <Button
-            variant='outline'
-            size='icon'
-            onClick={() => setParams({ showHidden: !showHidden })}
-            aria-label={
-              showHidden ? t`Hide hidden items` : t`Show hidden items`
-            }
-            title={showHidden ? t`Hide hidden items` : t`Show hidden items`}
-            disabled={
-              !(
-                group === NftGroupMode.None ||
-                isFilteredView ||
-                group === NftGroupMode.Collection
-              )
-            }
-          >
-            {showHidden ? (
-              <EyeIcon className='h-4 w-4' aria-hidden='true' />
-            ) : (
-              <EyeOff className='h-4 w-4' aria-hidden='true' />
-            )}
-          </Button>
-
           <DropdownMenu>
             <DropdownMenuTrigger asChild>
               <Button
                 variant='outline'
                 size='icon'
-                aria-label={sortLabel}
-                title={sortLabel}
-                disabled={!(group === NftGroupMode.None || isFilteredView)}
+                aria-label={viewLabel}
+                title={viewLabel}
               >
-                {sort === NftSortMode.Name ? (
-                  <ArrowDownAz className='h-4 w-4' aria-hidden='true' />
-                ) : (
-                  <Clock2 className='h-4 w-4' aria-hidden='true' />
-                )}
+                <Settings2 className='h-4 w-4' aria-hidden='true' />
               </Button>
             </DropdownMenuTrigger>
             <DropdownMenuContent align='end'>
               <DropdownMenuGroup>
                 <DropdownMenuItem
                   className='cursor-pointer'
-                  onClick={() => setParams({ sort: NftSortMode.Name, page: 1 })}
-                  aria-label={t`Sort by name`}
+                  onClick={() =>
+                    setParams({
+                      cardSize:
+                        cardSize === CardSize.Large
+                          ? CardSize.Small
+                          : CardSize.Large,
+                    })
+                  }
+                  aria-label={
+                    cardSize === CardSize.Large
+                      ? t`Switch to small card size`
+                      : t`Switch to large card size`
+                  }
+                >
+                  {cardSize === CardSize.Large ? (
+                    <Minimize2 className='mr-2 h-4 w-4' aria-hidden='true' />
+                  ) : (
+                    <Maximize2 className='mr-2 h-4 w-4' aria-hidden='true' />
+                  )}
+                  <span>
+                    {cardSize === CardSize.Large ? (
+                      <Trans>Small Cards</Trans>
+                    ) : (
+                      <Trans>Large Cards</Trans>
+                    )}
+                  </span>
+                </DropdownMenuItem>
+
+                <DropdownMenuItem
+                  className='cursor-pointer'
+                  onClick={() => setParams({ showHidden: !showHidden })}
+                  disabled={
+                    !(
+                      group === NftGroupMode.None ||
+                      isFilteredView ||
+                      group === NftGroupMode.Collection
+                    )
+                  }
+                  aria-label={
+                    showHidden ? t`Hide hidden items` : t`Show hidden items`
+                  }
                 >
-                  <ArrowDownAz className='mr-2 h-4 w-4' aria-hidden='true' />
+                  {showHidden ? (
+                    <EyeOff className='mr-2 h-4 w-4' aria-hidden='true' />
+                  ) : (
+                    <EyeIcon className='mr-2 h-4 w-4' aria-hidden='true' />
+                  )}
                   <span>
-                    <Trans>Name</Trans>
+                    {showHidden ? (
+                      <Trans>Hide Hidden Items</Trans>
+                    ) : (
+                      <Trans>Show Hidden Items</Trans>
+                    )}
                   </span>
                 </DropdownMenuItem>
                 <DropdownMenuItem
                   className='cursor-pointer'
                   onClick={() =>
-                    setParams({ sort: NftSortMode.Recent, page: 1 })
+                    setParams({
+                      sort:
+                        sort === NftSortMode.Name
+                          ? NftSortMode.Recent
+                          : NftSortMode.Name,
+                      page: 1,
+                    })
+                  }
+                  disabled={!(group === NftGroupMode.None || isFilteredView)}
+                  aria-label={
+                    sort === NftSortMode.Name
+                      ? t`Switch to sort by recent`
+                      : t`Switch to sort by name`
                   }
-                  aria-label={t`Sort by recent`}
                 >
-                  <Clock2 className='mr-2 h-4 w-4' aria-hidden='true' />
+                  {sort === NftSortMode.Name ? (
+                    <Clock2 className='mr-2 h-4 w-4' aria-hidden='true' />
+                  ) : (
+                    <ArrowDownAz className='mr-2 h-4 w-4' aria-hidden='true' />
+                  )}
                   <span>
-                    <Trans>Recent</Trans>
+                    {sort === NftSortMode.Name ? (
+                      <Trans>Sort by Recent</Trans>
+                    ) : (
+                      <Trans>Sort by Name</Trans>
+                    )}
                   </span>
                 </DropdownMenuItem>
               </DropdownMenuGroup>
diff --git a/src/components/Pagination.tsx b/src/components/Pagination.tsx
index 023a981a..8598d700 100644
--- a/src/components/Pagination.tsx
+++ b/src/components/Pagination.tsx
@@ -7,92 +7,153 @@ import {
   SelectValue,
 } from '@/components/ui/select';
 import { t } from '@lingui/core/macro';
+import { Trans } from '@lingui/react/macro';
 import { Button } from './ui/button';
 import { ChevronRightIcon, ChevronLeftIcon } from '@radix-ui/react-icons';
 
 type PaginationProps = {
   page: number;
-  total: number;
+  total?: number;
+  canLoadMore?: boolean;
+  isLoading?: boolean;
   onPageChange: (page: number) => void;
   pageSize: number;
   onPageSizeChange: (pageSize: number) => void;
+  pageSizeOptions?: number[];
+  compact?: boolean;
 };
 
 export const Pagination = ({
   page,
   total,
+  canLoadMore,
+  isLoading,
   onPageChange,
   pageSize,
   onPageSizeChange,
+  pageSizeOptions = [8, 16, 32, 64],
+  compact = false,
 }: PaginationProps) => {
-  const totalPages = Math.max(1, Math.ceil(total / pageSize));
+  const totalPages = total
+    ? Math.max(1, Math.ceil(total / pageSize))
+    : undefined;
   const isFirstPage = page === 1;
-  const isLastPage = page === totalPages;
+  const isLastPage = totalPages
+    ? page === totalPages
+    : !canLoadMore || isLoading;
 
   return (
-    <div className='flex justify-between flex-wrap gap-2'>
-      <div className='flex items-center justify-start gap-2'>
+    <nav
+      role='navigation'
+      aria-label={t`Pagination`}
+      className='flex justify-between gap-2'
+    >
+      <div
+        className={`flex items-center justify-start ${compact ? 'gap-1 md:gap-3' : 'gap-3'}`}
+      >
         <Button
           size='icon'
           variant='outline'
-          onClick={() => onPageChange(Math.max(1, page - 1))}
+          onClick={() => {
+            if (isFirstPage) return;
+            onPageChange(Math.max(1, page - 1));
+          }}
           disabled={isFirstPage}
-          title={t`Previous page`}
+          aria-label={t`Go to previous page`}
+          aria-disabled={isFirstPage}
         >
-          <ChevronLeftIcon className='h-4 w-4' />
+          <ChevronLeftIcon className='h-4 w-4' aria-hidden='true' />
         </Button>
 
-        <Select
-          onValueChange={(value) => onPageChange(parseInt(value))}
-          defaultValue={page.toString()}
-          value={page.toString()}
-          disabled={totalPages === 1}
-        >
-          <SelectTrigger className='w-min text-sm' title={t`Page`}>
-            <SelectValue placeholder={t`Page`}>
-              {page}/{totalPages}
-            </SelectValue>
-          </SelectTrigger>
-          <SelectContent>
-            {Array.from({ length: totalPages }, (_, i) => (
-              <SelectItem key={i} value={(i + 1).toString()}>
-                {i + 1}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
+        {totalPages ? (
+          <Select
+            onValueChange={(value) => onPageChange(parseInt(value))}
+            defaultValue={page.toString()}
+            value={page.toString()}
+            disabled={totalPages === 1}
+            aria-label={t`Select page number`}
+          >
+            <SelectTrigger
+              className='w-min text-sm'
+              aria-label={t`Current page ${page} of ${totalPages}`}
+            >
+              <SelectValue>
+                {page} / {totalPages}
+              </SelectValue>
+            </SelectTrigger>
+            <SelectContent>
+              {Array.from({ length: totalPages }, (_, i) => (
+                <SelectItem
+                  key={i}
+                  value={(i + 1).toString()}
+                  aria-label={t`Go to page ${i + 1}`}
+                >
+                  {i + 1}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        ) : (
+          <div
+            className='text-sm text-muted-foreground font-medium text-center'
+            aria-live='polite'
+            aria-atomic='true'
+          >
+            <Trans>Page {page}</Trans>
+          </div>
+        )}
 
         <Button
           size='icon'
           variant='outline'
-          onClick={() => onPageChange(Math.min(totalPages, page + 1))}
+          onClick={() => {
+            if (isLastPage) return;
+            onPageChange(Math.min(totalPages ?? Infinity, page + 1));
+          }}
           disabled={isLastPage}
-          title={t`Next page`}
+          aria-label={t`Go to next page`}
+          aria-disabled={isLastPage}
         >
-          <ChevronRightIcon className='h-4 w-4' />
+          <ChevronRightIcon className='h-4 w-4' aria-hidden='true' />
         </Button>
       </div>
 
-      <Select
-        onValueChange={(value) => {
-          onPageChange(1);
-          onPageSizeChange(parseInt(value));
-        }}
-        defaultValue={pageSize.toString()}
-        value={pageSize.toString()}
+      <div
+        className={`${compact ? 'hidden md:flex' : 'flex'} items-center gap-2`}
       >
-        <SelectTrigger className='w-min' title={t`Page size`}>
-          {pageSize}
-        </SelectTrigger>
-        <SelectContent>
-          <SelectGroup>
-            <SelectItem value='8'>8</SelectItem>
-            <SelectItem value='16'>16</SelectItem>
-            <SelectItem value='32'>32</SelectItem>
-            <SelectItem value='64'>64</SelectItem>
-          </SelectGroup>
-        </SelectContent>
-      </Select>
-    </div>
+        <label id='items-per-page-label' className='sr-only'>
+          <Trans>Items per page</Trans>
+        </label>
+        <Select
+          onValueChange={(value) => {
+            onPageChange(1);
+            onPageSizeChange(parseInt(value));
+          }}
+          defaultValue={pageSize.toString()}
+          value={pageSize.toString()}
+          aria-labelledby='items-per-page-label'
+        >
+          <SelectTrigger
+            className='w-min'
+            aria-label={t`${pageSize} items per page`}
+          >
+            {pageSize}
+          </SelectTrigger>
+          <SelectContent>
+            <SelectGroup>
+              {pageSizeOptions.map((size) => (
+                <SelectItem
+                  key={size}
+                  value={size.toString()}
+                  aria-label={t`Show ${size} items per page`}
+                >
+                  {size}
+                </SelectItem>
+              ))}
+            </SelectGroup>
+          </SelectContent>
+        </Select>
+      </div>
+    </nav>
   );
 };
diff --git a/src/hooks/useNftData.ts b/src/hooks/useNftData.ts
index 2b783c99..10221924 100644
--- a/src/hooks/useNftData.ts
+++ b/src/hooks/useNftData.ts
@@ -24,10 +24,15 @@ interface NftDataParams {
 interface NftDataState {
   nfts: NftRecord[];
   collections: NftCollectionRecord[];
-  dids: DidRecord[];
+  ownerDids: DidRecord[];
+  minterDids: DidRecord[];
   owner: DidRecord | null;
   collection: NftCollectionRecord | null;
   isLoading: boolean;
+  nftTotal: number;
+  collectionTotal: number;
+  ownerDidsTotal: number;
+  minterDidsTotal: number;
 }
 
 // Helper function moved from NftList
@@ -50,10 +55,15 @@ export function useNftData(params: NftDataParams) {
   const [state, setState] = useState<NftDataState>({
     nfts: [],
     collections: [],
-    dids: [],
+    ownerDids: [],
+    minterDids: [],
     owner: null,
     collection: null,
     isLoading: false,
+    nftTotal: 0,
+    collectionTotal: 0,
+    ownerDidsTotal: 0,
+    minterDidsTotal: 0,
   });
 
   const updateNfts = useCallback(
@@ -88,6 +98,7 @@ export function useNftData(params: NftDataParams) {
 
           const updates: Partial<NftDataState> = {
             nfts: response.nfts,
+            nftTotal: response.total,
           };
 
           if (params.collectionId) {
@@ -120,25 +131,72 @@ export function useNftData(params: NftDataParams) {
               limit: params.pageSize,
               include_hidden: params.showHidden,
             });
+
+            const collections = response.collections;
+
+            // Add No Collection to the end if we're on the last page and there's room
+            if (
+              collections.length < params.pageSize &&
+              page === Math.ceil((response.total + 1) / params.pageSize)
+            ) {
+              collections.push({
+                name: 'No Collection',
+                icon: '',
+                did_id: 'Miscellaneous',
+                metadata_collection_id: 'Uncategorized NFTs',
+                collection_id: 'No collection',
+                visible: true,
+              });
+            }
+
             setState((prev) => ({
               ...prev,
-              collections: response.collections,
+              collections,
+              collectionTotal: response.total + 1, // Add 1 for No Collection
             }));
           } catch (error: any) {
-            setState((prev) => ({ ...prev, collections: [] }));
+            setState((prev) => ({
+              ...prev,
+              collections: [],
+              collectionTotal: 0,
+            }));
             addError(error);
           }
         } else if (params.group === NftGroupMode.OwnerDid) {
           try {
             const response = await commands.getDids({});
-            setState((prev) => ({ ...prev, dids: response.dids }));
+            const ownerDids = response.dids;
+
+            // Add Unassigned NFTs to the end if there's room on the last page
+            if (
+              ownerDids.length < params.pageSize &&
+              page === Math.ceil((ownerDids.length + 1) / params.pageSize)
+            ) {
+              ownerDids.push(
+                createDefaultDidRecord('Unassigned NFTs', 'No did'),
+              );
+            }
+
+            setState((prev) => ({
+              ...prev,
+              ownerDids,
+              ownerDidsTotal: response.dids.length + 1, // Add 1 for Unassigned NFTs
+            }));
           } catch (error: any) {
-            setState((prev) => ({ ...prev, dids: [] }));
+            setState((prev) => ({
+              ...prev,
+              ownerDids: [],
+              ownerDidsTotal: 0,
+            }));
             addError(error);
           }
         } else if (params.group === NftGroupMode.MinterDid) {
           try {
-            const uniqueMinterDids = await commands.getMinterDidIds({});
+            const uniqueMinterDids = await commands.getMinterDidIds({
+              limit: params.pageSize,
+              offset: (page - 1) * params.pageSize,
+            });
+
             const minterDids: DidRecord[] = uniqueMinterDids.did_ids.map(
               (did) =>
                 createDefaultDidRecord(
@@ -146,9 +204,28 @@ export function useNftData(params: NftDataParams) {
                   did,
                 ),
             );
-            setState((prev) => ({ ...prev, dids: minterDids }));
+
+            // Add Unknown Minter to the end of the list if we're on the last page
+            if (
+              minterDids.length < params.pageSize &&
+              page === Math.ceil((uniqueMinterDids.total + 1) / params.pageSize)
+            ) {
+              minterDids.push(
+                createDefaultDidRecord('Unknown Minter', 'No did'),
+              );
+            }
+
+            setState((prev) => ({
+              ...prev,
+              minterDids,
+              minterDidsTotal: uniqueMinterDids.total + 1, // Add 1 for Unknown Minter
+            }));
           } catch (error: any) {
-            setState((prev) => ({ ...prev, dids: [] }));
+            setState((prev) => ({
+              ...prev,
+              minterDids: [],
+              minterDidsTotal: 0,
+            }));
             addError(error);
           }
         }
@@ -178,7 +255,8 @@ export function useNftData(params: NftDataParams) {
       ...prev,
       nfts: [],
       collections: [],
-      dids: [],
+      ownerDids: [],
+      minterDids: [],
       collection: null,
       owner: null,
     }));
@@ -209,8 +287,43 @@ export function useNftData(params: NftDataParams) {
     };
   }, [updateNfts, params.page]);
 
+  // Helper function to get the correct total based on current view
+  const getTotal = useCallback(() => {
+    if (
+      params.collectionId ||
+      params.ownerDid ||
+      params.minterDid ||
+      params.group === NftGroupMode.None
+    ) {
+      return state.nftTotal;
+    } else if (params.group === NftGroupMode.Collection) {
+      return state.collectionTotal;
+    } else if (params.group === NftGroupMode.OwnerDid) {
+      return state.ownerDidsTotal;
+    } else if (params.group === NftGroupMode.MinterDid) {
+      return state.minterDidsTotal;
+    }
+    return 0;
+  }, [
+    params.collectionId,
+    params.ownerDid,
+    params.minterDid,
+    params.group,
+    state.nftTotal,
+    state.collectionTotal,
+    state.ownerDidsTotal,
+    state.minterDidsTotal,
+  ]);
+
   return {
-    ...state,
+    nfts: state.nfts,
+    collections: state.collections,
+    ownerDids: state.ownerDids,
+    minterDids: state.minterDids,
+    owner: state.owner,
+    collection: state.collection,
+    isLoading: state.isLoading,
+    total: getTotal(),
     updateNfts,
   };
 }
diff --git a/src/hooks/useNftParams.ts b/src/hooks/useNftParams.ts
index 4c1699c7..342713c4 100644
--- a/src/hooks/useNftParams.ts
+++ b/src/hooks/useNftParams.ts
@@ -5,6 +5,8 @@ import { useCallback, useMemo } from 'react';
 const NFT_HIDDEN_STORAGE_KEY = 'sage-wallet-nft-hidden';
 const NFT_GROUP_STORAGE_KEY = 'sage-wallet-nft-group';
 const NFT_SORT_STORAGE_KEY = 'sage-wallet-nft-sort';
+const NFT_PAGE_SIZE_STORAGE_KEY = 'sage-wallet-nft-page-size';
+const NFT_CARD_SIZE_STORAGE_KEY = 'sage-wallet-nft-card-size';
 
 export enum NftView {
   Name = 'name',
@@ -25,6 +27,11 @@ export enum NftGroupMode {
   MinterDid = 'minter_did',
 }
 
+export enum CardSize {
+  Large = 'large',
+  Small = 'small',
+}
+
 export interface NftParams {
   pageSize: number;
   page: number;
@@ -32,6 +39,7 @@ export interface NftParams {
   group: NftGroupMode;
   showHidden: boolean;
   query: string | null;
+  cardSize: CardSize;
 }
 
 export type SetNftParams = (params: Partial<NftParams>) => void;
@@ -50,17 +58,26 @@ export function useNftParams(): [NftParams, SetNftParams] {
     NFT_GROUP_STORAGE_KEY,
     NftGroupMode.None,
   );
+  const [pageSize, setPageSize] = useLocalStorage<number>(
+    NFT_PAGE_SIZE_STORAGE_KEY,
+    24,
+  );
+  const [cardSize, setCardSize] = useLocalStorage<CardSize>(
+    NFT_CARD_SIZE_STORAGE_KEY,
+    CardSize.Large,
+  );
 
   const params = useMemo(
     () => ({
-      pageSize: 24,
+      pageSize,
       page: Number(searchParams.get('page') || 1),
       sort: view,
       group,
       showHidden,
       query: searchParams.get('query'),
+      cardSize,
     }),
-    [searchParams, view, group, showHidden],
+    [searchParams, view, group, showHidden, pageSize, cardSize],
   );
 
   const setParams = useCallback(
@@ -79,6 +96,14 @@ export function useNftParams(): [NftParams, SetNftParams] {
         setGroup(newParams.group);
       }
 
+      if (newParams.pageSize !== undefined) {
+        setPageSize(newParams.pageSize);
+      }
+
+      if (newParams.cardSize !== undefined) {
+        setCardSize(newParams.cardSize);
+      }
+
       setSearchParams(
         {
           ...(updatedParams.page > 1 && {
@@ -89,7 +114,15 @@ export function useNftParams(): [NftParams, SetNftParams] {
         { replace: true },
       );
     },
-    [params, setSearchParams, setView, setShowHidden, setGroup],
+    [
+      params,
+      setSearchParams,
+      setView,
+      setShowHidden,
+      setGroup,
+      setPageSize,
+      setCardSize,
+    ],
   );
 
   return [params, setParams];
diff --git a/src/pages/NftList.tsx b/src/pages/NftList.tsx
index 8fd157d3..ce43dbe6 100644
--- a/src/pages/NftList.tsx
+++ b/src/pages/NftList.tsx
@@ -27,18 +27,27 @@ export function NftList() {
   const [multiSelect, setMultiSelect] = useState(false);
   const [selected, setSelected] = useState<string[]>([]);
   const { addError } = useErrors();
-  const { nfts, collections, dids, owner, collection, isLoading, updateNfts } =
-    useNftData({
-      pageSize,
-      sort,
-      group,
-      showHidden,
-      query,
-      collectionId,
-      ownerDid,
-      minterDid,
-      page: params.page,
-    });
+  const {
+    nfts,
+    collections,
+    ownerDids,
+    minterDids,
+    owner,
+    collection,
+    isLoading,
+    updateNfts,
+    total,
+  } = useNftData({
+    pageSize,
+    sort,
+    group,
+    showHidden,
+    query,
+    collectionId,
+    ownerDid,
+    minterDid,
+    page: params.page,
+  });
 
   // Reset multi-select when route changes
   useEffect(() => {
@@ -47,15 +56,17 @@ export function NftList() {
   }, [collectionId, ownerDid, minterDid, group]);
 
   const canLoadMore = useCallback(() => {
+    // If we're grouping by collection, or filtering by collection,owner,
+    // or minter, use the total number of nfts in the current page
+    // otherwise use the appropriate grouping list length
     if (collectionId || ownerDid || minterDid || group === NftGroupMode.None) {
       return nfts.length === pageSize;
     } else if (group === NftGroupMode.Collection) {
       return collections.length === pageSize;
-    } else if (
-      group === NftGroupMode.OwnerDid ||
-      group === NftGroupMode.MinterDid
-    ) {
-      return dids.length === pageSize;
+    } else if (group === NftGroupMode.OwnerDid) {
+      return ownerDids.length === pageSize;
+    } else if (group === NftGroupMode.MinterDid) {
+      return minterDids.length === pageSize;
     }
     return false;
   }, [
@@ -65,7 +76,8 @@ export function NftList() {
     group,
     nfts.length,
     collections.length,
-    dids.length,
+    ownerDids.length,
+    minterDids.length,
     pageSize,
   ]);
 
@@ -105,6 +117,7 @@ export function NftList() {
           }}
           className='mt-4'
           isLoading={isLoading}
+          total={total}
           canLoadMore={canLoadMore()}
           aria-live='polite'
         />
@@ -117,14 +130,15 @@ export function NftList() {
             group={group}
             nfts={nfts}
             collections={collections}
-            dids={dids}
-            pageSize={pageSize}
+            ownerDids={ownerDids}
+            minterDids={minterDids}
             updateNfts={updateNfts}
             page={params.page}
             multiSelect={multiSelect}
             selected={selected}
             setSelected={setSelected}
             addError={addError}
+            cardSize={params.cardSize}
           />
         </main>
       </Container>