diff --git a/app/lish/[did]/[publication]/[rkey]/BlueskyQuotesPage.tsx b/app/lish/[did]/[publication]/[rkey]/BlueskyQuotesPage.tsx
index f335211d..8dba71fb 100644
--- a/app/lish/[did]/[publication]/[rkey]/BlueskyQuotesPage.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/BlueskyQuotesPage.tsx
@@ -45,10 +45,9 @@ export function BlueskyQuotesPage(props: {
       pageOptions={pageOptions}
     >
       <div className="flex flex-col sm:px-4 px-3 sm:pt-3 pt-2 pb-1 sm:pb-4">
-        <div className="text-secondary font-bold mb-3 flex items-center gap-2">
-          <QuoteTiny />
+        <h3 className="text-secondary font-bold flex items-center gap-2">
           Bluesky Quotes
-        </div>
+        </h3>
         {isLoading ? (
           <div className="flex items-center justify-center gap-1 text-tertiary italic text-sm py-8">
             <span>loading quotes</span>
@@ -75,8 +74,13 @@ function QuotesContent(props: { posts: PostView[]; postUri: string }) {
 
   return (
     <div className="flex flex-col gap-0">
-      {posts.map((post) => (
-        <QuotePost key={post.uri} post={post} quotesUri={postUri} />
+      {posts.map((post, index) => (
+        <>
+          <QuotePost key={post.uri} post={post} quotesUri={postUri} />
+          {posts.length !== index + 1 && (
+            <hr className="border-border-light my-2" />
+          )}
+        </>
       ))}
     </div>
   );
@@ -91,11 +95,12 @@ function QuotePost(props: { post: PostView; quotesUri: string }) {
       post={post}
       parent={parent}
       showEmbed={true}
+      compactEmbed
       showBlueskyLink={true}
       quoteEnabled
       replyEnabled
       onEmbedClick={(e) => e.stopPropagation()}
-      className="relative py-2 px-2 hover:bg-bg-page rounded cursor-pointer"
+      className="relative py-2 px-2 hover:bg-bg-page rounded cursor-pointer text-sm"
     />
   );
 }
diff --git a/app/lish/[did]/[publication]/[rkey]/BskyPostContent.tsx b/app/lish/[did]/[publication]/[rkey]/BskyPostContent.tsx
index 8b7d54f6..6e0079d9 100644
--- a/app/lish/[did]/[publication]/[rkey]/BskyPostContent.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/BskyPostContent.tsx
@@ -92,26 +92,11 @@ export function BskyPostContent(props: {
               openPage(parent, { type: "thread", uri: post.uri });
             }}
           >
-            <div
-              className={`postInfo flex justify-between items-center gap-2 leading-tight `}
-            >
-              <div className={`flex gap-2 items-center `}>
-                <div className="font-bold text-secondary">
-                  {post.author.displayName}
-                </div>
-                <ProfilePopover
-                  trigger={
-                    <div className="text-sm text-tertiary hover:underline">
-                      @{post.author.handle}
-                    </div>
-                  }
-                  didOrHandle={post.author.handle}
-                />
-              </div>
-              <div className="text-sm text-tertiary">
-                {timeAgo(record.createdAt, { compact: true })}
-              </div>
-            </div>
+            <PostInfo
+              displayName={post.author.displayName}
+              handle={post.author.handle}
+              createdAt={record.createdAt}
+            />
 
             <div className={`postContent flex flex-col gap-2 mt-0.5`}>
               <div className="text-secondary text-sm">
@@ -210,24 +195,12 @@ export function CompactBskyPostContent(props: {
               openPage(parent, { type: "thread", uri: post.uri });
             }}
           >
-            <div className="postInfo flex justify-between items-center gap-2 leading-tight">
-              <div className="flex gap-2 items-center">
-                <div className="font-bold text-secondary">
-                  {post.author.displayName}
-                </div>
-                <ProfilePopover
-                  trigger={
-                    <div className="text-xs text-tertiary hover:underline">
-                      @{post.author.handle}
-                    </div>
-                  }
-                  didOrHandle={post.author.handle}
-                />
-              </div>
-              <div className="text-xs text-tertiary">
-                {timeAgo(record.createdAt, { compact: true })}
-              </div>
-            </div>
+            <PostInfo
+              displayName={post.author.displayName}
+              handle={post.author.handle}
+              createdAt={record.createdAt}
+              compact
+            />
 
             <div className="postContent flex flex-col gap-2 mt-0.5">
               <div className="line-clamp-3 text-tertiary text-xs">
@@ -255,6 +228,42 @@ export function CompactBskyPostContent(props: {
   );
 }
 
+function PostInfo(props: {
+  displayName?: string;
+  handle: string;
+  createdAt: string;
+  compact?: boolean;
+}) {
+  const { displayName, handle, createdAt, compact = false } = props;
+
+  return (
+    <div className="postInfo flex justify-between items-center gap-4 leading-tight w-full">
+      <div className="flex gap-2 items-center grow min-w-0">
+        <div className={`font-bold text-secondary  truncate`}>
+          {displayName}
+        </div>
+        <div className="truncate items-end flex">
+          <ProfilePopover
+            trigger={
+              <div
+                className={`${compact ? "text-xs" : "text-sm"} text-tertiary hover:underline w-full truncate `}
+              >
+                @{handle}
+              </div>
+            }
+            didOrHandle={handle}
+          />
+        </div>
+      </div>
+      <div
+        className={`${compact ? "text-xs" : "text-sm"} text-tertiary shrink-0`}
+      >
+        {timeAgo(createdAt, { compact: true })}
+      </div>
+    </div>
+  );
+}
+
 function PostCounts(props: {
   post: PostView;
   parent?: OpenPage;
diff --git a/app/lish/[did]/[publication]/[rkey]/ThreadPage.tsx b/app/lish/[did]/[publication]/[rkey]/ThreadPage.tsx
index 8805cce4..ce2bcff3 100644
--- a/app/lish/[did]/[publication]/[rkey]/ThreadPage.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/ThreadPage.tsx
@@ -49,7 +49,7 @@ export function ThreadPage(props: {
       pageType="doc"
       fullPageScroll={false}
       id={`post-page-${pageId}`}
-      drawerOpen={!!drawer}
+      drawerOpen={false}
       pageOptions={pageOptions}
     >
       <div className="flex flex-col sm:px-4 px-3 sm:pt-3 pt-2 pb-1 sm:pb-4 w-full">
diff --git a/components/Blocks/BlueskyPostBlock/BlueskyEmbed.tsx b/components/Blocks/BlueskyPostBlock/BlueskyEmbed.tsx
index 192306cc..5c6e409e 100644
--- a/components/Blocks/BlueskyPostBlock/BlueskyEmbed.tsx
+++ b/components/Blocks/BlueskyPostBlock/BlueskyEmbed.tsx
@@ -10,6 +10,7 @@ import {
   AppBskyGraphDefs,
   AppBskyLabelerDefs,
 } from "@atproto/api";
+import { Avatar } from "components/Avatar";
 
 export const BlueskyEmbed = (props: {
   embed: Exclude<AppBskyFeedDefs.PostView["embed"], undefined>;
@@ -154,38 +155,39 @@ export const BlueskyEmbed = (props: {
           text = (record.value as AppBskyFeedPost.Record).text;
         }
         return (
-          <div
-            className={`bskyPostEmbed flex flex-col gap-0.5 relative w-full overflow-hidden p-2! text-xs  block-border`}
-          >
-            <div className="bskyAuthor w-full flex items-center ">
-              {record.author.avatar && (
-                <img
-                  src={record.author?.avatar}
-                  alt={`${record.author?.displayName}'s avatar`}
-                  className="shink-0 w-6 h-6 rounded-full border border-border-light mr-[6px]"
-                />
-              )}
-              <div className=" font-bold text-secondary mr-1">
-                {record.author?.displayName}
+          <div className="bskyPostEmbed w-full flex gap-2 items-start relative  overflow-hidden p-2! text-xs  block-border">
+            <Avatar
+              src={record.author?.avatar}
+              displayName={record.author?.displayName}
+              size="small"
+            />
+            <div className="flex flex-col ">
+              <div className="flex gap-1">
+                <div className=" font-bold text-secondary mr-1">
+                  {record.author?.displayName}
+                </div>
+                <a
+                  className="text-xs text-tertiary hover:underline"
+                  target="_blank"
+                  href={`https://bsky.app/profile/${record.author?.handle}`}
+                >
+                  @{record.author?.handle}
+                </a>
+              </div>
+              <div className="flex flex-col gap-2 ">
+                {text && (
+                  <pre
+                    className={`whitespace-pre-wrap text-secondary ${props.compact ? "line-clamp-6" : ""}`}
+                  >
+                    {text}
+                  </pre>
+                )}
+                {/*{record.embeds !== undefined
+                  ? record.embeds.map((embed, index) => (
+                      <BlueskyEmbed embed={embed} key={index} compact />
+                    ))
+                  : null}*/}
               </div>
-              <a
-                className="text-xs text-tertiary hover:underline"
-                target="_blank"
-                href={`https://bsky.app/profile/${record.author?.handle}`}
-              >
-                @{record.author?.handle}
-              </a>
-            </div>
-
-            <div className="flex flex-col gap-2 ">
-              {text && (
-                <pre className="whitespace-pre-wrap text-secondary">{text}</pre>
-              )}
-              {record.embeds !== undefined
-                ? record.embeds.map((embed, index) => (
-                    <BlueskyEmbed embed={embed} key={index} />
-                  ))
-                : null}
             </div>
           </div>
         );