diff --git a/src/app/chat/[id]/page.tsx b/src/app/chat/[id]/page.tsx
index 6ad5435..8ed4e7b 100644
--- a/src/app/chat/[id]/page.tsx
+++ b/src/app/chat/[id]/page.tsx
@@ -12,10 +12,8 @@ export default function DMs() {
   return (
     <AppSidebar app={app}>
       <MessageBox
-        toggleSidebar={() => app.setSidebarOpen(true)}
+        app={app}
         channelName={app.profiles[id]?.display_name || id}
-        userList={app.profiles}
-        setUserList={app.setProfiles}
         messages={app.messages
           .filter(
             (m) =>
diff --git a/src/app/server/[ip]/page.tsx b/src/app/server/[ip]/page.tsx
index 037f0ea..82a99b2 100644
--- a/src/app/server/[ip]/page.tsx
+++ b/src/app/server/[ip]/page.tsx
@@ -25,10 +25,8 @@ export default function Server() {
   return (
     <AppSidebar app={app} server={server}>
       <MessageBox
-        toggleSidebar={() => app.setSidebarOpen(true)}
+        app={app}
         channelName="General"
-        userList={app.profiles}
-        setUserList={app.setProfiles}
         messages={app.messages
           .filter((m) => m.channel_id === "general")
           .toReversed()}
diff --git a/src/components/MessageBox.tsx b/src/components/MessageBox.tsx
index 0178fd1..e95a8e8 100644
--- a/src/components/MessageBox.tsx
+++ b/src/components/MessageBox.tsx
@@ -10,53 +10,46 @@ import {
   DropdownMenuContent,
   DropdownMenuTrigger,
 } from "./ui/dropdown-menu";
-import { ChevronLeft, ChevronLeftIcon, SmilePlusIcon } from "lucide-react";
-import { useEffect, useRef, useState } from "react";
+import { ChevronLeftIcon, SmilePlusIcon } from "lucide-react";
+import { useEffect, useState } from "react";
 import { format, isToday, isYesterday } from "date-fns";
 import ReactMarkdown from "react-markdown";
 import remarkGfm from "remark-gfm";
-import { NumberMap, StringMap } from "@/types/typeUtils";
 import { UserProfile } from "@/hooks/get-user";
 import axios from "axios";
 import ProfilePicture from "./ProfilePicture";
+import { ScrollArea } from "./ui/scroll-area";
+import App from "@/types/app";
 
-function MessageContainer({
-  message,
-  userList,
-  setUserList,
-}: {
-  message: Message;
-  userList: StringMap<UserProfile>;
-  setUserList: React.Dispatch<React.SetStateAction<NumberMap<UserProfile>>>;
-}) {
+function MessageContainer({ message, app }: { message: Message; app: App }) {
   useEffect(() => {
     axios
       .get("/api/profile/", { params: { id: message.from } })
       .then((res) =>
-        setUserList((prev) => ({
+        app.setProfiles((prev) => ({
           ...prev,
           [message.from]: res.data as UserProfile,
         }))
       )
       .catch(() => {});
-  }, [message.from, setUserList]);
+  }, [message.from]);
 
   return (
     <div className="flex flex-col gap-3 rounded-lg p-4 hover:bg-accent">
       <div className="flex gap-2">
         {/* <div className="w-8 h-8 rounded-full bg-gray-400" /> */}
         <ProfilePicture
-          url={userList[message.from]?.avatar_url}
+          url={app.profiles[message.from]?.avatar_url}
           name={String(
-            userList[message.from]
-              ? userList[message.from].display_name
+            app.profiles[message.from]
+              ? app.profiles[message.from].display_name
               : message.from
           )}
         />
         <div className="flex flex-col flex-1">
           <span className="font-bold flex gap-1 items-center">
-            {userList[message.from]
-              ? userList[message.from].display_name
+            {app.profiles[message.from]
+              ? app.profiles[message.from].display_name
               : message.from}
 
             <p className="text-neutral-500 text-xs">
@@ -139,19 +132,15 @@ function MessageContainer({
 }
 
 export default function MessageBox({
-  messages,
-  userList,
-  setUserList,
+  app,
   sendMessage,
   channelName,
-  toggleSidebar,
+  messages,
 }: {
-  messages: Message[];
-  userList: NumberMap<UserProfile>;
-  setUserList: React.Dispatch<React.SetStateAction<NumberMap<UserProfile>>>;
+  app: App;
   sendMessage: (m: string) => void;
   channelName?: string;
-  toggleSidebar: () => void;
+  messages: Message[];
 }) {
   const [text, setText] = useState("");
 
@@ -159,22 +148,20 @@ export default function MessageBox({
     <div className="h-full w-full max-h-svh flex flex-col pb-5 pl-5 gap-5">
       {channelName && (
         <header className="h-12 py-4 flex items-center border-b text-sm font-semibold">
-          <span onClick={toggleSidebar} className="cursor-pointer flex">
+          <span
+            onClick={() => app.setSidebarOpen(true)}
+            className="cursor-pointer flex"
+          >
             <ChevronLeftIcon className="w-5 h-5" />
             {channelName}
           </span>
         </header>
       )}
-      <div className="w-full h-full flex-1 overflow-y-scroll flex gap-2 flex-col-reverse pr-5">
+      <ScrollArea className="w-full h-full flex-1 overflow-y-scroll flex gap-2 flex-col-reverse">
         {messages.map((msg) => (
-          <MessageContainer
-            key={msg.id}
-            message={msg}
-            userList={userList}
-            setUserList={setUserList}
-          />
+          <MessageContainer key={msg.id} message={msg} app={app} />
         ))}
-      </div>
+      </ScrollArea>
       <footer className="w-full flex gap-3 pr-5 mt-auto">
         <Input
           className=""
diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index 439787b..bd5fefa 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -265,10 +265,10 @@ export default function AppSidebar({
       </div>
       {app.sidebarOpen ? (
         <div
-          className="w-screen h-full overflow-x-hidden"
+          className="w-full h-full overflow-x-hidden"
           onClick={() => app.setSidebarOpen(false)}
         >
-          <div className="overflow-x-hidden w-screen min-w-max flex-shrink-0">
+          <div className="overflow-x-hidden min-w-max flex-shrink-0">
             {children}
           </div>
         </div>