diff --git a/Client/src/Components/TabPanels/ProfileSettings/ProfilePanel.jsx b/Client/src/Components/TabPanels/ProfileSettings/ProfilePanel.jsx
new file mode 100644
index 000000000..5b51a0f2b
--- /dev/null
+++ b/Client/src/Components/TabPanels/ProfileSettings/ProfilePanel.jsx
@@ -0,0 +1,295 @@
+import { useTheme } from "@emotion/react";
+import { useState } from "react";
+import TabPanel from "@mui/lab/TabPanel";
+import {
+  Avatar,
+  Box,
+  Divider,
+  Modal,
+  Stack,
+  TextField,
+  Typography,
+} from "@mui/material";
+import ButtonSpinner from "../../ButtonSpinner";
+import Button from "../../Button";
+
+/**
+ * ProfilePanel component displays a form for editing user profile information
+ * and allows for actions like updating profile picture, credentials,
+ * and deleting account.
+ *
+ * @returns {JSX.Element}
+ *
+ */
+
+const ProfilePanel = () => {
+  const theme = useTheme();
+  //TODO - use redux loading state
+  //!! - currently all loading buttons are tied to the same state
+  const [isLoading, setIsLoading] = useState(false);
+  //TODO - implement delete profile picture function
+  const handleDeletePicture = () => {
+    setIsLoading(true);
+    setTimeout(() => {
+      setIsLoading(false);
+    }, 2000);
+  };
+  //TODO - implement update profile function
+  const handleUpdatePicture = () => {};
+  const [isOpen, setIsOpen] = useState(false);
+  //TODO - implement delete account function
+  const handleDeleteAccount = () => {
+    setIsLoading(true);
+    setTimeout(() => {
+      setIsLoading(false);
+      setIsOpen(false);
+    }, 2000);
+  };
+  //TODO - implement save profile function
+  const handleSaveProfile = () => {
+    setIsLoading(true);
+    setTimeout(() => {
+      setIsLoading(false);
+      setIsOpen(false);
+    }, 2000);
+  };
+
+  return (
+    <TabPanel
+      value="0"
+      sx={{ padding: "0", marginTop: theme.spacing(6.25), width: "100%" }}
+    >
+      <form className="edit-profile-form" noValidate spellCheck="false">
+        <div className="edit-profile-form__wrapper">
+          <Stack
+            direction="column"
+            gap="8px"
+            sx={{ flex: 1, marginRight: "10px" }}
+          >
+            <Typography variant="h4" component="h1">
+              First Name
+            </Typography>
+          </Stack>
+          {/* TODO - use existing textfield components */}
+          <TextField
+            id="edit-first-name"
+            placeholder="Enter your first name"
+            sx={{
+              flex: 1,
+              minWidth: theme.spacing(30),
+            }}
+          />
+        </div>
+        <div className="edit-profile-form__wrapper">
+          <Stack
+            direction="column"
+            gap="8px"
+            sx={{ flex: 1, marginRight: "10px" }}
+          >
+            <Typography variant="h4" component="h1">
+              Last Name
+            </Typography>
+          </Stack>
+          {/* TODO - use existing textfield components */}
+          <TextField
+            id="edit-last-name"
+            placeholder="Enter your last name"
+            sx={{
+              flex: 1,
+              minWidth: theme.spacing(30),
+            }}
+          />
+        </div>
+        <div className="edit-profile-form__wrapper">
+          <Stack
+            direction="column"
+            gap="8px"
+            sx={{ flex: 1, marginRight: "10px" }}
+          >
+            <Typography variant="h4" component="h1">
+              Email
+            </Typography>
+            <Typography variant="h5" component="p">
+              After updating, you'll receive a confirmation email.
+            </Typography>
+          </Stack>
+          {/* TODO - use existing textfield components */}
+          <TextField
+            id="edit-email"
+            placeholder="Enter your email"
+            sx={{
+              flex: 1,
+              minWidth: theme.spacing(30),
+            }}
+          />
+        </div>
+        <div className="edit-profile-form__wrapper">
+          <Stack
+            direction="column"
+            gap="8px"
+            sx={{ flex: 1, marginRight: "10px" }}
+          >
+            <Typography variant="h4" component="h1">
+              Your Photo
+            </Typography>
+            <Typography variant="h5" component="p">
+              This photo will be displayed in your profile page.
+            </Typography>
+          </Stack>
+          <Stack direction="row" alignItems="center" sx={{ flex: 1 }}>
+            {/* TODO - Use Avatar component instead of @mui */}
+            <Avatar
+              alt="Remy Sharp"
+              src="/static/images/avatar/2.jpg"
+              className="icon-button-avatar"
+              style={{ width: "64px", height: "64px" }}
+            />
+            <ButtonSpinner
+              level="tertiary"
+              label="Delete"
+              onClick={handleDeletePicture}
+              isLoading={isLoading}
+              sx={{
+                height: "fit-content",
+                fontSize: "13px",
+                "&:focus": {
+                  outline: "none",
+                },
+              }}
+            />
+            {/* TODO - modal popup for update pfp? */}
+            <Button
+              level="tertiary"
+              label="Update"
+              onClick={handleUpdatePicture}
+              sx={{
+                height: "fit-content",
+                color: theme.palette.primary.main,
+                fontSize: "13px",
+                "&:focus": {
+                  outline: "none",
+                },
+              }}
+            />
+          </Stack>
+        </div>
+      </form>
+      <Divider aria-hidden="true" sx={{ marginY: theme.spacing(6.25) }} />
+      <form className="delete-profile-form" noValidate spellCheck="false">
+        <div className="delete-profile-form__wrapper">
+          <Stack direction="column" gap="15px">
+            <Typography variant="h4" component="h1">
+              Delete account
+            </Typography>
+            <Typography variant="h5" component="p">
+              Note that deleting your account will remove all data from our
+              system. This is permanent and non-recoverable.
+            </Typography>
+            <Box sx={{ mt: theme.spacing(1) }}>
+              <Button
+                level="error"
+                label="Delete account"
+                onClick={() => setIsOpen(true)}
+                sx={{
+                  fontSize: "13px",
+                  "&:focus": {
+                    outline: "none",
+                  },
+                }}
+              />
+            </Box>
+          </Stack>
+        </div>
+      </form>
+      <Divider
+        aria-hidden="true"
+        width="0"
+        sx={{ marginY: theme.spacing(6.25) }}
+      />
+      <Stack direction="row" justifyContent="flex-end">
+        <Box width="fit-content">
+          <ButtonSpinner
+            level="primary"
+            label="Save"
+            onClick={handleSaveProfile}
+            isLoading={isLoading}
+            loadingText="Saving..."
+            sx={{
+              paddingX: "40px",
+              height: "fit-content",
+              fontSize: "13px",
+              "&:focus": {
+                outline: "none",
+              },
+            }}
+          />
+        </Box>
+      </Stack>
+      {/* TODO - Update ModalPopup Component with @mui for reusability */}
+      <Modal
+        aria-labelledby="modal-delete-account"
+        aria-describedby="delete-account-confirmation"
+        open={isOpen}
+        onClose={() => setIsOpen(false)}
+        disablePortal
+      >
+        <Stack
+          gap="10px"
+          sx={{
+            position: "absolute",
+            top: "50%",
+            left: "50%",
+            transform: "translate(-50%, -50%)",
+            width: 400,
+            bgcolor: "white",
+            border: "solid 1px #f2f2f2",
+            borderRadius: "4px",
+            boxShadow: 24,
+            p: "30px",
+            "&:focus": {
+              outline: "none",
+            },
+          }}
+        >
+          <Typography id="modal-delete-account" variant="h4" component="h1">
+            Really delete this account?
+          </Typography>
+          <Typography
+            id="delete-account-confirmation"
+            variant="h5"
+            component="p"
+            sx={{
+              color: theme.palette.secondary.main,
+              fontSize: "13px",
+            }}
+          >
+            If you delete your account, you will no longer be able to sign in,
+            and all of your data will be deleted. Deleting your account is
+            permanent and non-recoverable action.
+          </Typography>
+          <Stack direction="row" gap="10px" mt="10px" justifyContent="flex-end">
+            <Button
+              level="tertiary"
+              label="Cancel"
+              onClick={() => setIsOpen(false)}
+              sx={{ fontSize: "13px" }}
+            />
+            <ButtonSpinner
+              level="error"
+              label="Delete account"
+              onClick={handleDeleteAccount}
+              isLoading={isLoading}
+              sx={{ fontSize: "13px" }}
+            />
+          </Stack>
+        </Stack>
+      </Modal>
+    </TabPanel>
+  );
+};
+
+ProfilePanel.propTypes = {
+  // No props are being passed to this component, hence no specific PropTypes are defined.
+};
+
+export default ProfilePanel;
diff --git a/Client/src/Pages/Settings/index.jsx b/Client/src/Pages/Settings/index.jsx
index 6909f863f..b1052f26c 100644
--- a/Client/src/Pages/Settings/index.jsx
+++ b/Client/src/Pages/Settings/index.jsx
@@ -6,7 +6,6 @@ import {
   Tab,
   useTheme,
   TextField,
-  Avatar,
   Stack,
   Divider,
   Modal,
@@ -35,32 +34,9 @@ import ButtonSpinner from "../../Components/ButtonSpinner";
 import Button from "../../Components/Button";
 import "./index.css";
 import AnnouncementsDualButtonWithIcon from "../../Components/Announcements/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon";
+import ProfilePanel from "../../Components/TabPanels/ProfileSettings/ProfilePanel";
 
 const tabList = ["Profile", "Password", "Team"];
-const profileConfig = {
-  firstName: {
-    id: "edit-first-name",
-    label: "First name",
-    type: "input",
-  },
-  lastName: {
-    id: "edit-last-name",
-    label: "Last name",
-    type: "input",
-  },
-  email: {
-    id: "edit-email",
-    label: "Email",
-    description: "After updating, you'll receive a confirmation email.",
-    type: "input",
-  },
-  photo: {
-    id: "edit-photo",
-    label: "Your photo",
-    description: "This photo will be displayed in your profile page.",
-    type: "photo",
-  },
-};
 const passwordConfig = {
   current_password: {
     id: "edit-current-password",
@@ -161,25 +137,7 @@ const Settings = () => {
   const theme = useTheme();
 
   const [isLoading, setIsLoading] = useState(false);
-  //TODO - implement delete profile picture function
-  const handleDeletePicture = () => {
-    setIsLoading(true);
-    setTimeout(() => {
-      setIsLoading(false);
-    }, 2000);
-  };
-  //TODO - implement delete profile update function
-  const handleUpdatePicture = () => {};
-
   const [isOpen, setIsOpen] = useState(false);
-  //TODO - implement delete account function
-  const handleDeleteAccount = () => {
-    setIsLoading(true);
-    setTimeout(() => {
-      setIsLoading(false);
-      setIsOpen(false);
-    }, 2000);
-  };
   const handleSaveProfile = () => {
     setIsLoading(true);
     setTimeout(() => {
@@ -187,7 +145,13 @@ const Settings = () => {
       setIsOpen(false);
     }, 2000);
   };
-
+  const handleDeleteAccount = () => {
+    setIsLoading(true);
+    setTimeout(() => {
+      setIsLoading(false);
+      setIsOpen(false);
+    }, 2000);
+  };
   const [showPassword, setShowPassword] = useState(false);
 
   const [orgStates, setOrgStates] = useState(orgConfig);
@@ -301,135 +265,7 @@ const Settings = () => {
             ))}
           </TabList>
         </Box>
-        <TabPanel
-          value="0"
-          sx={{ padding: "0", marginTop: theme.spacing(6.25), width: "100%" }}
-        >
-          <form className="edit-profile-form" noValidate spellCheck="false">
-            {Object.entries(profileConfig).map(([key, field]) => (
-              <div className="edit-profile-form__wrapper" key={key}>
-                <Stack
-                  direction="column"
-                  gap="8px"
-                  sx={{ flex: 1, marginRight: "10px" }}
-                >
-                  <Typography variant="h4" component="h1">
-                    {field.label}
-                  </Typography>
-                  {field ? (
-                    <Typography variant="h5" component="p">
-                      {field.description}
-                    </Typography>
-                  ) : (
-                    ""
-                  )}
-                </Stack>
-                {field.type === "input" ? (
-                  <TextField
-                    id={field.id}
-                    placeholder={`Enter your ${field.label.toLowerCase()}`}
-                    sx={{
-                      flex: 1,
-                      minWidth: theme.spacing(30),
-                    }}
-                  ></TextField>
-                ) : field.type === "photo" ? (
-                  <Stack direction="row" alignItems="center" sx={{ flex: 1 }}>
-                    {/* TODO - Use Avatar component instead of @mui */}
-                    <Avatar
-                      alt="Remy Sharp"
-                      src="/static/images/avatar/2.jpg"
-                      className="icon-button-avatar"
-                      style={{ width: "64px", height: "64px" }}
-                    />
-                    <ButtonSpinner
-                      level="tertiary"
-                      label="Delete"
-                      onClick={handleDeletePicture}
-                      isLoading={isLoading}
-                      sx={{
-                        height: "fit-content",
-                        fontSize: "13px",
-                        "&:focus": {
-                          outline: "none",
-                        },
-                      }}
-                    />
-                    {/* TODO - modal popup for update pfp? */}
-                    <Button
-                      level="tertiary"
-                      label="Update"
-                      onClick={handleUpdatePicture}
-                      sx={{
-                        height: "fit-content",
-                        color: theme.palette.primary.main,
-                        fontSize: "13px",
-                        "&:focus": {
-                          outline: "none",
-                        },
-                      }}
-                    />
-                  </Stack>
-                ) : (
-                  ""
-                )}
-              </div>
-            ))}
-          </form>
-          <Divider aria-hidden="true" sx={{ marginY: theme.spacing(6.25) }} />
-          <form className="delete-profile-form" noValidate spellCheck="false">
-            <div className="delete-profile-form__wrapper">
-              <Stack direction="column" gap="15px">
-                <Typography variant="h4" component="h1">
-                  Delete account
-                </Typography>
-                <Typography variant="h5" component="p">
-                  Note that deleting your account will remove all data from our
-                  system. This is permanent and non-recoverable.
-                </Typography>
-                <Box sx={{ mt: theme.spacing(1) }}>
-                  <Button
-                    level="error"
-                    label="Delete account"
-                    onClick={() => setIsOpen(true)}
-                    sx={{
-                      fontSize: "13px",
-                      "&:focus": {
-                        outline: "none",
-                      },
-                    }}
-                  />
-                </Box>
-              </Stack>
-            </div>
-          </form>
-          <Divider
-            aria-hidden="true"
-            width="0"
-            sx={{ marginY: theme.spacing(6.25) }}
-          />
-          {/* !!! - All save buttons are tied to the same state */}
-          {/* TODO - Implement Save Profile function */}
-          <Stack direction="row" justifyContent="flex-end">
-            <Box width="fit-content">
-              <ButtonSpinner
-                level="primary"
-                label="Save"
-                onClick={handleSaveProfile}
-                isLoading={isLoading}
-                loadingText="Saving..."
-                sx={{
-                  paddingX: "40px",
-                  height: "fit-content",
-                  fontSize: "13px",
-                  "&:focus": {
-                    outline: "none",
-                  },
-                }}
-              />
-            </Box>
-          </Stack>
-        </TabPanel>
+        <ProfilePanel />
         <TabPanel
           value="1"
           sx={{ padding: "0", marginTop: theme.spacing(6.25), width: "100%" }}
@@ -781,71 +617,6 @@ const Settings = () => {
           </form>
         </TabPanel>
       </TabContext>
-      {/* TODO - Update ModalPopup Component with @mui for reusability */}
-      {/* <DualButtonPopupModal
-        subject="Really delete this account?"
-        description="If you delete your account, you will no longer be able to sign in, and all of your data will be deleted. Deleting your account is permanent and non-recoverable action."
-        esc="Cancel"
-        save="Delete account"
-      /> */}
-      <Modal
-        aria-labelledby="modal-delete-account"
-        aria-describedby="delete-account-confirmation"
-        open={isOpen}
-        onClose={() => setIsOpen(false)}
-        disablePortal
-      >
-        <Stack
-          gap="10px"
-          sx={{
-            position: "absolute",
-            top: "50%",
-            left: "50%",
-            transform: "translate(-50%, -50%)",
-            width: 400,
-            bgcolor: "white",
-            border: "solid 1px #f2f2f2",
-            borderRadius: "4px",
-            boxShadow: 24,
-            p: "30px",
-            "&:focus": {
-              outline: "none",
-            },
-          }}
-        >
-          <Typography id="modal-delete-account" variant="h4" component="h1">
-            Really delete this account?
-          </Typography>
-          <Typography
-            id="delete-account-confirmation"
-            variant="h5"
-            component="p"
-            sx={{
-              color: theme.palette.secondary.main,
-              fontSize: "13px",
-            }}
-          >
-            If you delete your account, you will no longer be able to sign in,
-            and all of your data will be deleted. Deleting your account is
-            permanent and non-recoverable action.
-          </Typography>
-          <Stack direction="row" gap="10px" mt="10px" justifyContent="flex-end">
-            <Button
-              level="tertiary"
-              label="Cancel"
-              onClick={() => setIsOpen(false)}
-              sx={{ fontSize: "13px" }}
-            />
-            <ButtonSpinner
-              level="error"
-              label="Delete account"
-              onClick={handleDeleteAccount}
-              isLoading={isLoading}
-              sx={{ fontSize: "13px" }}
-            />
-          </Stack>
-        </Stack>
-      </Modal>
       <Modal
         aria-labelledby="modal-edit-org-name"
         aria-describedby="edit-organization-name"
diff --git a/Client/src/index.css b/Client/src/index.css
index 167dc5c43..3f7a64315 100644
--- a/Client/src/index.css
+++ b/Client/src/index.css
@@ -3,9 +3,9 @@
   line-height: 1.5;
   font-weight: 400;
 
-  color-scheme: light dark;
+  /* color-scheme: light dark;
   color: rgba(255, 255, 255, 0.87);
-  background-color: #242424;
+  background-color: #242424; */
 
   font-synthesis: none;
   text-rendering: optimizeLegibility;