diff --git a/src/pages/(admin)/Lists/GroupList.tsx b/src/pages/(admin)/Lists/GroupList.tsx
index 35e9f106..ba60c9dd 100644
--- a/src/pages/(admin)/Lists/GroupList.tsx
+++ b/src/pages/(admin)/Lists/GroupList.tsx
@@ -3,400 +3,308 @@ import Input from "@/components/Low/Input";
 import Modal from "@/components/Modal";
 import useGroups from "@/hooks/useGroups";
 import useUsers from "@/hooks/useUsers";
-import { Group, User } from "@/interfaces/user";
-import {
-  createColumnHelper,
-  flexRender,
-  getCoreRowModel,
-  useReactTable,
-} from "@tanstack/react-table";
+import {CorporateUser, Group, User} from "@/interfaces/user";
+import {createColumnHelper, flexRender, getCoreRowModel, useReactTable} from "@tanstack/react-table";
 import axios from "axios";
-import { capitalize, uniq } from "lodash";
-import { useEffect, useState } from "react";
-import { BsPencil, BsQuestionCircleFill, BsTrash } from "react-icons/bs";
+import {capitalize, uniq} from "lodash";
+import {useEffect, useState} from "react";
+import {BsPencil, BsQuestionCircleFill, BsTrash} from "react-icons/bs";
 import Select from "react-select";
-import { toast } from "react-toastify";
+import {toast} from "react-toastify";
 import readXlsxFile from "read-excel-file";
-import { useFilePicker } from "use-file-picker";
+import {useFilePicker} from "use-file-picker";
 
 const columnHelper = createColumnHelper<Group>();
