diff --git a/website/src/components/Messages/MessageTable.tsx b/website/src/components/Messages/MessageTable.tsx
new file mode 100644
index 00000000..2572a5fa
--- /dev/null
+++ b/website/src/components/Messages/MessageTable.tsx
@@ -0,0 +1,28 @@
+import { Box, CircularProgress, Stack, StackDivider, useColorModeValue } from "@chakra-ui/react";
+import { MessageTableEntry } from "./MessageTableEntry";
+
+export function MessageTable ({ messages, isLoading }) {
+    const backgroundColor = useColorModeValue("white", "gray.700");
+    const accentColor = useColorModeValue("gray.200", "gray.900");
+  
+    return (
+      <Box
+        backgroundColor={backgroundColor}
+        boxShadow="base"
+        dropShadow={accentColor}
+        borderRadius="xl"
+        className="p-6 shadow-sm"
+      >
+        {isLoading ? (
+          <CircularProgress isIndeterminate />
+        ) : (
+          <Stack divider={<StackDivider />} spacing="4">
+            {messages.map((item, idx) => (
+              <MessageTableEntry item={item} idx={idx} key={item.id} />
+            ))}
+          </Stack>
+        )}
+      </Box>
+    );
+  };
+  
\ No newline at end of file
diff --git a/website/src/components/Messages/MessageTableEntry.tsx b/website/src/components/Messages/MessageTableEntry.tsx
new file mode 100644
index 00000000..7bda7af9
--- /dev/null
+++ b/website/src/components/Messages/MessageTableEntry.tsx
@@ -0,0 +1,19 @@
+import { Avatar, Box, HStack, useColorModeValue } from "@chakra-ui/react";
+
+import { FlaggableElement } from "../FlaggableElement";
+
+export function MessageTableEntry ({ item, idx }) {
+    const bgColor = useColorModeValue(idx % 2 === 0 ? "bg-slate-800" : "bg-black", "bg-sky-900");
+  
+    return (
+      <FlaggableElement text={item.text} post_id={item.id} key={`flag_${item.id}`}>
+        <HStack>
+          <Avatar
+            name={`${item.isAssistant ? "Assitant" : "User"}`}
+            src={`${item.isAssistant ? "/logos/logo.png" : "/images/temp-avatars/av1.jpg"}`}
+          />
+          <Box className={`p-4 rounded-md text-white whitespace-pre-wrap ${bgColor} text-white w-full`}>{item.text}</Box>
+        </HStack>
+      </FlaggableElement>
+    );
+  };
\ No newline at end of file
diff --git a/website/src/pages/messages.tsx b/website/src/pages/messages.tsx
index 0182b8c5..ff13d8a4 100644
--- a/website/src/pages/messages.tsx
+++ b/website/src/pages/messages.tsx
@@ -1,64 +1,13 @@
-import {
-  Avatar,
-  Box,
-  CircularProgress,
-  HStack,
-  SimpleGrid,
-  Stack,
-  StackDivider,
-  Text,
-  useColorModeValue,
-} from "@chakra-ui/react";
+import { Box, SimpleGrid, Text, useColorModeValue } from "@chakra-ui/react";
 import Head from "next/head";
 import { useState } from "react";
 import useSWRImmutable from "swr/immutable";
 
 import fetcher from "src/lib/fetcher";
 import { SideMenu } from "src/components/Dashboard";
-import { FlaggableElement } from "src/components/FlaggableElement";
 import { Header } from "src/components/Header";
 import { colors } from "styles/Theme/colors";
-
-const MessageTable = ({ messages, isLoading }) => {
-  const backgroundColor = useColorModeValue("white", "gray.700");
-  const accentColor = useColorModeValue("gray.200", "gray.900");
-
-  return (
-    <Box
-      backgroundColor={backgroundColor}
-      boxShadow="base"
-      dropShadow={accentColor}
-      borderRadius="xl"
-      className="p-6 shadow-sm"
-    >
-      {isLoading ? (
-        <CircularProgress isIndeterminate />
-      ) : (
-        <Stack divider={<StackDivider />} spacing="4">
-          {messages.map((item, idx) => (
-            <MesssageTableEntry item={item} idx={idx} key={item.id} />
-          ))}
-        </Stack>
-      )}
-    </Box>
-  );
-};
-
-const MesssageTableEntry = ({ item, idx }) => {
-  const bgColor = useColorModeValue(idx % 2 === 0 ? "bg-slate-800" : "bg-black", "bg-sky-900");
-
-  return (
-    <FlaggableElement text={item.text} post_id={item.id} key={`flag_${item.id}`}>
-      <HStack>
-        <Avatar
-          name={`${item.isAssistant ? "Assitant" : "User"}`}
-          src={`${item.isAssistant ? "/logos/logo.png" : "/images/temp-avatars/av1.jpg"}`}
-        />
-        <Box className={`p-4 rounded-md text-white whitespace-pre-wrap ${bgColor} text-white w-full`}>{item.text}</Box>
-      </HStack>
-    </FlaggableElement>
-  );
-};
+import { MessageTable } from "src/components/Messages/MessageTable";
 
 const MessagesDashboard = () => {
   const bgColor = useColorModeValue(colors.light.bg, colors.dark.bg);