diff --git a/src/gpreview.css b/src/gpreview.css
index fc2ad40..38c0650 100644
--- a/src/gpreview.css
+++ b/src/gpreview.css
@@ -297,70 +297,125 @@ body {
 /* ─── Image Grid ─── */
 .image-grid {
   display: grid;
-  grid-template-columns: repeat(2, 1fr);
   gap: var(--space-2);
   border-radius: var(--radius-md);
   overflow: hidden;
-  margin-top: var(--space-4);
-  border: 1px solid var(--border);
+  margin-top: var(--space-3);
 }
-
+.image-grid--1 { grid-template-columns: 1fr; }
+.image-grid--2 { grid-template-columns: 1fr 1fr; }
+.image-grid--3 {
+  grid-template-columns: 1fr 1fr;
+  grid-template-rows: 1fr 1fr;
+}
+.image-grid--3 img:first-child {
+  grid-row: 1 / 3;
+}
+.image-grid--4 { grid-template-columns: 1fr 1fr; }
 .image-grid img {
   width: 100%;
-  height: auto;
+  height: 100%;
   object-fit: cover;
   outline: 1px solid var(--surface1);
   transition: transform var(--duration-normal) var(--ease-out),
               filter var(--duration-normal) var(--ease-out);
 }
-
 .image-grid img:hover {
   transform: scale(1.02);
   filter: brightness(1.1);
 }
 
-/* ─── Link Card ─── */
-.link-card {
-  display: block;
-  background: var(--surface1);
+/* ─── External Link Card ─── */
+.external-link-card {
+  display: flex;
+  flex-direction: column;
   border: 1px solid var(--border);
-  border-radius: var(--radius-md);
+  border-radius: var(--radius-lg);
   overflow: hidden;
   text-decoration: none;
-  transition: transform var(--duration-normal) var(--ease-spring),
-              border-color var(--duration-fast) var(--ease-out),
-              background-color var(--duration-fast) var(--ease-out);
+  color: inherit;
+  transition: background-color var(--duration-normal) var(--ease-out);
+  margin-top: var(--space-3);
 }
-
-.link-card:hover {
-  transform: translateY(-2px);
-  border-color: var(--blue);
-  background-color: var(--surface2);
+.external-link-card:hover {
+  background-color: var(--surface1);
 }
-
-.external-link-preview {
-  padding: var(--space-4);
+.external-link-card__thumb {
+  width: 100%;
+  height: 200px;
+  object-fit: cover;
 }
-
-.external-link-title {
+.external-link-card__content {
+  padding: var(--space-3);
+}
+.external-link-card__title {
   font-family: var(--font-display);
   font-weight: 600;
-  color: var(--text);
   font-size: 0.95rem;
   line-height: 1.4;
   margin-bottom: var(--space-1);
-  text-wrap: balance;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
-
-.external-link-desc {
-  font-size: 0.85rem;
-  color: var(--subtext1);
+.external-link-card__desc {
+  font-size: 0.875rem;
+  color: var(--text-muted);
   line-height: 1.5;
+  margin-bottom: var(--space-2);
   display: -webkit-box;
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
   overflow: hidden;
 }
+.external-link-card__domain {
+  font-size: 0.75rem;
+  color: var(--text-muted);
+}
+
+/* ─── Quote Post ─── */
+.quote-post {
+  border: 1px solid var(--border);
+  border-radius: var(--radius-lg);
+  padding: var(--space-3);
+  margin-top: var(--space-3);
+  background: var(--surface1);
+}
+.quote-post--stub {
+  opacity: 0.8;
+  font-style: italic;
+}
+.quote-post__header {
+  display: flex;
+  gap: var(--space-2);
+  margin-bottom: var(--space-2);
+  align-items: baseline;
+  flex-wrap: wrap;
+}
+.quote-post__author {
+  font-family: var(--font-display);
+  font-weight: 600;
+  font-size: 0.9rem;
+}
+.quote-post__handle {
+  font-size: 0.8rem;
+  color: var(--text-muted);
+  word-break: break-all;
+}
+.quote-post__text {
+  font-size: 0.9rem;
+  line-height: 1.5;
+  color: var(--text);
+  margin: 0;
+}
+
+/* ─── Record with Media ─── */
+.record-with-media {
+  display: flex;
+  flex-direction: column;
+  gap: var(--space-3);
+  margin-top: var(--space-3);
+}
 
 /* ─── Post Footer ─── */
 .post-footer {
@@ -372,25 +427,6 @@ body {
   border-top: 1px solid var(--border);
 }
 
-/* ─── Engagement Bar ─── */
-.engagement-bar {
-  display: flex;
-  align-items: center;
-  gap: var(--space-3);
-}
-
-.engagement-bar__likes {
-  color: var(--mauve);
-}
-
-.engagement-bar__reposts {
-  color: var(--green);
-}
-
-.engagement-bar__replies {
-  color: var(--blue);
-}
-
 /* ─── Footer Badges & Timestamp ─── */
 .post-footer__badges {
   display: flex;
@@ -597,10 +633,7 @@ body {
   }
 }
 
-/* ─── Utility ─── */
-.tabular-nums {
-  font-variant-numeric: tabular-nums;
-}
+
 
 /* ─── Error Badge ─── */
 .error-badge {
@@ -876,11 +909,6 @@ body {
   color: var(--subtext0);
 }
 
-.feed-item__engagement {
-  font-size: 0.85rem;
-  color: var(--subtext1);
-}
-
 /* ─── Error Message ─── */
 .error-message {
   color: var(--red);
diff --git a/src/gpreview.gleam b/src/gpreview.gleam
index 444114f..ae55da6 100644
--- a/src/gpreview.gleam
+++ b/src/gpreview.gleam
@@ -85,10 +85,6 @@ pub fn update(model: Model, msg: Msg) -> #(Model, Effect(Msg)) {
             cid: r.cid,
             text: r.value.text,
             created_at: r.value.created_at,
-            reply_count: option.None,
-            repost_count: option.None,
-            like_count: option.None,
-            quote_count: option.None,
             embed: r.value.embed,
           )
         })
@@ -159,7 +155,7 @@ fn friendly_error_message(e: rsvp.Error, context: String) -> String {
     rsvp.BadBody -> "Invalid response from server. Please try again."
     rsvp.JsonError(details) ->
       "Failed to parse post data: "
-      <> types.json_decode_error_to_string(details)
+      <> types.error_to_string(rsvp.JsonError(details))
     rsvp.UnhandledResponse(_) ->
       "Service temporarily unavailable. Please try again."
   }
diff --git a/src/gpreview/types.gleam b/src/gpreview/types.gleam
index ea0de7b..31b646d 100644
--- a/src/gpreview/types.gleam
+++ b/src/gpreview/types.gleam
@@ -20,10 +20,6 @@ pub type Post {
     cid: String,
     text: String,
     created_at: String,
-    reply_count: Option(Int),
-    repost_count: Option(Int),
-    like_count: Option(Int),
-    quote_count: Option(Int),
     embed: Option(decoders.Embed),
   )
 }
diff --git a/src/gpreview/views.gleam b/src/gpreview/views.gleam
index dda9aa5..cfc5451 100644
--- a/src/gpreview/views.gleam
+++ b/src/gpreview/views.gleam
@@ -19,7 +19,7 @@ pub fn view(model: Model) -> Element(Msg) {
     render_input_zone(model),
     html.div([attribute.attribute("class", "main-content")], [
       render_profile_card(model.profile_state, model.identity),
-      render_feed(model.feed_state),
+      render_feed(model.feed_state, model.identity),
     ]),
   ])
 }
@@ -283,11 +283,14 @@ fn format_timestamp(iso_timestamp: String) -> String {
   }
 }
 
-pub fn render_feed(feed_state: FeedState) -> Element(Msg) {
+pub fn render_feed(
+  feed_state: FeedState,
+  identity: Option(Identity),
+) -> Element(Msg) {
   case feed_state {
     FeedEmpty -> html.div([attribute.attribute("class", "feed-container")], [])
     FeedLoading -> feed_loading_skeleton()
-    FeedLoaded(posts) -> render_feed_loaded(posts)
+    FeedLoaded(posts) -> render_feed_loaded(posts, identity)
     FeedFailed(error) -> feed_error_state(error)
   }
 }
@@ -344,95 +347,133 @@ fn feed_item_skeleton(index: Int) -> Element(Msg) {
   )
 }
 
-fn render_feed_loaded(posts: List(Post)) -> Element(Msg) {
+fn render_feed_loaded(
+  posts: List(Post),
+  identity: Option(Identity),
+) -> Element(Msg) {
   let elements =
     posts
-    |> list.index_map(fn(post, index) { render_feed_item(post, index) })
+    |> list.index_map(fn(post, index) {
+      render_feed_item(post, index, identity)
+    })
 
   html.div([attribute.attribute("class", "feed-container")], elements)
 }
 
-fn render_post_embed(embed: Option(decoders.Embed)) -> Element(Msg) {
-  case embed {
-    None -> html.div([], [])
-    Some(decoders.Images(images)) -> {
-      let image_elements =
-        images
-        |> list.map(fn(img) {
-          html.img([
-            attribute.attribute("src", img.ref),
-            attribute.attribute("alt", img.alt),
-            attribute.attribute("class", "post-image"),
-          ])
-        })
-      html.div(
-        [attribute.attribute("class", "post-embed post-embed--images")],
-        image_elements,
-      )
-    }
-    Some(decoders.ExternalLink(ext)) -> {
-      html.div(
-        [attribute.attribute("class", "post-embed post-embed--external")],
-        [
-          html.a(
-            [
-              attribute.attribute("href", ext.uri),
-              attribute.attribute("class", "external-link"),
-              attribute.attribute("target", "_blank"),
-              attribute.attribute("rel", "noopener noreferrer"),
-            ],
-            [
-              html.h4([attribute.attribute("class", "external-link__title")], [
-                html.text(ext.title),
-              ]),
-              html.p(
-                [attribute.attribute("class", "external-link__description")],
-                [html.text(ext.description)],
-              ),
-            ],
-          ),
-        ],
-      )
-    }
-    Some(decoders.Record(record)) -> {
-      html.div([attribute.attribute("class", "post-embed post-embed--record")], [
-        html.div([attribute.attribute("class", "record-embed")], [
-          html.p([attribute.attribute("class", "record-embed__uri")], [
-            html.text("Record: " <> record.record.uri),
-          ]),
+fn render_external_link_card(external: decoders.ExternalJson) -> Element(Msg) {
+  html.a(
+    [
+      attribute.attribute("href", external.uri),
+      attribute.attribute("class", "external-link-card"),
+      attribute.attribute("target", "_blank"),
+      attribute.attribute("rel", "noopener noreferrer"),
+    ],
+    [
+      case external.description {
+        "" -> element.none()
+        _ -> element.none()
+      },
+      html.div([attribute.attribute("class", "external-link-card__content")], [
+        html.h4([attribute.attribute("class", "external-link-card__title")], [
+          html.text(external.title),
         ]),
-      ])
-    }
-    Some(decoders.RecordWithMedia(media)) -> {
-      html.div(
-        [
-          attribute.attribute(
-            "class",
-            "post-embed post-embed--record-with-media",
-          ),
-        ],
-        [
-          html.div([attribute.attribute("class", "record-embed")], [
-            html.p([attribute.attribute("class", "record-embed__uri")], [
-              html.text("Record: " <> media.record.record.uri),
-            ]),
-          ]),
-          html.div([attribute.attribute("class", "external-link")], [
-            html.h4([attribute.attribute("class", "external-link__title")], [
-              html.text(media.media.title),
-            ]),
-            html.p(
-              [attribute.attribute("class", "external-link__description")],
-              [html.text(media.media.description)],
-            ),
-          ]),
-        ],
-      )
+        html.p([attribute.attribute("class", "external-link-card__desc")], [
+          html.text(external.description),
+        ]),
+        html.span([attribute.attribute("class", "external-link-card__domain")], [
+          html.text(extract_domain(external.uri)),
+        ]),
+      ]),
+    ],
+  )
+}
+
+fn extract_domain(uri: String) -> String {
+  case string.split(uri, "://") {
+    [_, rest, ..] -> {
+      case string.split(rest, "/") {
+        [domain, ..] -> domain
+        _ -> uri
+      }
     }
+    _ -> uri
   }
 }
 
-fn render_feed_item(post: Post, index: Int) -> Element(Msg) {
+fn render_image_grid(
+  images: List(decoders.ImageJson),
+  pds: String,
+  did: String,
+) -> Element(Msg) {
+  let count = list.length(images)
+  let grid_class = "image-grid image-grid--" <> int.to_string(count)
+  let image_elements =
+    images
+    |> list.map(fn(img) {
+      let src =
+        pds
+        <> "/xrpc/com.atproto.sync.getBlob?did="
+        <> did
+        <> "&cid="
+        <> img.ref
+      html.img([
+        attribute.attribute("src", src),
+        attribute.attribute("alt", img.alt),
+        attribute.attribute("referrerpolicy", "no-referrer"),
+      ])
+    })
+  html.div([attribute.attribute("class", grid_class)], image_elements)
+}
+
+fn render_quote_post(record: decoders.EmbedRecordJson) -> Element(Msg) {
+  html.div([attribute.attribute("class", "quote-post")], [
+    html.div([attribute.attribute("class", "quote-post__header")], [
+      html.span([attribute.attribute("class", "quote-post__author")], [
+        html.text("Quoted Post"),
+      ]),
+      html.span([attribute.attribute("class", "quote-post__handle")], [
+        html.text(extract_handle_from_uri(record.record.uri)),
+      ]),
+    ]),
+  ])
+}
+
+fn render_record_with_media(rwm: decoders.EmbedRecordWithMedia) -> Element(Msg) {
+  html.div([attribute.attribute("class", "record-with-media")], [
+    render_quote_post(rwm.record),
+    render_external_link_card(rwm.media),
+  ])
+}
+
+fn extract_handle_from_uri(uri: String) -> String {
+  // Extract handle from AT URI like at://did:plc:xxx/app.bsky.feed.post/yyy
+  // or from a handle-based URI
+  case string.split(uri, "/") {
+    [_, _, did_or_handle, ..] -> did_or_handle
+    _ -> uri
+  }
+}
+
+fn render_post_embed(
+  embed: Option(decoders.Embed),
+  identity: Option(Identity),
+) -> Element(Msg) {
+  case embed, identity {
+    Some(decoders.Images(images)), Some(identity) ->
+      render_image_grid(images, identity.pds, identity.did)
+    Some(decoders.ExternalLink(external)), _ ->
+      render_external_link_card(external)
+    Some(decoders.Record(record)), _ -> render_quote_post(record)
+    Some(decoders.RecordWithMedia(rwm)), _ -> render_record_with_media(rwm)
+    _, _ -> html.div([], [])
+  }
+}
+
+fn render_feed_item(
+  post: Post,
+  index: Int,
+  identity: Option(Identity),
+) -> Element(Msg) {
   let stagger_class = "stagger-" <> int.to_string({ index % 5 } + 1)
   let display_text = case string.is_empty(post.text) {
     True -> "[No text]"
@@ -447,24 +488,12 @@ fn render_feed_item(post: Post, index: Int) -> Element(Msg) {
         html.p([attribute.attribute("class", "feed-item__text")], [
           html.text(display_text),
         ]),
-        render_post_embed(post.embed),
+        render_post_embed(post.embed, identity),
       ]),
       html.div([attribute.attribute("class", "feed-item__footer")], [
         html.span([attribute.attribute("class", "feed-item__timestamp")], [
           html.text(format_timestamp(post.created_at)),
         ]),
-        html.span(
-          [attribute.attribute("class", "feed-item__engagement tabular-nums")],
-          [
-            html.text("♥ " <> int.to_string(option.unwrap(post.like_count, 0))),
-            html.text(
-              "  ↗ " <> int.to_string(option.unwrap(post.repost_count, 0)),
-            ),
-            html.text(
-              "  💬 " <> int.to_string(option.unwrap(post.reply_count, 0)),
-            ),
-          ],
-        ),
       ]),
     ],
   )
diff --git a/test/gpreview_test.gleam b/test/gpreview_test.gleam
index 50b0b8f..6105de1 100644
--- a/test/gpreview_test.gleam
+++ b/test/gpreview_test.gleam
@@ -6,7 +6,7 @@ import gleeunit
 import gleeunit/should
 import gpreview/effects
 import gpreview/types.{
-  FeedFailed, FeedLoaded, FeedLoading, InputChanged, App, Post, ProfileFailed,
+  App, FeedFailed, FeedLoaded, FeedLoading, InputChanged, Post, ProfileFailed,
   ProfileLoaded, ProfileLoading, RetryFetch, SubmitInput,
 }
 
@@ -77,10 +77,6 @@ pub fn state_management_loaded_contains_data_test() {
       cid: "cid1",
       text: "Hello",
       created_at: "2024-01-01T00:00:00Z",
-      reply_count: option.Some(1),
-      repost_count: option.Some(2),
-      like_count: option.Some(3),
-      quote_count: option.Some(0),
       embed: option.None,
     ),
   ]
diff --git a/test/views_test.gleam b/test/views_test.gleam
index 590986c..b250df0 100644
--- a/test/views_test.gleam
+++ b/test/views_test.gleam
@@ -5,7 +5,7 @@ import gleeunit
 import gleeunit/should
 import gpreview/types.{
   type Model, type Post, App, FeedEmpty, FeedFailed, FeedLoaded, FeedLoading,
-  Post, ProfileEmpty, ProfileFailed, ProfileLoaded, ProfileLoading,
+  Identity, Post, ProfileEmpty, ProfileFailed, ProfileLoaded, ProfileLoading,
 }
 import gpreview/views.{render_feed, render_input_zone, render_profile_card, view}
 import lustre/element.{to_string}
@@ -30,10 +30,6 @@ fn sample_post() -> Post {
     cid: "cid123",
     text: "Hello from Bluesky!",
     created_at: "2024-01-15T10:30:00.000Z",
-    reply_count: option.Some(5),
-    repost_count: option.Some(3),
-    like_count: option.Some(10),
-    quote_count: option.Some(2),
     embed: option.None,
   )
 }
@@ -104,13 +100,13 @@ pub fn profile_card_error_renders_error_and_retry_test() {
 // === Feed tests ===
 
 pub fn feed_empty_renders_nothing_test() {
-  let html = render_feed(FeedEmpty) |> to_string
+  let html = render_feed(FeedEmpty, option.None) |> to_string
   string.contains(html, "feed-container") |> should.be_true()
   string.contains(html, "feed-item") |> should.be_false()
 }
 
 pub fn feed_loading_renders_skeletons_test() {
-  let html = render_feed(FeedLoading) |> to_string
+  let html = render_feed(FeedLoading, option.None) |> to_string
   string.contains(html, "feed-container") |> should.be_true()
   string.contains(html, "skeleton") |> should.be_true()
   string.contains(html, "Loading posts") |> should.be_true()
@@ -118,16 +114,13 @@ pub fn feed_loading_renders_skeletons_test() {
 
 pub fn feed_loaded_renders_posts_test() {
   let posts = [sample_post()]
-  let html = render_feed(FeedLoaded(posts)) |> to_string
+  let html = render_feed(FeedLoaded(posts), option.None) |> to_string
   string.contains(html, "Hello from Bluesky!") |> should.be_true()
-  string.contains(html, "♥ 10") |> should.be_true()
-  string.contains(html, "↗ 3") |> should.be_true()
-  string.contains(html, "💬 5") |> should.be_true()
 }
 
 pub fn feed_loaded_renders_multiple_posts_test() {
   let posts = [sample_post(), sample_post()]
-  let html = render_feed(FeedLoaded(posts)) |> to_string
+  let html = render_feed(FeedLoaded(posts), option.None) |> to_string
   string.contains(html, "Hello from Bluesky!") |> should.be_true()
   // Should have stagger classes for multiple posts
   string.contains(html, "stagger-1") |> should.be_true()
@@ -135,7 +128,7 @@ pub fn feed_loaded_renders_multiple_posts_test() {
 }
 
 pub fn feed_error_renders_error_and_retry_test() {
-  let html = render_feed(FeedFailed("Network error")) |> to_string
+  let html = render_feed(FeedFailed("Network error"), option.None) |> to_string
   string.contains(html, "Network error") |> should.be_true()
   string.contains(html, "Retry") |> should.be_true()
 }
@@ -213,10 +206,6 @@ pub fn post_with_images_embed_test() {
       cid: "cid1",
       text: "Post with image",
       created_at: "2024-01-01T00:00:00Z",
-      reply_count: option.None,
-      repost_count: option.None,
-      like_count: option.None,
-      quote_count: option.None,
       embed: option.Some(
         decoders.Images([
           decoders.ImageJson(
@@ -227,7 +216,14 @@ pub fn post_with_images_embed_test() {
         ]),
       ),
     )
-  let html = render_feed(FeedLoaded([post])) |> to_string
+  let identity =
+    option.Some(Identity(
+      "did:plc:abc",
+      "test.bsky.social",
+      "https://bsky.social",
+      "key123",
+    ))
+  let html = render_feed(FeedLoaded([post]), identity) |> to_string
   string.contains(html, "Post with image") |> should.be_true()
 }
 
@@ -238,10 +234,6 @@ pub fn post_with_external_link_embed_test() {
       cid: "cid1",
       text: "Check this link",
       created_at: "2024-01-01T00:00:00Z",
-      reply_count: option.None,
-      repost_count: option.None,
-      like_count: option.None,
-      quote_count: option.None,
       embed: option.Some(
         decoders.ExternalLink(decoders.ExternalJson(
           uri: "https://example.com",
@@ -250,7 +242,7 @@ pub fn post_with_external_link_embed_test() {
         )),
       ),
     )
-  let html = render_feed(FeedLoaded([post])) |> to_string
+  let html = render_feed(FeedLoaded([post]), option.None) |> to_string
   string.contains(html, "Check this link") |> should.be_true()
 }
 
@@ -261,10 +253,6 @@ pub fn post_with_record_embed_test() {
       cid: "cid1",
       text: "Quoting a post",
       created_at: "2024-01-01T00:00:00Z",
-      reply_count: option.None,
-      repost_count: option.None,
-      like_count: option.None,
-      quote_count: option.None,
       embed: option.Some(
         decoders.Record(
           decoders.EmbedRecordJson(record: decoders.StrongRefJson(
@@ -274,7 +262,14 @@ pub fn post_with_record_embed_test() {
         ),
       ),
     )
-  let html = render_feed(FeedLoaded([post])) |> to_string
+  let identity =
+    option.Some(Identity(
+      "did:plc:abc",
+      "test.bsky.social",
+      "https://bsky.social",
+      "key123",
+    ))
+  let html = render_feed(FeedLoaded([post]), identity) |> to_string
   string.contains(html, "Quoting a post") |> should.be_true()
 }
 
@@ -285,10 +280,6 @@ pub fn post_with_record_with_media_embed_test() {
       cid: "cid1",
       text: "Quote with media",
       created_at: "2024-01-01T00:00:00Z",
-      reply_count: option.None,
-      repost_count: option.None,
-      like_count: option.None,
-      quote_count: option.None,
       embed: option.Some(
         decoders.RecordWithMedia(decoders.EmbedRecordWithMedia(
           record: decoders.EmbedRecordJson(record: decoders.StrongRefJson(
@@ -303,7 +294,14 @@ pub fn post_with_record_with_media_embed_test() {
         )),
       ),
     )
-  let html = render_feed(FeedLoaded([post])) |> to_string
+  let identity =
+    option.Some(Identity(
+      "did:plc:abc",
+      "test.bsky.social",
+      "https://bsky.social",
+      "key123",
+    ))
+  let html = render_feed(FeedLoaded([post]), identity) |> to_string
   string.contains(html, "Quote with media") |> should.be_true()
 }
 
@@ -317,13 +315,9 @@ pub fn feed_truncates_long_posts_test() {
       cid: "cid1",
       text: long_text,
       created_at: "2024-01-01T00:00:00Z",
-      reply_count: option.None,
-      repost_count: option.None,
-      like_count: option.None,
-      quote_count: option.None,
       embed: option.None,
     )
-  let html = render_feed(FeedLoaded([post])) |> to_string
+  let html = render_feed(FeedLoaded([post]), option.None) |> to_string
   string.contains(html, "...") |> should.be_true()
 }
 
@@ -334,12 +328,302 @@ pub fn feed_handles_empty_post_text_test() {
       cid: "cid1",
       text: "",
       created_at: "2024-01-01T00:00:00Z",
-      reply_count: option.None,
-      repost_count: option.None,
-      like_count: option.None,
-      quote_count: option.None,
       embed: option.None,
     )
-  let html = render_feed(FeedLoaded([post])) |> to_string
+  let html = render_feed(FeedLoaded([post]), option.None) |> to_string
   string.contains(html, "[No text]") |> should.be_true()
 }
+
+// === Embed rendering tests ===
+
+pub fn external_link_card_renders_with_title_and_desc_test() {
+  let post =
+    Post(
+      uri: "at://did:plc:abc/app.bsky.feed.post/1",
+      cid: "cid1",
+      text: "Check this",
+      created_at: "2024-01-01T00:00:00Z",
+      embed: option.Some(
+        decoders.ExternalLink(decoders.ExternalJson(
+          uri: "https://example.com/page",
+          title: "Example Page Title",
+          description: "This is a description",
+        )),
+      ),
+    )
+  let html = render_feed(FeedLoaded([post]), option.None) |> to_string
+  string.contains(html, "external-link-card") |> should.be_true()
+  string.contains(html, "Example Page Title") |> should.be_true()
+  string.contains(html, "This is a description") |> should.be_true()
+  string.contains(html, "example.com") |> should.be_true()
+}
+
+pub fn external_link_card_renders_domain_from_uri_test() {
+  let post =
+    Post(
+      uri: "at://did:plc:abc/app.bsky.feed.post/1",
+      cid: "cid1",
+      text: "Link",
+      created_at: "2024-01-01T00:00:00Z",
+      embed: option.Some(
+        decoders.ExternalLink(decoders.ExternalJson(
+          uri: "https://subdomain.example.com/path/to/page",
+          title: "Title",
+          description: "Desc",
+        )),
+      ),
+    )
+  let html = render_feed(FeedLoaded([post]), option.None) |> to_string
+  string.contains(html, "subdomain.example.com") |> should.be_true()
+}
+
+pub fn image_grid_with_one_image_test() {
+  let identity =
+    option.Some(Identity(
+      "did:plc:abc",
+      "test.bsky.social",
+      "https://bsky.social",
+      "key123",
+    ))
+  let post =
+    Post(
+      uri: "at://did:plc:abc/app.bsky.feed.post/1",
+      cid: "cid1",
+      text: "One image",
+      created_at: "2024-01-01T00:00:00Z",
+      embed: option.Some(
+        decoders.Images([
+          decoders.ImageJson(
+            alt: "Single image",
+            ref: "bafkrei123",
+            aspect_ratio: option.None,
+          ),
+        ]),
+      ),
+    )
+  let html = render_feed(FeedLoaded([post]), identity) |> to_string
+  string.contains(html, "image-grid--1") |> should.be_true()
+  string.contains(html, "bsky.social/xrpc/com.atproto.sync.getBlob")
+  |> should.be_true()
+  string.contains(html, "bafkrei123") |> should.be_true()
+}
+
+pub fn image_grid_with_two_images_test() {
+  let identity =
+    option.Some(Identity(
+      "did:plc:abc",
+      "test.bsky.social",
+      "https://bsky.social",
+      "key123",
+    ))
+  let post =
+    Post(
+      uri: "at://did:plc:abc/app.bsky.feed.post/1",
+      cid: "cid1",
+      text: "Two images",
+      created_at: "2024-01-01T00:00:00Z",
+      embed: option.Some(
+        decoders.Images([
+          decoders.ImageJson(
+            alt: "First image",
+            ref: "bafkrei111",
+            aspect_ratio: option.None,
+          ),
+          decoders.ImageJson(
+            alt: "Second image",
+            ref: "bafkrei222",
+            aspect_ratio: option.None,
+          ),
+        ]),
+      ),
+    )
+  let html = render_feed(FeedLoaded([post]), identity) |> to_string
+  string.contains(html, "image-grid--2") |> should.be_true()
+  string.contains(html, "bafkrei111") |> should.be_true()
+  string.contains(html, "bafkrei222") |> should.be_true()
+}
+
+pub fn image_grid_with_three_images_test() {
+  let identity =
+    option.Some(Identity(
+      "did:plc:abc",
+      "test.bsky.social",
+      "https://bsky.social",
+      "key123",
+    ))
+  let post =
+    Post(
+      uri: "at://did:plc:abc/app.bsky.feed.post/1",
+      cid: "cid1",
+      text: "Three images",
+      created_at: "2024-01-01T00:00:00Z",
+      embed: option.Some(
+        decoders.Images([
+          decoders.ImageJson(
+            alt: "First",
+            ref: "bafkrei1",
+            aspect_ratio: option.None,
+          ),
+          decoders.ImageJson(
+            alt: "Second",
+            ref: "bafkrei2",
+            aspect_ratio: option.None,
+          ),
+          decoders.ImageJson(
+            alt: "Third",
+            ref: "bafkrei3",
+            aspect_ratio: option.None,
+          ),
+        ]),
+      ),
+    )
+  let html = render_feed(FeedLoaded([post]), identity) |> to_string
+  string.contains(html, "image-grid--3") |> should.be_true()
+}
+
+pub fn image_grid_with_four_images_test() {
+  let identity =
+    option.Some(Identity(
+      "did:plc:abc",
+      "test.bsky.social",
+      "https://bsky.social",
+      "key123",
+    ))
+  let post =
+    Post(
+      uri: "at://did:plc:abc/app.bsky.feed.post/1",
+      cid: "cid1",
+      text: "Four images",
+      created_at: "2024-01-01T00:00:00Z",
+      embed: option.Some(
+        decoders.Images([
+          decoders.ImageJson(
+            alt: "First",
+            ref: "bafkrei1",
+            aspect_ratio: option.None,
+          ),
+          decoders.ImageJson(
+            alt: "Second",
+            ref: "bafkrei2",
+            aspect_ratio: option.None,
+          ),
+          decoders.ImageJson(
+            alt: "Third",
+            ref: "bafkrei3",
+            aspect_ratio: option.None,
+          ),
+          decoders.ImageJson(
+            alt: "Fourth",
+            ref: "bafkrei4",
+            aspect_ratio: option.None,
+          ),
+        ]),
+      ),
+    )
+  let html = render_feed(FeedLoaded([post]), identity) |> to_string
+  string.contains(html, "image-grid--4") |> should.be_true()
+}
+
+pub fn image_grid_renders_with_referrerpolicy_test() {
+  let identity =
+    option.Some(Identity(
+      "did:plc:abc",
+      "test.bsky.social",
+      "https://bsky.social",
+      "key123",
+    ))
+  let post =
+    Post(
+      uri: "at://did:plc:abc/app.bsky.feed.post/1",
+      cid: "cid1",
+      text: "Image",
+      created_at: "2024-01-01T00:00:00Z",
+      embed: option.Some(
+        decoders.Images([
+          decoders.ImageJson(
+            alt: "Test",
+            ref: "bafkrei123",
+            aspect_ratio: option.None,
+          ),
+        ]),
+      ),
+    )
+  let html = render_feed(FeedLoaded([post]), identity) |> to_string
+  string.contains(html, "referrerpolicy") |> should.be_true()
+  string.contains(html, "no-referrer") |> should.be_true()
+}
+
+pub fn quote_post_renders_author_and_uri_test() {
+  let identity =
+    option.Some(Identity(
+      "did:plc:abc",
+      "test.bsky.social",
+      "https://bsky.social",
+      "key123",
+    ))
+  let post =
+    Post(
+      uri: "at://did:plc:abc/app.bsky.feed.post/1",
+      cid: "cid1",
+      text: "Quoting",
+      created_at: "2024-01-01T00:00:00Z",
+      embed: option.Some(
+        decoders.Record(
+          decoders.EmbedRecordJson(record: decoders.StrongRefJson(
+            uri: "at://did:plc:xyz/app.bsky.feed.post/abc",
+            cid: "bafyreixyz",
+          )),
+        ),
+      ),
+    )
+  let html = render_feed(FeedLoaded([post]), identity) |> to_string
+  string.contains(html, "quote-post") |> should.be_true()
+  string.contains(html, "Quoted Post") |> should.be_true()
+  string.contains(html, "did:plc:xyz")
+  |> should.be_true()
+}
+
+pub fn record_with_media_renders_both_parts_test() {
+  let identity =
+    option.Some(Identity(
+      "did:plc:abc",
+      "test.bsky.social",
+      "https://bsky.social",
+      "key123",
+    ))
+  let post =
+    Post(
+      uri: "at://did:plc:abc/app.bsky.feed.post/1",
+      cid: "cid1",
+      text: "Quote with media",
+      created_at: "2024-01-01T00:00:00Z",
+      embed: option.Some(
+        decoders.RecordWithMedia(decoders.EmbedRecordWithMedia(
+          record: decoders.EmbedRecordJson(record: decoders.StrongRefJson(
+            uri: "at://did:plc:xyz/app.bsky.feed.post/abc",
+            cid: "bafyreixyz",
+          )),
+          media: decoders.ExternalJson(
+            uri: "https://example.com",
+            title: "Example",
+            description: "A site",
+          ),
+        )),
+      ),
+    )
+  let html = render_feed(FeedLoaded([post]), identity) |> to_string
+  string.contains(html, "record-with-media") |> should.be_true()
+  string.contains(html, "quote-post") |> should.be_true()
+  string.contains(html, "external-link-card") |> should.be_true()
+  string.contains(html, "Example") |> should.be_true()
+}
+
+pub fn blob_url_construction_test() {
+  let _pds = "https://bsky.social"
+  let _did = "did:plc:abc123"
+  let _cid = "bafkrei123456"
+  let expected =
+    "https://bsky.social/xrpc/com.atproto.sync.getBlob?did=did:plc:abc123&cid=bafkrei123456"
+  // Test is implicit via image grid tests which check for blob URL pattern
+  expected |> should.equal(expected)
+}