diff --git a/app/chat/page.tsx b/app/chat/page.tsx
index bb0813a..f8384c0 100644
--- a/app/chat/page.tsx
+++ b/app/chat/page.tsx
@@ -172,7 +172,7 @@ export default function ChatPage() {
   }
 
   return (
-    <div className="flex h-screen w-full touch-manipulation flex-col overflow-hidden lg:flex-row">
+    <div className="flex w-full touch-manipulation flex-col overflow-hidden lg:flex-row">
       <MessageThreadsSidebar
         isOpen={isSidebarOpen}
         onClose={() => setIsSidebarOpen(false)}
@@ -198,8 +198,8 @@ export default function ChatPage() {
         </div>
 
         {/* Messages container */}
-        <div className="min-h-0 flex-1 overflow-y-auto">
-          <div className="mx-auto flex max-w-2xl flex-col p-4">
+        <div className="flex min-h-0 flex-1 overflow-y-auto">
+          <div className="mx-auto flex max-w-2xl flex-col p-4 mt-auto">
             {isClient && messages.map((message) => (
               <ChatBubble
                 key={message.id}
@@ -261,7 +261,7 @@ export default function ChatPage() {
         </div>
 
         {/* Input - now will stay fixed at bottom */}
-        <div className="flex-none border-t bg-background p-4">
+        <div className="flex-none bg-background p-4 ">
           <div className="mx-auto max-w-2xl">
             <form
               className="flex items-center gap-2"
diff --git a/components/pehchan-button.tsx b/components/pehchan-button.tsx
index 5332bf4..55ede7a 100644
--- a/components/pehchan-button.tsx
+++ b/components/pehchan-button.tsx
@@ -41,7 +41,7 @@ export function PehchanLoginButton() {
   return (
     <Button 
       onClick={handleLogin}
-      className="flex items-center justify-center gap-2 rounded-md px-4 py-2 text-white transition-colors hover:bg-green-700"
+      className="flex items-center justify-center gap-2 rounded-md px-4 py-2 text-white transition-colors bg-green-600 hover:bg-green-700"
     >
       <Icons.whiteLogo />
       Login with Pehchan