diff --git a/src/PageManager.tsx b/src/PageManager.tsx
index fdc60dd6..475e9c75 100644
--- a/src/PageManager.tsx
+++ b/src/PageManager.tsx
@@ -271,7 +271,7 @@ export function PageManager({ maxStackSize = 5 }: { maxStackSize?: number }) {
           <Sidebar />
           <Separator orientation="vertical" />
           <div className="grid grid-cols-2 w-full">
-            <div className="flex">
+            <div className="flex border-r">
               {primaryPages.map(({ name, element }) => (
                 <div
                   key={name}
@@ -283,7 +283,6 @@ export function PageManager({ maxStackSize = 5 }: { maxStackSize?: number }) {
                   {element}
                 </div>
               ))}
-              <Separator orientation="vertical" className="z-50" />
             </div>
             <div>
               {secondaryStack.map((item, index) => (
diff --git a/src/components/Embedded/EmbeddedMention.tsx b/src/components/Embedded/EmbeddedMention.tsx
index a11095fe..483496f4 100644
--- a/src/components/Embedded/EmbeddedMention.tsx
+++ b/src/components/Embedded/EmbeddedMention.tsx
@@ -6,7 +6,7 @@ export function EmbeddedMention({ userId }: { userId: string }) {
     <Username
       userId={userId}
       showAt
-      className="text-highlight font-normal inline-block"
+      className="text-highlight font-normal inline"
       withoutSkeleton
     />
   )
diff --git a/src/components/Note/index.tsx b/src/components/Note/index.tsx
index 5fb7eb82..309a88bf 100644
--- a/src/components/Note/index.tsx
+++ b/src/components/Note/index.tsx
@@ -37,14 +37,14 @@ export default function Note({
           <div className="flex gap-2 items-center">
             <Username
               userId={event.pubkey}
-              className={`font-semibold flex ${size === 'small' ? 'text-sm' : ''}`}
+              className={`font-semibold flex truncate ${size === 'small' ? 'text-sm' : ''}`}
               skeletonClassName={size === 'small' ? 'h-3' : 'h-4'}
             />
             {usingClient && size === 'normal' && (
-              <div className="text-xs text-muted-foreground truncate">using {usingClient}</div>
+              <div className="text-xs text-muted-foreground shrink-0">using {usingClient}</div>
             )}
           </div>
-          <div className="text-xs text-muted-foreground line-clamp-1">
+          <div className="text-xs text-muted-foreground shrink-0">
             <FormattedTimestamp timestamp={event.created_at} />
           </div>
         </div>
diff --git a/src/components/ReplyNote/index.tsx b/src/components/ReplyNote/index.tsx
index 9f34ebdd..a64be3e5 100644
--- a/src/components/ReplyNote/index.tsx
+++ b/src/components/ReplyNote/index.tsx
@@ -29,7 +29,7 @@ export default function ReplyNote({
             className="text-sm font-semibold text-muted-foreground hover:text-foreground truncate"
             skeletonClassName="h-3"
           />
-          <div className="text-xs text-muted-foreground">
+          <div className="text-xs text-muted-foreground shrink-0">
             <FormattedTimestamp timestamp={event.created_at} />
           </div>
         </div>
diff --git a/src/components/Username/index.tsx b/src/components/Username/index.tsx
index 3ae224ec..d8fc2ecb 100644
--- a/src/components/Username/index.tsx
+++ b/src/components/Username/index.tsx
@@ -30,7 +30,7 @@ export default function Username({
   return (
     <HoverCard>
       <HoverCardTrigger asChild>
-        <div className={cn('max-w-fit', className)}>
+        <div className={className}>
           <SecondaryPageLink
             to={toProfile(pubkey)}
             className="truncate hover:underline"
@@ -65,7 +65,7 @@ export function SimpleUsername({
   const { username } = profile
 
   return (
-    <div className={cn('max-w-fit', className)}>
+    <div className={className}>
       {showAt && '@'}
       {username}
     </div>