-const EMAIL_REGEX = new RegExp(
-  /^[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*@[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*$/,
-);
+const EMAIL_REGEX = new RegExp(/^[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*@[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*$/);
 
 interface CreateDialogProps {
-  user: User;
-  users: User[];
-  group?: Group;
-  onClose: () => void;
+	user: User;
+	users: User[];
+	group?: Group;
+	onClose: () => void;
 }
 
-const CreatePanel = ({ user, users, group, onClose }: CreateDialogProps) => {
-  const [name, setName] = useState<string | undefined>(
-    group?.name || undefined,
-  );
-  const [admin, setAdmin] = useState<string>(group?.admin || user.id);
-  const [participants, setParticipants] = useState<string[]>(
-    group?.participants || [],
-  );
-  const [isLoading, setIsLoading] = useState(false);
+const CreatePanel = ({user, users, group, onClose}: CreateDialogProps) => {
+	const [name, setName] = useState<string | undefined>(group?.name || undefined);
+	const [admin, setAdmin] = useState<string>(group?.admin || user.id);
+	const [participants, setParticipants] = useState<string[]>(group?.participants || []);
+	const [isLoading, setIsLoading] = useState(false);
 
-  const { openFilePicker, filesContent, clear } = useFilePicker({
-    accept: ".xlsx",
-    multiple: false,
-    readAs: "ArrayBuffer",
-  });
+	const {openFilePicker, filesContent, clear} = useFilePicker({
+		accept: ".xlsx",
+		multiple: false,
+		readAs: "ArrayBuffer",
+	});
 
-  useEffect(() => {
-    if (filesContent.length > 0) {
-      setIsLoading(true);
+	useEffect(() => {
+		if (filesContent.length > 0) {
+			setIsLoading(true);
 
-      const file = filesContent[0];
-      readXlsxFile(file.content).then((rows) => {
-        const emails = uniq(
-          rows
-            .map((row) => {
-              const [email] = row as string[];
-              return EMAIL_REGEX.test(email) &&
-                !users.map((u) => u.email).includes(email)
-                ? email.toString().trim()
-                : undefined;
-            })
-            .filter((x) => !!x),
-        );
+			const file = filesContent[0];
+			readXlsxFile(file.content).then((rows) => {
+				const emails = uniq(
+					rows
+						.map((row) => {
+							const [email] = row as string[];
+							return EMAIL_REGEX.test(email) && !users.map((u) => u.email).includes(email) ? email.toString().trim() : undefined;
+						})
+						.filter((x) => !!x),
+				);
 
-        if (emails.length === 0) {
-          toast.error("Please upload an Excel file containing e-mails!");
-          clear();
-          setIsLoading(false);
-          return;
-        }
+				if (emails.length === 0) {
+					toast.error("Please upload an Excel file containing e-mails!");
+					clear();
+					setIsLoading(false);
+					return;
+				}
 
-        const emailUsers = [...new Set(emails)]
-          .map((x) => users.find((y) => y.email.toLowerCase() === x))
-          .filter((x) => x !== undefined);
-        const filteredUsers = emailUsers.filter(
-          (x) =>
-            ((user.type === "developer" ||
-              user.type === "admin" ||
-              user.type === "corporate") &&
-              (x?.type === "student" || x?.type === "teacher")) ||
-            (user.type === "teacher" && x?.type === "student"),
-        );
+				const emailUsers = [...new Set(emails)].map((x) => users.find((y) => y.email.toLowerCase() === x)).filter((x) => x !== undefined);
+				const filteredUsers = emailUsers.filter(
+					(x) =>
+						((user.type === "developer" || user.type === "admin" || user.type === "corporate") &&
+							(x?.type === "student" || x?.type === "teacher")) ||
+						(user.type === "teacher" && x?.type === "student"),
+				);
 
-        setParticipants(filteredUsers.filter((x) => !!x).map((x) => x!.id));
-        toast.success(
-          user.type !== "teacher"
-            ? "Added all teachers and students found in the file you've provided!"
-            : "Added all students found in the file you've provided!",
-          { toastId: "upload-success" },
-        );
-        setIsLoading(false);
-      });
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [filesContent, user.type, users]);
+				setParticipants(filteredUsers.filter((x) => !!x).map((x) => x!.id));
+				toast.success(
+					user.type !== "teacher"
+						? "Added all teachers and students found in the file you've provided!"
+						: "Added all students found in the file you've provided!",
+					{toastId: "upload-success"},
+				);
+				setIsLoading(false);
+			});
+		}
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [filesContent, user.type, users]);
 
-  const submit = () => {
-    setIsLoading(true);
+	const submit = () => {
+		setIsLoading(true);
 
-    if (name !== group?.name && (name === "Students" || name === "Teachers")) {
-      toast.error(
-        "That group name is reserved and cannot be used, please enter another one.",
-      );
-      setIsLoading(false);
-      return;
-    }
+		if (name !== group?.name && (name === "Students" || name === "Teachers")) {
+			toast.error("That group name is reserved and cannot be used, please enter another one.");
+			setIsLoading(false);
+			return;
+		}
 
-    (group ? axios.patch : axios.post)(
-      group ? `/api/groups/${group.id}` : "/api/groups",
-      { name, admin, participants },
-    )
-      .then(() => {
-        toast.success(
-          `Group "${name}" ${group ? "edited" : "created"} successfully`,
-        );
-        return true;
-      })
-      .catch(() => {
-        toast.error("Something went wrong, please try again later!");
-        return false;
-      })
-      .finally(() => {
-        setIsLoading(false);
-        onClose();
-      });
-  };
+		(group ? axios.patch : axios.post)(group ? `/api/groups/${group.id}` : "/api/groups", {name, admin, participants})
+			.then(() => {
+				toast.success(`Group "${name}" ${group ? "edited" : "created"} successfully`);
+				return true;
+			})
+			.catch(() => {
+				toast.error("Something went wrong, please try again later!");
+				return false;
+			})
+			.finally(() => {
+				setIsLoading(false);
+				onClose();
+			});
+	};
 
-  return (
-    <div className="mt-4 flex w-full flex-col gap-12 px-4 py-2">
-      <div className="flex flex-col gap-8">
-        <Input
-          name="name"
-          type="text"
-          label="Name"
-          defaultValue={name}
-          onChange={setName}
-          required
-          disabled={group?.disableEditing}
-        />
-        <div className="flex w-full flex-col gap-3">
-          <div className="flex items-center gap-2">
-            <label className="text-mti-gray-dim text-base font-normal">
-              Participants
-            </label>
-            <div
-              className="tooltip"
-              data-tip="The Excel file should only include a column with the desired e-mails."
-            >
-              <BsQuestionCircleFill />
-            </div>
-          </div>
-          <div className="flex w-full gap-8">
-            <Select
-              className="w-full"
-              value={participants.map((x) => ({
-                value: x,
-                label: `${users.find((y) => y.id === x)?.email} - ${users.find((y) => y.id === x)?.name}`,
-              }))}
-              placeholder="Participants..."
-              defaultValue={participants.map((x) => ({
-                value: x,
-                label: `${users.find((y) => y.id === x)?.email} - ${users.find((y) => y.id === x)?.name}`,
-              }))}
-              options={users
-                .filter((x) =>
-                  user.type === "teacher"
-                    ? x.type === "student"
-                    : x.type === "student" || x.type === "teacher",
-                )
-                .map((x) => ({ value: x.id, label: `${x.email} - ${x.name}` }))}
-              onChange={(value) => setParticipants(value.map((x) => x.value))}
-              isMulti
-              isSearchable
-              menuPortalTarget={document?.body}
-              styles={{
-                menuPortal: (base) => ({ ...base, zIndex: 9999 }),
-                control: (styles) => ({
-                  ...styles,
-                  backgroundColor: "white",
-                  borderRadius: "999px",
-                  padding: "1rem 1.5rem",
-                  zIndex: "40",
-                }),
-              }}
-            />
-            {user.type !== "teacher" && (
-              <Button
-                className="w-full max-w-[300px]"
-                onClick={openFilePicker}
-                isLoading={isLoading}
-                variant="outline"
-              >
-                {filesContent.length === 0
-                  ? "Upload participants Excel file"
-                  : filesContent[0].name}
-              </Button>
-            )}
-          </div>
-        </div>
-      </div>
-      <div className="mt-8 flex w-full items-center justify-end gap-8">
-        <Button
-          variant="outline"
-          color="red"
-          className="w-full max-w-[200px]"
-          isLoading={isLoading}
-          onClick={onClose}
-        >
-          Cancel
-        </Button>
-        <Button
-          className="w-full max-w-[200px]"
-          onClick={submit}
-          isLoading={isLoading}
-          disabled={!name}
-        >
-          Submit
-        </Button>
-      </div>
-    </div>
-  );
+	return (
+		<div className="mt-4 flex w-full flex-col gap-12 px-4 py-2">
+			<div className="flex flex-col gap-8">
+				<Input name="name" type="text" label="Name" defaultValue={name} onChange={setName} required disabled={group?.disableEditing} />
+				<div className="flex w-full flex-col gap-3">
+					<div className="flex items-center gap-2">
+						<label className="text-mti-gray-dim text-base font-normal">Participants</label>
+						<div className="tooltip" data-tip="The Excel file should only include a column with the desired e-mails.">
+							<BsQuestionCircleFill />
+						</div>
+					</div>
+					<div className="flex w-full gap-8">
+						<Select
+							className="w-full"
+							value={participants.map((x) => ({
+								value: x,
+								label: `${users.find((y) => y.id === x)?.email} - ${users.find((y) => y.id === x)?.name}`,
+							}))}
+							placeholder="Participants..."
+							defaultValue={participants.map((x) => ({
+								value: x,
+								label: `${users.find((y) => y.id === x)?.email} - ${users.find((y) => y.id === x)?.name}`,
+							}))}
+							options={users
+								.filter((x) => (user.type === "teacher" ? x.type === "student" : x.type === "student" || x.type === "teacher"))
+								.map((x) => ({value: x.id, label: `${x.email} - ${x.name}`}))}
+							onChange={(value) => setParticipants(value.map((x) => x.value))}
+							isMulti
+							isSearchable
+							menuPortalTarget={document?.body}
+							styles={{
+								menuPortal: (base) => ({...base, zIndex: 9999}),
+								control: (styles) => ({
+									...styles,
+									backgroundColor: "white",
+									borderRadius: "999px",
+									padding: "1rem 1.5rem",
+									zIndex: "40",
+								}),
+							}}
+						/>
+						{user.type !== "teacher" && (
+							<Button className="w-full max-w-[300px]" onClick={openFilePicker} isLoading={isLoading} variant="outline">
+								{filesContent.length === 0 ? "Upload participants Excel file" : filesContent[0].name}
+							</Button>
+						)}
+					</div>
+				</div>
+			</div>
+			<div className="mt-8 flex w-full items-center justify-end gap-8">
+				<Button variant="outline" color="red" className="w-full max-w-[200px]" isLoading={isLoading} onClick={onClose}>
+					Cancel
+				</Button>
+				<Button className="w-full max-w-[200px]" onClick={submit} isLoading={isLoading} disabled={!name}>
+					Submit
+				</Button>
+			</div>
+		</div>
+	);
 };
 
 const filterTypes = ["corporate", "teacher"];
 
-export default function GroupList({ user }: { user: User }) {
-  const [isCreating, setIsCreating] = useState(false);
-  const [editingGroup, setEditingGroup] = useState<Group>();
-  const [filterByUser, setFilterByUser] = useState(false);
+export default function GroupList({user}: {user: User}) {
+	const [isCreating, setIsCreating] = useState(false);
+	const [editingGroup, setEditingGroup] = useState<Group>();
+	const [filterByUser, setFilterByUser] = useState(false);
 
-  const { users } = useUsers();
-  const { groups, reload } = useGroups(
-    user && filterTypes.includes(user?.type) ? user.id : undefined,
-  );
+	const {users} = useUsers();
+	const {groups, reload} = useGroups(user && filterTypes.includes(user?.type) ? user.id : undefined);
 
-  useEffect(() => {
-    if (user && (user.type === "corporate" || user.type === "teacher")) {
-      setFilterByUser(true);
-    }
-  }, [user]);
+	useEffect(() => {
+		if (user && (user.type === "corporate" || user.type === "teacher")) {
+			setFilterByUser(true);
+		}
+	}, [user]);
 
-  const deleteGroup = (group: Group) => {
-    if (!confirm(`Are you sure you want to delete "${group.name}"?`)) return;
+	const deleteGroup = (group: Group) => {
+		if (!confirm(`Are you sure you want to delete "${group.name}"?`)) return;
 
-    axios
-      .delete<{ ok: boolean }>(`/api/groups/${group.id}`)
-      .then(() => toast.success(`Group "${group.name}" deleted successfully`))
-      .catch(() => toast.error("Something went wrong, please try again later!"))
-      .finally(reload);
-  };
+		axios
+			.delete<{ok: boolean}>(`/api/groups/${group.id}`)
+			.then(() => toast.success(`Group "${group.name}" deleted successfully`))
+			.catch(() => toast.error("Something went wrong, please try again later!"))
+			.finally(reload);
+	};
 
-  const defaultColumns = [
-    columnHelper.accessor("id", {
-      header: "ID",
-      cell: (info) => info.getValue(),
-    }),
-    columnHelper.accessor("name", {
-      header: "Name",
-      cell: (info) => info.getValue(),
-    }),
-    columnHelper.accessor("admin", {
-      header: "Admin",
-      cell: (info) => (
-        <div
-          className="tooltip"
-          data-tip={capitalize(
-            users.find((x) => x.id === info.getValue())?.type,
-          )}
-        >
-          {users.find((x) => x.id === info.getValue())?.name}
-        </div>
-      ),
-    }),
-    columnHelper.accessor("participants", {
-      header: "Participants",
-      cell: (info) =>
-        info
-          .getValue()
-          .map((x) => users.find((y) => y.id === x)?.name)
-          .join(", "),
-    }),
-    {
-      header: "",
-      id: "actions",
-      cell: ({ row }: { row: { original: Group } }) => {
-        return (
-          <>
-            {user &&
-              (user.type === "developer" ||
-                user.type === "admin" ||
-                user.id === row.original.admin) && (
-                <div className="flex gap-2">
-                  {(!row.original.disableEditing ||
-                    ["developer", "admin"].includes(user.type)) && (
-                    <div
-                      data-tip="Edit"
-                      className="tooltip cursor-pointer"
-                      onClick={() => setEditingGroup(row.original)}
-                    >
-                      <BsPencil className="hover:text-mti-purple-light transition duration-300 ease-in-out" />
-                    </div>
-                  )}
-                  {(!row.original.disableEditing ||
-                    ["developer", "admin"].includes(user.type)) && (
-                    <div
-                      data-tip="Delete"
-                      className="tooltip cursor-pointer"
-                      onClick={() => deleteGroup(row.original)}
-                    >
-                      <BsTrash className="hover:text-mti-purple-light transition duration-300 ease-in-out" />
-                    </div>
-                  )}
-                </div>
-              )}
-          </>
-        );
-      },
-    },
-  ];
+	const defaultColumns = [
+		columnHelper.accessor("id", {
+			header: "ID",
+			cell: (info) => info.getValue(),
+		}),
+		columnHelper.accessor("name", {
+			header: "Name",
+			cell: (info) => info.getValue(),
+		}),
+		columnHelper.accessor("admin", {
+			header: "Admin",
+			cell: (info) => (
+				<div className="tooltip" data-tip={capitalize(users.find((x) => x.id === info.getValue())?.type)}>
+					{users.find((x) => x.id === info.getValue())?.type === "corporate"
+						? (users.find((x) => x.id === info.getValue()) as CorporateUser)?.corporateInformation?.companyInformation?.name
+						: users.find((x) => x.id === info.getValue())?.name}
+				</div>
+			),
+		}),
+		columnHelper.accessor("participants", {
+			header: "Participants",
+			cell: (info) =>
+				info
+					.getValue()
+					.map((x) => users.find((y) => y.id === x)?.name)
+					.join(", "),
+		}),
+		{
+			header: "",
+			id: "actions",
+			cell: ({row}: {row: {original: Group}}) => {
+				return (
+					<>
+						{user && (user.type === "developer" || user.type === "admin" || user.id === row.original.admin) && (
+							<div className="flex gap-2">
+								{(!row.original.disableEditing || ["developer", "admin"].includes(user.type)) && (
+									<div data-tip="Edit" className="tooltip cursor-pointer" onClick={() => setEditingGroup(row.original)}>
+										<BsPencil className="hover:text-mti-purple-light transition duration-300 ease-in-out" />
+									</div>
+								)}
+								{(!row.original.disableEditing || ["developer", "admin"].includes(user.type)) && (
+									<div data-tip="Delete" className="tooltip cursor-pointer" onClick={() => deleteGroup(row.original)}>
+										<BsTrash className="hover:text-mti-purple-light transition duration-300 ease-in-out" />
+									</div>
+								)}
+							</div>
+						)}
+					</>
+				);
+			},
+		},
+	];
 
-  const table = useReactTable({
-    data: groups,
-    columns: defaultColumns,
-    getCoreRowModel: getCoreRowModel(),
-  });
+	const table = useReactTable({
+		data: groups,
+		columns: defaultColumns,
+		getCoreRowModel: getCoreRowModel(),
+	});
 
-  const closeModal = () => {
-    setIsCreating(false);
-    setEditingGroup(undefined);
-    reload();
-  };
+	const closeModal = () => {
+		setIsCreating(false);
+		setEditingGroup(undefined);
+		reload();
+	};
 
-  return (
-    <div className="h-full w-full rounded-xl">
-      <Modal
-        isOpen={isCreating || !!editingGroup}
-        onClose={closeModal}
-        title={editingGroup ? `Editing ${editingGroup.name}` : "New Group"}
-      >
-        <CreatePanel
-          group={editingGroup}
-          user={user}
-          onClose={closeModal}
-          users={
-            user?.type === "corporate" || user?.type === "teacher"
-              ? users.filter(
-                  (u) =>
-                    groups
-                      .filter((g) => g.admin === user.id)
-                      .flatMap((g) => g.participants)
-                      .includes(u.id) ||
-                    groups.flatMap((g) => g.participants).includes(u.id),
-                )
-              : users
-          }
-        />
-      </Modal>
-      <table className="bg-mti-purple-ultralight/40 w-full rounded-xl">
-        <thead>
-          {table.getHeaderGroups().map((headerGroup) => (
-            <tr key={headerGroup.id}>
-              {headerGroup.headers.map((header) => (
-                <th className="py-4" key={header.id}>
-                  {header.isPlaceholder
-                    ? null
-                    : flexRender(
-                        header.column.columnDef.header,
-                        header.getContext(),
-                      )}
-                </th>
-              ))}
-            </tr>
-          ))}
-        </thead>
-        <tbody className="px-2">
-          {table.getRowModel().rows.map((row) => (
-            <tr
-              className="even:bg-mti-purple-ultralight/40 rounded-lg py-2 odd:bg-white"
-              key={row.id}
-            >
-              {row.getVisibleCells().map((cell) => (
-                <td className="px-4 py-2" key={cell.id}>
-                  {flexRender(cell.column.columnDef.cell, cell.getContext())}
-                </td>
-              ))}
-            </tr>
-          ))}
-        </tbody>
-      </table>
+	return (
+		<div className="h-full w-full rounded-xl">
+			<Modal isOpen={isCreating || !!editingGroup} onClose={closeModal} title={editingGroup ? `Editing ${editingGroup.name}` : "New Group"}>
+				<CreatePanel
+					group={editingGroup}
+					user={user}
+					onClose={closeModal}
+					users={
+						user?.type === "corporate" || user?.type === "teacher"
+							? users.filter(
+									(u) =>
+										groups
+											.filter((g) => g.admin === user.id)
+											.flatMap((g) => g.participants)
+											.includes(u.id) || groups.flatMap((g) => g.participants).includes(u.id),
+							  )
+							: users
+					}
+				/>
+			</Modal>
+			<table className="bg-mti-purple-ultralight/40 w-full rounded-xl">
+				<thead>
+					{table.getHeaderGroups().map((headerGroup) => (
+						<tr key={headerGroup.id}>
+							{headerGroup.headers.map((header) => (
+								<th className="py-4" key={header.id}>
+									{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+								</th>
+							))}
+						</tr>
+					))}
+				</thead>
+				<tbody className="px-2">
+					{table.getRowModel().rows.map((row) => (
+						<tr className="even:bg-mti-purple-ultralight/40 rounded-lg py-2 odd:bg-white" key={row.id}>
+							{row.getVisibleCells().map((cell) => (
+								<td className="px-4 py-2" key={cell.id}>
+									{flexRender(cell.column.columnDef.cell, cell.getContext())}
+								</td>
+							))}
+						</tr>
+					))}
+				</tbody>
+			</table>
 
-      <button
-        onClick={() => setIsCreating(true)}
-        className="bg-mti-purple-light hover:bg-mti-purple w-full py-2 text-white transition duration-300 ease-in-out"
-      >
-        New Group
-      </button>
-    </div>
-  );
+			<button
+				onClick={() => setIsCreating(true)}
+				className="bg-mti-purple-light hover:bg-mti-purple w-full py-2 text-white transition duration-300 ease-in-out">
+				New Group
+			</button>
+		</div>
+	);
 }