diff --git a/compass/app/auth/login/page.tsx b/compass/app/auth/login/page.tsx
index fa945c9..9dab449 100644
--- a/compass/app/auth/login/page.tsx
+++ b/compass/app/auth/login/page.tsx
@@ -77,6 +77,8 @@ export default function Page() {
                 alt="Compass Center logo."
                 width={100}
                 height={91}
+                style={{ height: "auto", width: "auto" }}
+                priority
             />
             <h1 className="font-bold text-2xl text-purple-800">Login</h1>
             <div className="mb-6">
diff --git a/compass/app/test/page.tsx b/compass/app/test/page.tsx
index 37271df..9ae938e 100644
--- a/compass/app/test/page.tsx
+++ b/compass/app/test/page.tsx
@@ -76,6 +76,8 @@ export default function Page() {
                 alt="Compass Center logo."
                 width={100}
                 height={91}
+                style={{ height: "auto", width: "auto" }}
+                priority
             />
             <h1 className="font-bold text-2xl text-purple-800">Login</h1>
             <div className="mb-6">
diff --git a/compass/components/Drawer/Drawer.tsx b/compass/components/Drawer/Drawer.tsx
index da6fd8c..2b69f3c 100644
--- a/compass/components/Drawer/Drawer.tsx
+++ b/compass/components/Drawer/Drawer.tsx
@@ -14,61 +14,56 @@ import {
 } from "@heroicons/react/24/outline";
 import TagsInput from "../TagsInput/Index";
 
-type DrawerProps = {
-    title: string;
-    children: ReactNode;
-    onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void;
-    type?: "button" | "submit" | "reset"; // specify possible values for type
-    disabled?: boolean;
-    editableContent?: any;
-    onSave?: (content: any) => void;
-    rowContent?: any;
-    setData: Dispatch<SetStateAction<any>>;
-};
+type InputType =
+    | "text"
+    | "email"
+    | "textarea"
+    | "select-one"
+    | "select-multiple";
 
-interface EditContent {
-    content: string;
-    isEditing: boolean;
+export interface Details {
+    key: string;
+    label: string;
+    inputType: InputType;
+    icon: ReactNode;
+    presetOptionsValues?: string[];
+    presetOptionsSetter?: Dispatch<SetStateAction<string[]>>;
 }
 
+type DrawerProps = {
+    titleKey: string;
+    details: Details[];
+    rowContent?: any;
+    setRowContent?: Dispatch<SetStateAction<any>>;
+};
+
 const Drawer: FunctionComponent<DrawerProps> = ({
-    title,
-    children,
-    onSave,
-    editableContent,
+    titleKey,
+    details,
     rowContent,
-    setData,
-}) => {
+    setRowContent,
+}: DrawerProps) => {
     const [isOpen, setIsOpen] = useState(false);
     const [isFull, setIsFull] = useState(false);
     const [isFavorite, setIsFavorite] = useState(false);
     const [tempRowContent, setTempRowContent] = useState(rowContent);
 
-    const onRowUpdate = (updatedRow: any) => {
-        setData((prevData: any) =>
-            prevData.map((row: any) =>
-                row.id === updatedRow.id ? updatedRow : row
-            )
-        );
-    };
+    const onRowUpdate = (updatedRow: any) => {};
 
-    const handleTempRowContentChange = (e) => {
+    const handleTempRowContentChange = (
+        e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>
+    ) => {
         const { name, value } = e.target;
-        console.log(name);
-        console.log(value);
-        setTempRowContent((prevContent) => ({
-            ...prevContent,
+        setTempRowContent((prev: any) => ({
+            ...prev,
             [name]: value,
         }));
     };
 
-    const handleEnterPress = (e) => {
+    const handleEnterPress = (
+        e: React.KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>
+    ) => {
         if (e.key === "Enter") {
-            e.preventDefault();
-            // Update the rowContent with the temporaryRowContent
-            if (onRowUpdate) {
-                onRowUpdate(tempRowContent);
-            }
         }
     };
 
@@ -99,34 +94,6 @@ const Drawer: FunctionComponent<DrawerProps> = ({
         <OutlineStarIcon className="h-5 w-5" />
     );
 
-    const [presetOptions, setPresetOptions] = useState([
-        "administrator",
-        "volunteer",
-        "employee",
-    ]);
-    const [rolePresetOptions, setRolePresetOptions] = useState([
-        "domestic",
-        "community",
-        "economic",
-    ]);
-    const [tagColors, setTagColors] = useState(new Map());
-
-    const getTagColor = (tag: string) => {
-        if (!tagColors.has(tag)) {
-            const colors = [
-                "bg-cyan-100",
-                "bg-blue-100",
-                "bg-green-100",
-                "bg-yellow-100",
-                "bg-purple-100",
-            ];
-            const randomColor =
-                colors[Math.floor(Math.random() * colors.length)];
-            setTagColors(new Map(tagColors).set(tag, randomColor));
-        }
-        return tagColors.get(tag);
-    };
-
     return (
         <div>
             <button
@@ -137,7 +104,6 @@ const Drawer: FunctionComponent<DrawerProps> = ({
             >
                 Open
             </button>
-            <div className={drawerClassName}></div>
             <div className={drawerClassName}>
                 <div className="flex items-center justify-between p-4">
                     <div className="flex flex-row items-center justify-between space-x-2">
@@ -145,7 +111,7 @@ const Drawer: FunctionComponent<DrawerProps> = ({
                             <UserIcon />
                         </span>
                         <h2 className="text-lg text-gray-800 font-semibold">
-                            {rowContent.username}
+                            {rowContent[titleKey]}
                         </h2>
                     </div>
                     <div>
@@ -170,81 +136,116 @@ const Drawer: FunctionComponent<DrawerProps> = ({
                     </div>
                 </div>
                 <div className="p-4">
-                    <table className="p-4">
-                        <tbody className="items-center">
-                            <tr className="w-full text-xs items-center flex flex-row justify-between">
-                                <div className="flex flex-row space-x-2 text-gray-500 items-center">
-                                    <td>
-                                        <UserIcon className="h-4 w-4" />
-                                    </td>
-                                    <td className="w-32">Username</td>
+                    <div className="flex flex-col space-y-3">
+                        {details.map((detail, index) => {
+                            const value = tempRowContent[detail.key];
+                            let valueToRender = <></>;
+
+                            switch (detail.inputType) {
+                                case "select-one":
+                                case "select-multiple":
+                                    valueToRender = (
+                                        <div className="flex-1">
+                                            <div className="hover:bg-gray-50 rounded-md px-2 py-1">
+                                                <TagsInput
+                                                    presetValue={
+                                                        typeof value ===
+                                                        "string"
+                                                            ? [value]
+                                                            : value
+                                                    }
+                                                    presetOptions={
+                                                        detail.presetOptionsValues ||
+                                                        []
+                                                    }
+                                                    setPresetOptions={
+                                                        detail.presetOptionsSetter ||
+                                                        (() => {})
+                                                    }
+                                                />
+                                            </div>
+                                        </div>
+                                    );
+                                    break;
+                                case "textarea":
+                                    valueToRender = (
+                                        <div className="flex-1">
+                                            <div className="hover:bg-gray-50 rounded-md px-2 py-1">
+                                                <textarea
+                                                    name={detail.key}
+                                                    value={value}
+                                                    onChange={
+                                                        handleTempRowContentChange
+                                                    }
+                                                    onKeyDown={handleEnterPress}
+                                                    rows={4}
+                                                    onInput={(e) => {
+                                                        const target =
+                                                            e.target as HTMLTextAreaElement;
+                                                        target.style.height =
+                                                            "auto";
+                                                        target.style.height =
+                                                            target.scrollHeight +
+                                                            "px";
+                                                    }}
+                                                    className="w-full p-2 focus:outline-none border border-gray-200 rounded-md resize-none font-normal bg-transparent"
+                                                />
+                                            </div>
+                                        </div>
+                                    );
+                                    break;
+                                case "text":
+                                    valueToRender = (
+                                        <div className="flex-1">
+                                            <div className="hover:bg-gray-50 rounded-md px-2 py-1">
+                                                <input
+                                                    type={detail.inputType}
+                                                    name={detail.key}
+                                                    value={value}
+                                                    onChange={
+                                                        handleTempRowContentChange
+                                                    }
+                                                    onKeyDown={handleEnterPress}
+                                                    className="w-full p-1 focus:outline-gray-200 bg-transparent"
+                                                />
+                                            </div>
+                                        </div>
+                                    );
+                                    break;
+                                case "email":
+                                    valueToRender = (
+                                        <div className="flex-1">
+                                            <div className="hover:bg-gray-50 rounded-md px-2 py-1">
+                                                <input
+                                                    type={detail.inputType}
+                                                    name={detail.key}
+                                                    value={value}
+                                                    onChange={
+                                                        handleTempRowContentChange
+                                                    }
+                                                    onKeyDown={handleEnterPress}
+                                                    className="w-full p-1 font-normal hover:text-gray-400 focus:outline-gray-200 underline text-gray-500 bg-transparent"
+                                                />
+                                            </div>
+                                        </div>
+                                    );
+                                    break;
+                            }
+
+                            return (
+                                <div
+                                    key={index}
+                                    className="flex items-center text-xs gap-3"
+                                >
+                                    <div className="flex items-center text-gray-500">
+                                        {detail.icon}
+                                    </div>
+                                    <div className="w-32">{detail.label}</div>
+                                    {valueToRender}
                                 </div>
-                                <td className="w-3/4 w-3/4 p-2 pl-0">
-                                    <input
-                                        type="text"
-                                        name="username"
-                                        value={tempRowContent.username}
-                                        onChange={handleTempRowContentChange}
-                                        onKeyDown={handleEnterPress}
-                                        className="ml-2 w-full p-1 focus:outline-gray-200  hover:bg-gray-50"
-                                    />
-                                </td>
-                            </tr>
-                            <tr className="w-full text-xs items-center flex flex-row justify-between">
-                                <div className="flex flex-row space-x-2 text-gray-500 items-center">
-                                    <td>
-                                        <ListBulletIcon className="h-4 w-4" />
-                                    </td>
-                                    <td className="w-32">Role</td>
-                                </div>
-                                <td className="w-3/4 hover:bg-gray-50">
-                                    <TagsInput
-                                        presetValue={tempRowContent.role}
-                                        presetOptions={presetOptions}
-                                        setPresetOptions={setPresetOptions}
-                                        getTagColor={getTagColor}
-                                        setTagColors={setTagColors}
-                                    />
-                                </td>
-                            </tr>
-                            <tr className="w-full text-xs items-center flex flex-row justify-between">
-                                <div className="flex flex-row space-x-2 text-gray-500 items-center">
-                                    <td>
-                                        <EnvelopeIcon className="h-4 w-4" />
-                                    </td>
-                                    <td className="w-32">Email</td>
-                                </div>
-                                <td className="w-3/4 p-2 pl-0">
-                                    <input
-                                        type="text"
-                                        name="email"
-                                        value={tempRowContent.email}
-                                        onChange={handleTempRowContentChange}
-                                        onKeyDown={handleEnterPress}
-                                        className="ml-2 w-80 p-1 font-normal hover:text-gray-400 focus:outline-gray-200  hover:bg-gray-50 underline text-gray-500"
-                                    />
-                                </td>
-                            </tr>
-                            <tr className="w-full text-xs items-center flex flex-row justify-between">
-                                <div className="flex flex-row space-x-2 text-gray-500 items-center">
-                                    <td>
-                                        <ListBulletIcon className="h-4 w-4" />
-                                    </td>
-                                    <td className="w-32">Type of Program</td>
-                                </div>
-                                <td className="w-3/4 hover:bg-gray-50">
-                                    {/* {rowContent.program} */}
-                                    <TagsInput
-                                        presetValue={tempRowContent.program}
-                                        presetOptions={rolePresetOptions}
-                                        setPresetOptions={setRolePresetOptions}
-                                        getTagColor={getTagColor}
-                                        setTagColors={setTagColors}
-                                    />
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
+                            );
+                        })}
+                    </div>
                     <br />
                 </div>
             </div>
diff --git a/compass/components/Table/ResourceTable.tsx b/compass/components/Table/ResourceTable.tsx
index 6979498..f75176b 100644
--- a/compass/components/Table/ResourceTable.tsx
+++ b/compass/components/Table/ResourceTable.tsx
@@ -1,4 +1,10 @@
-import { Bars2Icon } from "@heroicons/react/24/solid";
+import {
+    Bars2Icon,
+    DocumentTextIcon,
+    LinkIcon,
+    ListBulletIcon,
+    UserIcon,
+} from "@heroicons/react/24/solid";
 import { Dispatch, SetStateAction, useState } from "react";
 import useTagsHandler from "@/components/TagsInput/TagsHandler";
 import { ColumnDef, createColumnHelper } from "@tanstack/react-table";
@@ -6,6 +12,8 @@ import { RowOpenAction } from "@/components/Table/RowOpenAction";
 import Table from "@/components/Table/Table";
 import TagsInput from "@/components/TagsInput/Index";
 import Resource from "@/utils/models/Resource";
+import { Details } from "../Drawer/Drawer";
+import { Tag } from "../TagsInput/Tag";
 
 type ResourceTableProps = {
     data: Resource[];
@@ -20,60 +28,101 @@ type ResourceTableProps = {
 export default function ResourceTable({ data, setData }: ResourceTableProps) {
     const columnHelper = createColumnHelper<Resource>();
 
-    // Set up tag handling
-    const programProps = useTagsHandler(["community", "domestic", "economic"]);
+    const [programPresets, setProgramPresets] = useState([
+        "domestic",
+        "community",
+        "economic",
+    ]);
 
+    const resourceDetails: Details[] = [
+        {
+            key: "name",
+            label: "name",
+            inputType: "text",
+            icon: <UserIcon className="h-4 w-4" />,
+        },
+        {
+            key: "link",
+            label: "link",
+            inputType: "email",
+            icon: <LinkIcon className="h-4 w-4" />,
+        },
+        {
+            key: "program",
+            label: "program",
+            inputType: "select-one",
+            icon: <ListBulletIcon className="h-4 w-4" />,
+            presetOptionsValues: programPresets,
+            presetOptionsSetter: setProgramPresets,
+        },
+        {
+            key: "summary",
+            label: "summary",
+            inputType: "textarea",
+            icon: <DocumentTextIcon className="h-4 w-4" />,
+        },
+    ];
     // Define Tanstack columns
     const columns: ColumnDef<Resource, any>[] = [
         columnHelper.accessor("name", {
             header: () => (
                 <>
-                    <Bars2Icon className="inline align-top h-4" /> Name
+                    <UserIcon className="inline align-top h-4" /> Name
                 </>
             ),
             cell: (info) => (
                 <RowOpenAction
                     title={info.getValue()}
+                    titleKey="name"
                     rowData={info.row.original}
                     setData={setData}
+                    details={resourceDetails}
                 />
             ),
         }),
         columnHelper.accessor("link", {
             header: () => (
                 <>
-                    <Bars2Icon className="inline align-top h-4" /> Link
+                    <LinkIcon className="inline align-top h-4" /> Link
                 </>
             ),
             cell: (info) => (
-                <a
-                    href={info.getValue()}
-                    target={"_blank"}
-                    className="ml-2 text-gray-500 underline hover:text-gray-400"
-                >
-                    {info.getValue()}
-                </a>
+                <div className="flex items-start gap-2 px-2">
+                    <a
+                        href={info.getValue()}
+                        target="_blank"
+                        className="text-gray-500 underline hover:text-gray-400 break-all"
+                    >
+                        {info.getValue()}
+                    </a>
+                </div>
             ),
         }),
         columnHelper.accessor("program", {
             header: () => (
                 <>
-                    <Bars2Icon className="inline align-top h-4" /> Program
+                    <ListBulletIcon className="inline align-top h-4" /> Program
                 </>
             ),
             cell: (info) => (
-                <TagsInput presetValue={info.getValue()} {...programProps} />
+                <div className="flex flex-wrap gap-2 items-center px-2">
+                    <Tag>{info.getValue()}</Tag>
+                </div>
             ),
         }),
-
         columnHelper.accessor("summary", {
             header: () => (
                 <>
-                    <Bars2Icon className="inline align-top h-4" /> Summary
+                    <DocumentTextIcon className="inline align-top h-4" />{" "}
+                    Summary
                 </>
             ),
             cell: (info) => (
-                <span className="ml-2 text-gray-500">{info.getValue()}</span>
+                <div className="flex items-start gap-2 px-2 py-1">
+                    <span className="text-gray-500 max-h-8 overflow-y-auto">
+                        {info.getValue()}
+                    </span>
+                </div>
             ),
         }),
     ];
diff --git a/compass/components/Table/RowOpenAction.tsx b/compass/components/Table/RowOpenAction.tsx
index a6aeb52..bf0bab3 100644
--- a/compass/components/Table/RowOpenAction.tsx
+++ b/compass/components/Table/RowOpenAction.tsx
@@ -1,37 +1,37 @@
-import Drawer from "@/components/Drawer/Drawer";
+import Drawer, { Details } from "@/components/Drawer/Drawer";
 import DataPoint from "@/utils/models/DataPoint";
+import {
+    EnvelopeIcon,
+    ListBulletIcon,
+    UserIcon,
+} from "@heroicons/react/24/solid";
 import { Dispatch, SetStateAction, useState } from "react";
 
 type RowOpenActionProps<T extends DataPoint> = {
     title: string;
+    titleKey: string;
     rowData: T;
     setData: Dispatch<SetStateAction<T[]>>;
+    details: Details[];
 };
 
 export function RowOpenAction<T extends DataPoint>({
     title,
+    titleKey,
     rowData,
     setData,
+    details,
 }: RowOpenActionProps<T>) {
-    const [pageContent, setPageContent] = useState("");
-
-    const handleDrawerContentChange = (newContent: string) => {
-        setPageContent(newContent);
-    };
-
     return (
         <div className="font-semibold group flex flex-row items-center justify-between pr-2">
             {title}
             <span>
                 <Drawer
-                    title="My Drawer Title"
-                    editableContent={pageContent}
+                    titleKey={titleKey}
                     rowContent={rowData}
-                    onSave={handleDrawerContentChange}
-                    setData={setData}
-                >
-                    {pageContent}
-                </Drawer>
+                    details={details}
+                    setRowContent={setData}
+                />
             </span>
         </div>
     );
diff --git a/compass/components/Table/ServiceTable.tsx b/compass/components/Table/ServiceTable.tsx
index 794452e..1941678 100644
--- a/compass/components/Table/ServiceTable.tsx
+++ b/compass/components/Table/ServiceTable.tsx
@@ -1,11 +1,17 @@
-import { Bars2Icon } from "@heroicons/react/24/solid";
-import { Dispatch, SetStateAction } from "react";
-import useTagsHandler from "@/components/TagsInput/TagsHandler";
+import {
+    Bars2Icon,
+    CheckCircleIcon,
+    DocumentTextIcon,
+    ListBulletIcon,
+    UserIcon,
+} from "@heroicons/react/24/solid";
+import { Dispatch, SetStateAction, useState } from "react";
 import { ColumnDef, createColumnHelper } from "@tanstack/react-table";
 import Table from "@/components/Table/Table";
 import { RowOpenAction } from "@/components/Table/RowOpenAction";
-import TagsInput from "@/components/TagsInput/Index";
 import Service from "@/utils/models/Service";
+import { Details } from "../Drawer/Drawer";
+import { Tag } from "../TagsInput/Tag";
 
 type ServiceTableProps = {
     data: Service[];
@@ -20,11 +26,13 @@ type ServiceTableProps = {
 export default function ServiceTable({ data, setData }: ServiceTableProps) {
     const columnHelper = createColumnHelper<Service>();
 
-    // Set up tag handling
-    const programProps = useTagsHandler(["community", "domestic", "economic"]);
+    const [programPresets, setProgramPresets] = useState([
+        "domestic",
+        "community",
+        "economic",
+    ]);
 
-    // TODO: Dynamically or statically get full list of preset requirement tag options
-    const requirementProps = useTagsHandler([
+    const [requirementPresets, setRequirementPresets] = useState([
         "anonymous",
         "confidential",
         "referral required",
@@ -34,67 +42,111 @@ export default function ServiceTable({ data, setData }: ServiceTableProps) {
         "initial assessment",
     ]);
 
+    const serviceDetails: Details[] = [
+        {
+            key: "name",
+            label: "name",
+            inputType: "text",
+            icon: <UserIcon className="inline align-top h-4" />,
+        },
+        {
+            key: "status",
+            label: "status",
+            inputType: "text",
+            icon: <CheckCircleIcon className="inline align-top h-4" />,
+        },
+        {
+            key: "program",
+            label: "program",
+            inputType: "select-one",
+            icon: <ListBulletIcon className="inline align-top h-4" />,
+            presetOptionsValues: programPresets,
+            presetOptionsSetter: setProgramPresets,
+        },
+        {
+            key: "requirements",
+            label: "requirements",
+            inputType: "select-multiple",
+            icon: <ListBulletIcon className="inline align-top h-4" />,
+            presetOptionsValues: requirementPresets,
+            presetOptionsSetter: setRequirementPresets,
+        },
+        {
+            key: "summary",
+            label: "summary",
+            inputType: "textarea",
+            icon: <DocumentTextIcon className="inline align-top h-4" />,
+        },
+    ];
+
     // Define Tanstack columns
     const columns: ColumnDef<Service, any>[] = [
         columnHelper.accessor("name", {
             header: () => (
                 <>
-                    <Bars2Icon className="inline align-top h-4" /> Name
+                    <UserIcon className="inline align-top h-4" /> Name
                 </>
             ),
             cell: (info) => (
                 <RowOpenAction
                     title={info.getValue()}
+                    titleKey="name"
                     rowData={info.row.original}
                     setData={setData}
+                    details={serviceDetails}
                 />
             ),
         }),
         columnHelper.accessor("status", {
             header: () => (
                 <>
-                    <Bars2Icon className="inline align-top h-4" /> Status
+                    <CheckCircleIcon className="inline align-top h-4" /> Status
                 </>
             ),
             cell: (info) => (
-                <span className="ml-2 text-gray-500">{info.getValue()}</span>
+                <span className="text-gray-500 px-2">{info.getValue()}</span>
             ),
         }),
         columnHelper.accessor("program", {
             header: () => (
                 <>
-                    <Bars2Icon className="inline align-top h-4" /> Program
+                    <ListBulletIcon className="inline align-top h-4" /> Program
                 </>
             ),
             cell: (info) => (
-                <TagsInput presetValue={info.getValue()} {...programProps} />
+                <div className="flex flex-wrap gap-2 items-center px-2">
+                    <Tag>{info.getValue()}</Tag>
+                </div>
             ),
         }),
         columnHelper.accessor("requirements", {
             header: () => (
                 <>
-                    <Bars2Icon className="inline align-top h-4" /> Requirements
+                    <ListBulletIcon className="inline align-top h-4" />{" "}
+                    Requirements
                 </>
             ),
             cell: (info) => (
-                // TODO: Setup different tag handler for requirements
-                <TagsInput
-                    presetValue={
-                        info.getValue()[0] !== "" ? info.getValue() : ["N/A"]
-                    }
-                    {...requirementProps}
-                />
+                <div className="flex flex-wrap gap-2 items-center px-2">
+                    {info.getValue().map((tag: string, index: number) => {
+                        return <Tag key={index}>{tag}</Tag>;
+                    })}
+                </div>
             ),
         }),
-
         columnHelper.accessor("summary", {
             header: () => (
                 <>
-                    <Bars2Icon className="inline align-top h-4" /> Summary
+                    <DocumentTextIcon className="inline align-top h-4" />{" "}
+                    Summary
                 </>
             ),
             cell: (info) => (
-                <span className="ml-2 text-gray-500">{info.getValue()}</span>
+                <div className="flex items-start gap-2 px-2 py-1">
+                    <span className="text-gray-500 max-h-8 overflow-y-auto">
+                        {info.getValue()}
+                    </span>
+                </div>
             ),
         }),
     ];
diff --git a/compass/components/Table/UserTable.tsx b/compass/components/Table/UserTable.tsx
index a480dc8..7e217a6 100644
--- a/compass/components/Table/UserTable.tsx
+++ b/compass/components/Table/UserTable.tsx
@@ -2,14 +2,19 @@ import {
     ArrowDownCircleIcon,
     AtSymbolIcon,
     Bars2Icon,
+    EnvelopeIcon,
+    ListBulletIcon,
+    UserIcon,
 } from "@heroicons/react/24/solid";
-import { Dispatch, SetStateAction } from "react";
+import { Dispatch, SetStateAction, useState } from "react";
 import useTagsHandler from "@/components/TagsInput/TagsHandler";
 import { ColumnDef, createColumnHelper } from "@tanstack/react-table";
 import Table from "@/components/Table/Table";
 import { RowOpenAction } from "@/components/Table/RowOpenAction";
 import TagsInput from "@/components/TagsInput/Index";
 import User from "@/utils/models/User";
+import { Details } from "../Drawer/Drawer";
+import { Tag } from "../TagsInput/Tag";
 
 type UserTableProps = {
     data: User[];
@@ -24,46 +29,83 @@ type UserTableProps = {
 export default function UserTable({ data, setData }: UserTableProps) {
     const columnHelper = createColumnHelper<User>();
 
-    // Set up tag handling
-    const roleProps = useTagsHandler([
-        "administrator",
+    const [rolePresets, setRolePresets] = useState([
+        "admin",
         "volunteer",
         "employee",
     ]);
 
-    const programProps = useTagsHandler(["community", "domestic", "economic"]);
+    const [programPresets, setProgramPresets] = useState([
+        "domestic",
+        "community",
+        "economic",
+    ]);
+
+    const userDetails: Details[] = [
+        {
+            key: "username",
+            label: "username",
+            inputType: "text",
+            icon: <UserIcon className="h-4 w-4" />,
+        },
+        {
+            key: "role",
+            label: "role",
+            inputType: "select-one",
+            icon: <ListBulletIcon className="h-4 w-4" />,
+            presetOptionsValues: rolePresets,
+            presetOptionsSetter: setRolePresets,
+        },
+        {
+            key: "email",
+            label: "email",
+            inputType: "email",
+            icon: <EnvelopeIcon className="h-4 w-4" />,
+        },
+        {
+            key: "program",
+            label: "program",
+            inputType: "select-multiple",
+            icon: <ListBulletIcon className="h-4 w-4" />,
+            presetOptionsValues: programPresets,
+            presetOptionsSetter: setProgramPresets,
+        },
+    ];
 
     // Define Tanstack columns
     const columns: ColumnDef<User, any>[] = [
         columnHelper.accessor("username", {
             header: () => (
                 <>
-                    <Bars2Icon className="inline align-top h-4" /> Username
+                    <UserIcon className="inline align-top h-4" /> Username
                 </>
             ),
             cell: (info) => (
                 <RowOpenAction
                     title={info.getValue()}
+                    titleKey="username"
                     rowData={info.row.original}
                     setData={setData}
+                    details={userDetails}
                 />
             ),
         }),
         columnHelper.accessor("role", {
             header: () => (
                 <>
-                    <ArrowDownCircleIcon className="inline align-top h-4" />{" "}
-                    Role
+                    <ListBulletIcon className="inline align-top h-4" /> Role
                 </>
             ),
             cell: (info) => (
-                <TagsInput presetValue={info.getValue()} {...roleProps} />
+                <div className="flex ml-2 flex-wrap gap-2 items-center">
+                    <Tag>{info.getValue()}</Tag>
+                </div>
             ),
         }),
         columnHelper.accessor("email", {
             header: () => (
                 <>
-                    <AtSymbolIcon className="inline align-top h-4" /> Email
+                    <EnvelopeIcon className="inline align-top h-4" /> Email
                 </>
             ),
             cell: (info) => (
@@ -75,12 +117,15 @@ export default function UserTable({ data, setData }: UserTableProps) {
         columnHelper.accessor("program", {
             header: () => (
                 <>
-                    <ArrowDownCircleIcon className="inline align-top h-4" />{" "}
-                    Program
+                    <ListBulletIcon className="inline align-top h-4" /> Program
                 </>
             ),
             cell: (info) => (
-                <TagsInput presetValue={info.getValue()} {...programProps} />
+                <div className="flex ml-2 flex-wrap gap-2 items-center">
+                    {info.getValue().map((tag: string, index: number) => {
+                        return <Tag key={index}>{tag}</Tag>;
+                    })}
+                </div>
             ),
         }),
     ];
diff --git a/compass/components/TagsInput/CreateNewTagAction.tsx b/compass/components/TagsInput/CreateNewTagAction.tsx
index c155fc9..5716f93 100644
--- a/compass/components/TagsInput/CreateNewTagAction.tsx
+++ b/compass/components/TagsInput/CreateNewTagAction.tsx
@@ -1,12 +1,18 @@
 import { Tag } from "./Tag";
 
-export const CreateNewTagAction = ({ input }) => {
+interface NewTagProps {
+    input: string;
+    addTag: () => void;
+}
+
+export const CreateNewTagAction = ({ input, addTag }: NewTagProps) => {
     return (
-        <div className="flex flex-row space-x-2 hover:bg-gray-100 rounded-md py-2 p-2 items-center">
+        <button
+            className="flex flex-row space-x-2 hover:bg-gray-100 rounded-md py-2 p-2 items-center"
+            onClick={addTag}
+        >
             <p className="capitalize">Create</p>
-            <Tag active={false} onDelete={null}>
-                {input}
-            </Tag>
-        </div>
+            <Tag active={false}>{input}</Tag>
+        </button>
     );
 };
diff --git a/compass/components/TagsInput/DropdownAction.tsx b/compass/components/TagsInput/DropdownAction.tsx
index c185858..af35c45 100644
--- a/compass/components/TagsInput/DropdownAction.tsx
+++ b/compass/components/TagsInput/DropdownAction.tsx
@@ -1,11 +1,21 @@
 import { EllipsisHorizontalIcon, TrashIcon } from "@heroicons/react/24/solid";
 import { useState } from "react";
 
-export const DropdownAction = ({ tag, handleDeleteTag, handleEditTag }) => {
+interface DropdownActionProps {
+    tag: string;
+    handleDeleteTag: (tag: string) => void;
+    handleEditTag: (oldTag: string, newTag: string) => void;
+}
+
+export const DropdownAction = ({
+    tag,
+    handleDeleteTag,
+    handleEditTag,
+}: DropdownActionProps) => {
     const [isVisible, setVisible] = useState(false);
     const [inputValue, setInputValue] = useState(tag);
 
-    const editTagOption = (e) => {
+    const editTagOption = (e: React.KeyboardEvent<HTMLInputElement>) => {
         if (e.key === "Enter") {
             handleEditTag(tag, inputValue);
             setVisible(false);
diff --git a/compass/components/TagsInput/Index.tsx b/compass/components/TagsInput/Index.tsx
index f4b021e..132ddf8 100644
--- a/compass/components/TagsInput/Index.tsx
+++ b/compass/components/TagsInput/Index.tsx
@@ -6,51 +6,53 @@ import { CreateNewTagAction } from "./CreateNewTagAction";
 
 interface TagsInputProps {
     presetOptions: string[];
-    presetValue: string | string[];
+    presetValue: string[];
     setPresetOptions: Dispatch<SetStateAction<string[]>>;
-    getTagColor(tag: string): string;
 }
 
 const TagsInput: React.FC<TagsInputProps> = ({
     presetValue,
     presetOptions,
     setPresetOptions,
-    getTagColor,
 }) => {
     const [inputValue, setInputValue] = useState("");
     const [cellSelected, setCellSelected] = useState(false);
+
+    // TODO: Add tags to the database and remove the presetValue and lowercasing
     const [tags, setTags] = useState<Set<string>>(
-        typeof presetValue === "string"
-            ? new Set([presetValue])
-            : new Set(presetValue)
+        new Set(presetValue.map((tag) => tag.toLowerCase()))
+    );
+    const [options, setOptions] = useState<Set<string>>(
+        new Set(presetOptions.map((option) => option.toLowerCase()))
+    );
+    const [filteredOptions, setFilteredOptions] = useState<Set<string>>(
+        new Set(presetOptions)
     );
-    const [options, setOptions] = useState<Set<string>>(new Set(presetOptions));
     const dropdown = useRef<HTMLDivElement>(null);
 
     const handleClick = () => {
         if (!cellSelected) {
             setCellSelected(true);
-            // Add event listener only after setting cellSelected to true
             setTimeout(() => {
                 window.addEventListener("click", handleOutsideClick);
             }, 100);
         }
     };
 
-    // TODO: Fix MouseEvent type and remove the as Node as that is completely wrong
     const handleOutsideClick = (event: MouseEvent) => {
+        console.log(dropdown.current);
         if (
             dropdown.current &&
             !dropdown.current.contains(event.target as Node)
         ) {
+            console.log("outside");
             setCellSelected(false);
-            // Remove event listener after handling outside click
             window.removeEventListener("click", handleOutsideClick);
         }
     };
 
     const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-        setOptions(() => {
+        setFilteredOptions(() => {
             const newOptions = presetOptions.filter((item) =>
                 item.includes(e.target.value.toLowerCase())
             );
@@ -61,39 +63,45 @@ const TagsInput: React.FC<TagsInputProps> = ({
 
     const handleAddTag = (e: React.KeyboardEvent<HTMLInputElement>) => {
         if (e.key === "Enter" && inputValue.trim()) {
-            // setPresetOptions((prevPreset) => {
-            //   const uniqueSet = new Set(presetOptions);
-            //   uniqueSet.add(inputValue);
-            //   return Array.from(uniqueSet);
-            // });
-            setTags((prevTags) => new Set(prevTags).add(inputValue));
-            setOptions((prevOptions) => new Set(prevOptions).add(inputValue));
-            setInputValue("");
+            addTag(e);
         }
     };
 
+    const addTag = (e?: React.KeyboardEvent<HTMLInputElement>) => {
+        e?.stopPropagation();
+
+        setOptions(new Set(Array.from(options).concat(inputValue)));
+        setTags(new Set(Array.from(tags).concat(inputValue)));
+        setFilteredOptions(new Set(Array.from(options).concat(inputValue)));
+        setInputValue("");
+    };
+
     const handleSelectTag = (tagToAdd: string) => {
+        console.log(tagToAdd);
+        console.log(tags);
+
         if (!tags.has(tagToAdd)) {
-            // Corrected syntax for checking if a Set contains an item
-            setTags((prevTags) => new Set(prevTags).add(tagToAdd));
+            setTags(new Set(Array.from(tags).concat(tagToAdd)));
         }
     };
 
     const handleDeleteTag = (tagToDelete: string) => {
-        setTags((prevTags) => {
-            const updatedTags = new Set(prevTags);
-            updatedTags.delete(tagToDelete);
-            return updatedTags;
-        });
+        setTags(new Set(Array.from(tags).filter((tag) => tag !== tagToDelete)));
     };
 
     const handleDeleteTagOption = (tagToDelete: string) => {
-        // setPresetOptions(presetOptions.filter(tag => tag !== tagToDelete));
-        setOptions((prevOptions) => {
-            const updatedOptions = new Set(prevOptions);
-            updatedOptions.delete(tagToDelete);
-            return updatedOptions;
-        });
+        setOptions(
+            new Set(
+                Array.from(options).filter((option) => option !== tagToDelete)
+            )
+        );
+
+        setFilteredOptions(
+            new Set(
+                Array.from(options).filter((option) => option !== tagToDelete)
+            )
+        );
+
         if (tags.has(tagToDelete)) {
             handleDeleteTag(tagToDelete);
         }
@@ -101,23 +109,20 @@ const TagsInput: React.FC<TagsInputProps> = ({
 
     const handleEditTag = (oldTag: string, newTag: string) => {
         if (oldTag !== newTag) {
-            setTags((prevTags) => {
-                const tagsArray = Array.from(prevTags);
-                const oldTagIndex = tagsArray.indexOf(oldTag);
-                if (oldTagIndex !== -1) {
-                    tagsArray.splice(oldTagIndex, 1, newTag);
-                }
-                return new Set(tagsArray);
-            });
-
-            setOptions((prevOptions) => {
-                const optionsArray = Array.from(prevOptions);
-                const oldTagIndex = optionsArray.indexOf(oldTag);
-                if (oldTagIndex !== -1) {
-                    optionsArray.splice(oldTagIndex, 1, newTag);
-                }
-                return new Set(optionsArray);
-            });
+            setTags(
+                new Set(
+                    Array.from(tags)
+                        .filter((tag) => tag !== oldTag)
+                        .concat(newTag)
+                )
+            );
+            setOptions(
+                new Set(
+                    Array.from(options)
+                        .filter((option) => option !== oldTag)
+                        .concat(newTag)
+                )
+            );
         }
     };
 
@@ -157,10 +162,13 @@ const TagsInput: React.FC<TagsInputProps> = ({
                                     handleDeleteTag={handleDeleteTagOption}
                                     handleEditTag={handleEditTag}
                                     handleAdd={handleSelectTag}
-                                    tags={options}
+                                    tags={filteredOptions}
                                 />
                                 {inputValue.length > 0 && (
-                                    <CreateNewTagAction input={inputValue} />
+                                    <CreateNewTagAction
+                                        input={inputValue}
+                                        addTag={addTag}
+                                    />
                                 )}
                             </div>
                         </div>
diff --git a/compass/components/TagsInput/Tag.tsx b/compass/components/TagsInput/Tag.tsx
index aa8a750..044e484 100644
--- a/compass/components/TagsInput/Tag.tsx
+++ b/compass/components/TagsInput/Tag.tsx
@@ -1,14 +1,25 @@
 import { XMarkIcon } from "@heroicons/react/24/solid";
 import React, { useState, useEffect } from "react";
 
-export const Tag = ({ children, handleDelete, active = false }) => {
+interface TagProps {
+    children: string;
+    handleDelete?: (tag: string) => void;
+    active?: boolean;
+}
+
+export const Tag = ({ children, handleDelete, active = false }: TagProps) => {
     return (
         <span
             className={`font-normal bg-purple-100 text-gray-800 flex flex-row p-1 px-2 rounded-lg`}
         >
             {children}
             {active && handleDelete && (
-                <button onClick={() => handleDelete(children)}>
+                <button
+                    onClick={(e) => {
+                        e.stopPropagation();
+                        handleDelete(children);
+                    }}
+                >
                     <XMarkIcon className={`ml-1 w-3 text-purple-500`} />
                 </button>
             )}
diff --git a/compass/components/TagsInput/TagDropdown.tsx b/compass/components/TagsInput/TagDropdown.tsx
index 9ec1a09..29262b3 100644
--- a/compass/components/TagsInput/TagDropdown.tsx
+++ b/compass/components/TagsInput/TagDropdown.tsx
@@ -1,12 +1,19 @@
 import { Tag } from "./Tag";
 import { DropdownAction } from "./DropdownAction";
 
+interface TagDropdownProps {
+    tags: Set<string>;
+    handleEditTag: (oldTag: string, newTag: string) => void;
+    handleDeleteTag: (tag: string) => void;
+    handleAdd: (tag: string) => void;
+}
+
 export const TagDropdown = ({
     tags,
     handleEditTag,
     handleDeleteTag,
     handleAdd,
-}) => {
+}: TagDropdownProps) => {
     return (
         <div className="z-50 flex flex-col space-y-2 mt-2">
             {Array.from(tags).map((tag, index) => (
diff --git a/compass/components/auth/Loading.tsx b/compass/components/auth/Loading.tsx
index a655fb3..a56537b 100644
--- a/compass/components/auth/Loading.tsx
+++ b/compass/components/auth/Loading.tsx
@@ -11,6 +11,8 @@ const Loading = () => {
                     alt="Compass Center logo."
                     width={100}
                     height={91}
+                    style={{ height: "auto", width: "auto" }}
+                    priority
                 />
                 <h1 className={styles.loadingTitle}>Loading...</h1>
                 <div className={styles.loadingSpinner}></div>
diff --git a/compass/components/auth/LoggingOut.tsx b/compass/components/auth/LoggingOut.tsx
index 8915e23..13b3877 100644
--- a/compass/components/auth/LoggingOut.tsx
+++ b/compass/components/auth/LoggingOut.tsx
@@ -11,6 +11,8 @@ const LoggingOut = () => {
                     alt="Compass Center logo."
                     width={100}
                     height={91}
+                    style={{ height: "auto", width: "auto" }}
+                    priority
                 />
                 <h1 className={styles.loadingTitle}>Signing out...</h1>
                 <div className={styles.loadingSpinner}></div>
diff --git a/compass/components/page/Drawer.tsx b/compass/components/page/Drawer.tsx
deleted file mode 100644
index 6879f75..0000000
--- a/compass/components/page/Drawer.tsx
+++ /dev/null
@@ -1,247 +0,0 @@
-import { FunctionComponent, ReactNode } from "react";
-import React, { useState } from "react";
-import { ChevronDoubleLeftIcon } from "@heroicons/react/24/solid";
-import {
-    StarIcon as SolidStarIcon,
-    EnvelopeIcon,
-    UserIcon,
-} from "@heroicons/react/24/solid";
-import {
-    ArrowsPointingOutIcon,
-    ArrowsPointingInIcon,
-    StarIcon as OutlineStarIcon,
-    ListBulletIcon,
-} from "@heroicons/react/24/outline";
-import TagsInput from "../TagsInput/Index";
-
-type DrawerProps = {
-    title: string;
-    children: ReactNode;
-    onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void;
-    type?: "button" | "submit" | "reset"; // specify possible values for type
-    disabled?: boolean;
-    editableContent?: any;
-    onSave?: (content: any) => void;
-    rowContent?: any;
-    onRowUpdate?: (content: any) => void;
-};
-
-interface EditContent {
-    content: string;
-    isEditing: boolean;
-}
-
-const Drawer: FunctionComponent<DrawerProps> = ({
-    title,
-    children,
-    onSave,
-    editableContent,
-    rowContent,
-    onRowUpdate,
-}) => {
-    const [isOpen, setIsOpen] = useState(false);
-    const [isFull, setIsFull] = useState(false);
-    const [isFavorite, setIsFavorite] = useState(false);
-    const [tempRowContent, setTempRowContent] = useState(rowContent);
-
-    const handleTempRowContentChange = (e) => {
-        const { name, value } = e.target;
-        console.log(name);
-        console.log(value);
-        setTempRowContent((prevContent) => ({
-            ...prevContent,
-            [name]: value,
-        }));
-    };
-
-    const handleEnterPress = (e) => {
-        if (e.key === "Enter") {
-            e.preventDefault();
-            // Update the rowContent with the temporaryRowContent
-            if (onRowUpdate) {
-                onRowUpdate(tempRowContent);
-            }
-        }
-    };
-
-    const toggleDrawer = () => {
-        setIsOpen(!isOpen);
-        if (isFull) {
-            setIsFull(!isFull);
-        }
-    };
-
-    const toggleDrawerFullScreen = () => setIsFull(!isFull);
-
-    const toggleFavorite = () => setIsFavorite(!isFavorite);
-
-    const drawerClassName = `fixed top-0 right-0 w-1/2 h-full bg-white transform ease-in-out duration-300 z-20 ${
-        isOpen ? "translate-x-0 shadow-xl" : "translate-x-full"
-    } ${isFull ? "w-full" : "w-1/2"}`;
-
-    const iconComponent = isFull ? (
-        <ArrowsPointingInIcon className="h-5 w-5" />
-    ) : (
-        <ArrowsPointingOutIcon className="h-5 w-5" />
-    );
-
-    const favoriteIcon = isFavorite ? (
-        <SolidStarIcon className="h-5 w-5" />
-    ) : (
-        <OutlineStarIcon className="h-5 w-5" />
-    );
-
-    const [presetOptions, setPresetOptions] = useState([
-        "administrator",
-        "volunteer",
-        "employee",
-    ]);
-    const [rolePresetOptions, setRolePresetOptions] = useState([
-        "domestic",
-        "community",
-        "economic",
-    ]);
-    const [tagColors, setTagColors] = useState(new Map());
-
-    const getTagColor = (tag: string) => {
-        if (!tagColors.has(tag)) {
-            const colors = [
-                "bg-cyan-100",
-                "bg-blue-100",
-                "bg-green-100",
-                "bg-yellow-100",
-                "bg-purple-100",
-            ];
-            const randomColor =
-                colors[Math.floor(Math.random() * colors.length)];
-            setTagColors(new Map(tagColors).set(tag, randomColor));
-        }
-        return tagColors.get(tag);
-    };
-
-    return (
-        <div>
-            <button
-                className={
-                    "ml-2 text-xs uppercase opacity-0 group-hover:opacity-100 text-gray-500 font-medium border border-gray-200 bg-white shadow hover:bg-gray-50 p-2 rounded-md"
-                }
-                onClick={toggleDrawer}
-            >
-                Open
-            </button>
-            <div className={drawerClassName}></div>
-            <div className={drawerClassName}>
-                <div className="flex items-center justify-between p-4">
-                    <div className="flex flex-row items-center justify-between space-x-2">
-                        <span className="h-5 text-purple-200 w-5">
-                            <UserIcon />
-                        </span>
-                        <h2 className="text-lg text-gray-800 font-semibold">
-                            {rowContent.username}
-                        </h2>
-                    </div>
-                    <div>
-                        <button
-                            onClick={toggleFavorite}
-                            className="py-2 text-gray-500 hover:text-gray-800 mr-2"
-                        >
-                            {favoriteIcon}
-                        </button>
-                        <button
-                            onClick={toggleDrawerFullScreen}
-                            className="py-2 text-gray-500 hover:text-gray-800 mr-2"
-                        >
-                            {iconComponent}
-                        </button>
-                        <button
-                            onClick={toggleDrawer}
-                            className="py-2 text-gray-500 hover:text-gray-800"
-                        >
-                            <ChevronDoubleLeftIcon className="h-5 w-5" />
-                        </button>
-                    </div>
-                </div>
-                <div className="p-4">
-                    <table className="p-4">
-                        <tbody className="items-center">
-                            <tr className="w-full text-xs items-center flex flex-row justify-between">
-                                <div className="flex flex-row space-x-2 text-gray-500 items-center">
-                                    <td>
-                                        <UserIcon className="h-4 w-4" />
-                                    </td>
-                                    <td className="w-32">Username</td>
-                                </div>
-                                <td className="w-3/4 w-3/4 p-2 pl-0">
-                                    <input
-                                        type="text"
-                                        name="username"
-                                        value={tempRowContent.username}
-                                        onChange={handleTempRowContentChange}
-                                        onKeyDown={handleEnterPress}
-                                        className="ml-2 w-full p-1 focus:outline-gray-200  hover:bg-gray-50"
-                                    />
-                                </td>
-                            </tr>
-                            <tr className="w-full text-xs items-center flex flex-row justify-between">
-                                <div className="flex flex-row space-x-2 text-gray-500 items-center">
-                                    <td>
-                                        <ListBulletIcon className="h-4 w-4" />
-                                    </td>
-                                    <td className="w-32">Role</td>
-                                </div>
-                                <td className="w-3/4 hover:bg-gray-50">
-                                    <TagsInput
-                                        presetValue={tempRowContent.role}
-                                        presetOptions={presetOptions}
-                                        setPresetOptions={setPresetOptions}
-                                        getTagColor={getTagColor}
-                                        setTagColors={setTagColors}
-                                    />
-                                </td>
-                            </tr>
-                            <tr className="w-full text-xs items-center flex flex-row justify-between">
-                                <div className="flex flex-row space-x-2 text-gray-500 items-center">
-                                    <td>
-                                        <EnvelopeIcon className="h-4 w-4" />
-                                    </td>
-                                    <td className="w-32">Email</td>
-                                </div>
-                                <td className="w-3/4 p-2 pl-0">
-                                    <input
-                                        type="text"
-                                        name="email"
-                                        value={tempRowContent.email}
-                                        onChange={handleTempRowContentChange}
-                                        onKeyDown={handleEnterPress}
-                                        className="ml-2 w-80 p-1 font-normal hover:text-gray-400 focus:outline-gray-200  hover:bg-gray-50 underline text-gray-500"
-                                    />
-                                </td>
-                            </tr>
-                            <tr className="w-full text-xs items-center flex flex-row justify-between">
-                                <div className="flex flex-row space-x-2 text-gray-500 items-center">
-                                    <td>
-                                        <ListBulletIcon className="h-4 w-4" />
-                                    </td>
-                                    <td className="w-32">Type of Program</td>
-                                </div>
-                                <td className="w-3/4 hover:bg-gray-50">
-                                    {/* {rowContent.program} */}
-                                    <TagsInput
-                                        presetValue={tempRowContent.program}
-                                        presetOptions={rolePresetOptions}
-                                        setPresetOptions={setRolePresetOptions}
-                                        getTagColor={getTagColor}
-                                        setTagColors={setTagColors}
-                                    />
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <br />
-                </div>
-            </div>
-        </div>
-    );
-};
-
-export default Drawer;