diff --git a/app/dashboard/chats/[id]/page.tsx b/app/dashboard/chats/[id]/page.tsx
index 81931ee..a4f82af 100644
--- a/app/dashboard/chats/[id]/page.tsx
+++ b/app/dashboard/chats/[id]/page.tsx
@@ -11,9 +11,7 @@ export const metadata: Metadata = {
 export default function ChatDetailPage({ params }: { params: { id: string } }) {
   return (
     <Dashboard>
-      <div className="h-full w-full">
-        <ChatDetail chatId={params.id} />
-      </div>
+      <ChatDetail chatId={params.id} />
     </Dashboard>
   );
 } 
\ No newline at end of file
diff --git a/components/dashboard/ChatDetail.tsx b/components/dashboard/ChatDetail.tsx
index b326bfa..4dd6ef9 100644
--- a/components/dashboard/ChatDetail.tsx
+++ b/components/dashboard/ChatDetail.tsx
@@ -10,7 +10,7 @@ import { cn } from "@/lib/utils";
 import { formatDistanceToNow } from "date-fns";
 import axios from "axios";
 import { toast } from "sonner";
-import { ArrowLeft, Send, RefreshCw, FileText, Image as ImageIcon, Download, File } from "lucide-react";
+import { ArrowLeft, Send, RefreshCw, File, FileText, Image as ImageIcon, Download } from "lucide-react";
 import { getCookie } from "@/lib/client-utils";
 
 interface Message {
@@ -292,55 +292,49 @@ export default function ChatDetail({ chatId }: { chatId: string }) {
   
   if (loading) {
     return (
-      <Card className="w-full h-[calc(100vh-80px)] flex flex-col">
-        <CardHeader className="border-b py-2 px-4">
-          <CardTitle className="flex items-center space-x-2">
-            <Button variant="ghost" size="icon" onClick={handleBackClick}>
-              <ArrowLeft className="h-5 w-5" />
-            </Button>
-            <span>Loading conversation...</span>
-          </CardTitle>
-        </CardHeader>
-        <CardContent className="flex-1 flex items-center justify-center">
+      <div className="flex flex-col h-screen w-full relative">
+        <div className="border-b py-2 px-4 flex items-center space-x-2 bg-card z-10">
+          <Button variant="ghost" size="icon" onClick={handleBackClick}>
+            <ArrowLeft className="h-5 w-5" />
+          </Button>
+          <span className="text-lg font-semibold">Loading conversation...</span>
+        </div>
+        <div className="flex-1 flex items-center justify-center">
           <RefreshCw className="h-8 w-8 animate-spin text-muted-foreground" />
-        </CardContent>
-      </Card>
+        </div>
+      </div>
     );
   }
   
   if (!chat) {
     return (
-      <Card className="w-full h-[calc(100vh-80px)] flex flex-col">
-        <CardHeader className="border-b py-2 px-4">
-          <CardTitle className="flex items-center space-x-2">
-            <Button variant="ghost" size="icon" onClick={handleBackClick}>
-              <ArrowLeft className="h-5 w-5" />
-            </Button>
-            <span>Chat not found</span>
-          </CardTitle>
-        </CardHeader>
-        <CardContent className="flex-1 flex items-center justify-center">
+      <div className="flex flex-col h-screen w-full relative">
+        <div className="border-b py-2 px-4 flex items-center space-x-2 bg-card z-10">
+          <Button variant="ghost" size="icon" onClick={handleBackClick}>
+            <ArrowLeft className="h-5 w-5" />
+          </Button>
+          <span className="text-lg font-semibold">Chat not found</span>
+        </div>
+        <div className="flex-1 flex items-center justify-center">
           <div className="text-center">
             <p className="text-muted-foreground mb-4">This conversation doesn't exist or you don't have access to it.</p>
             <Button onClick={handleBackClick}>Back to Chats</Button>
           </div>
-        </CardContent>
-      </Card>
+        </div>
+      </div>
     );
   }
   
   return (
-    <Card className="w-full h-[calc(100vh-80px)] flex flex-col">
-      <CardHeader className="border-b py-2 px-4">
-        <CardTitle className="flex items-center space-x-2">
-          <Button variant="ghost" size="icon" onClick={handleBackClick}>
-            <ArrowLeft className="h-5 w-5" />
-          </Button>
-          <span>Chat with Customer {chat.buyerId.slice(-4)}</span>
-        </CardTitle>
-      </CardHeader>
+    <div className="flex flex-col h-screen w-full relative">
+      <div className="border-b py-2 px-4 flex items-center space-x-2 bg-card z-10">
+        <Button variant="ghost" size="icon" onClick={handleBackClick}>
+          <ArrowLeft className="h-5 w-5" />
+        </Button>
+        <h3 className="text-lg font-semibold">Chat with Customer {chat.buyerId.slice(-4)}</h3>
+      </div>
       
-      <CardContent className="flex-1 overflow-y-auto p-2 space-y-2">
+      <div className="flex-1 overflow-y-auto p-2 space-y-2 pb-[58px]">
         {chat.messages.length === 0 ? (
           <div className="h-full flex items-center justify-center">
             <p className="text-muted-foreground">No messages yet. Send one to start the conversation.</p>
@@ -447,9 +441,9 @@ export default function ChatDetail({ chatId }: { chatId: string }) {
           ))
         )}
         <div ref={messagesEndRef} />
-      </CardContent>
+      </div>
       
-      <div className="p-2 border-t">
+      <div className="absolute bottom-0 left-0 right-0 border-t border-border bg-background p-4">
         <form onSubmit={handleSendMessage} className="flex space-x-2">
           <Input
             value={message}
@@ -463,6 +457,6 @@ export default function ChatDetail({ chatId }: { chatId: string }) {
           </Button>
         </form>
       </div>
-    </Card>
+    </div>
   );
 } 
\ No newline at end of file
diff --git a/components/layout/layout.tsx b/components/layout/layout.tsx
index 5f58f24..4789d08 100644
--- a/components/layout/layout.tsx
+++ b/components/layout/layout.tsx
@@ -27,12 +27,14 @@ export default function Layout({ children }: LayoutProps) {
     <div className={`flex h-screen ${theme === "dark" ? "dark" : ""}`}>
       <Sidebar />
       <div className="w-full flex flex-1 flex-col">
-        <header className="h-16 border-b border-border flex items-center justify-end px-6">
-          <div className="flex items-center space-x-2">
-            <UnifiedNotifications />
-          </div>
-        </header>
-        <main className={`flex-1 overflow-auto ${isChatDetailPage ? 'p-0' : 'p-6'} dark:bg-[#0F0F12]`}>
+        {!isChatDetailPage && (
+          <header className="h-16 border-b border-border flex items-center justify-end px-6">
+            <div className="flex items-center space-x-2">
+              <UnifiedNotifications />
+            </div>
+          </header>
+        )}
+        <main className={`flex-1 ${isChatDetailPage ? 'p-0 overflow-hidden' : 'p-6 overflow-auto'} dark:bg-[#0F0F12] relative`}>
           {children}
         </main>
       </div>