diff --git a/src/chat/Chat.tsx b/src/chat/Chat.tsx
index f360ed7..fde8a96 100644
--- a/src/chat/Chat.tsx
+++ b/src/chat/Chat.tsx
@@ -92,14 +92,16 @@ export default function Chat(props: Props) {
         </Box>
       ) : (
         <Box className={classes.chatContainer}>
-          <ChatOutput
-            totalMessages={totalMessages}
-            messages={chats}
-            removeNoteMethod={removeNote}
-            loadMore={loadMore}
-          />
-          <Box style={{bottom: 0}}>
-            <Divider/>
+          <Box sx={{ flex: 1, overflowY: "hidden", minHeight: 0 }}>
+            <ChatOutput
+              totalMessages={totalMessages}
+              messages={chats}
+              removeNoteMethod={removeNote}
+              loadMore={loadMore}
+            />
+          </Box>
+          <Box style={{ flexShrink: 0 }}>
+            <Divider />
             <ChatInput newNoteMethod={showNewNotes} objectKey={objectKey} type={type} />
           </Box>
         </Box>
diff --git a/src/chat/ChatDrawer.tsx b/src/chat/ChatDrawer.tsx
index 534b950..69ba35f 100644
--- a/src/chat/ChatDrawer.tsx
+++ b/src/chat/ChatDrawer.tsx
@@ -23,8 +23,10 @@ const useStyles = makeStyles<Theme>((theme: Theme) => ({
   },
   chatDrawerMobile: {
     backgroundColor: theme.palette.background.default,
-    height: "auto",
+    height: "100vh",
     width: "100%",
+    display: "flex",          // add this
+    flexDirection: "column",  // add this
   },
   drawerHeader: {
     display: "flex",
diff --git a/src/chat/ChatOutput.tsx b/src/chat/ChatOutput.tsx
index a40328e..198690b 100644
--- a/src/chat/ChatOutput.tsx
+++ b/src/chat/ChatOutput.tsx
@@ -72,6 +72,7 @@ export default function ChatOutput(props: Props) {
     <Box ref={containerRef} onScroll={onScroll} style={{
       overflowY: "scroll",
       overflowX: "hidden",
+      height:    "100%",
     }}>
       {props.messages.length < props.totalMessages && (
         <ListItemButton onClick={seeMore} sx={{ justifyContent: "center"}}>
diff --git a/src/pages/Team.tsx b/src/pages/Team.tsx
index 5d2d7ad..1fa32ba 100644
--- a/src/pages/Team.tsx
+++ b/src/pages/Team.tsx
@@ -223,7 +223,7 @@ export default function TeamPage() {
   const isStreamline = IsStreamline()
   
   return (
-    <PageContainer spacing={isMobile ? 0 : 2}>
+    <PageContainer spacing={isMobile ? 1 : 2}>
       <Box className={classes.container}>
         <Box className={classes.leftBox}>
           {title()}