diff --git a/client/src/App.tsx b/client/src/App.tsx
index 49eba2c..420dc14 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -7,7 +7,7 @@ import Home from './pages/Home';
 import Profile from './pages/Profile';
 import { Toaster } from "@/components/ui/sonner";
 import EditProfileForm from './pages/EditProfileForm';
-import { MessagePage } from './components/Messages/MessagePage';
+import { MessagePage } from './pages/MessagePage';
 
 const App = () => {
 
diff --git a/client/src/components/Messages/Message.tsx b/client/src/components/Messages/Message.tsx
index 3f83fd0..1e63a15 100644
--- a/client/src/components/Messages/Message.tsx
+++ b/client/src/components/Messages/Message.tsx
@@ -10,6 +10,9 @@ import {
 } from "@/components/ui/resizable"
 import { TooltipProvider } from "@/components/ui/tooltip"
 import axios from "axios"
+import { Separator } from "@/components/ui/separator"
+import { Textarea } from "@/components/ui/textarea"
+import { Button } from "@/components/ui/button"
 
 const backendUrl = import.meta.env.VITE_BACKEND_URL || 'http://localhost:5000';
 
@@ -135,25 +138,45 @@ export function Message() {
                 <ResizableHandle withHandle />
                 <ResizablePanel minSize={30} className="flex flex-col">
                     <div className="flex-grow overflow-auto">
-                        {selectedUser && (
+                        
+                        {selectedUser ? (
                             <div>
                                 <h3>Chat with {selectedUser.username}</h3>
-                                <div>
+                                <div className="flex-1 whitespace-pre-wrap p-4 text-sm">
                                     {chatMessages.map((msg, index) => (
                                         <div key={index}>
                                             <strong>{msg.sender_username === currentUserId ? "You" : selectedUser.username}:</strong> {msg.message}
                                         </div>
                                     ))}
                                 </div>
-                                <input
-                                    type="text"
-                                    value={message}
-                                    onChange={(e) => setMessage(e.target.value)}
-                                    placeholder="Type a message"
-                                />
-                                <button onClick={handleSendMessage}>Send</button>
-                            </div>
-                        )}
+                                <Separator className="mt-auto" />
+                                <div className="p-4">
+                                    <form>
+                                        <div className="grid gap-4">
+                                            <Textarea
+                                                className="p-4"
+                                                value={message}
+                                                onChange={(e) => setMessage(e.target.value)}
+                                                placeholder="Type a message"
+                                            />
+                                            <div className="flex items-center">
+                                                <Button
+                                                    onClick={handleSendMessage}
+                                                    size="sm"
+                                                    className="ml-auto"
+                                                >
+                                                    Send
+                                                </Button>
+                                            </div>
+                                        </div>
+                                    </form>
+                                </div>
+                                </div>
+                        ) : (
+                        <div className="p-8 text-center text-muted-foreground">
+                            No message selected
+                        </div>
+      )}
                     </div>
                 </ResizablePanel>
             </ResizablePanelGroup>
diff --git a/client/src/components/Messages/MessagePage.tsx b/client/src/pages/MessagePage.tsx
similarity index 93%
rename from client/src/components/Messages/MessagePage.tsx
rename to client/src/pages/MessagePage.tsx
index f42935b..45dd634 100644
--- a/client/src/components/Messages/MessagePage.tsx
+++ b/client/src/pages/MessagePage.tsx
@@ -4,7 +4,7 @@ import {
     SidebarTrigger,
 } from "@/components/ui/sidebar"
 import { SidebarLeft } from '@/components/Sidebar/Sidebar'
-import { Message } from "./Message";
+import { Message } from "../components/Messages/Message";
 
 export const MessagePage: React.FC = () => {