diff --git a/src/app/dashboard/(auth)/users/_tables/UsersTable/UsersTable.tsx b/src/app/dashboard/(auth)/users/_tables/UsersTable/UsersTable.tsx
index 19e1624..ca0596c 100644
--- a/src/app/dashboard/(auth)/users/_tables/UsersTable/UsersTable.tsx
+++ b/src/app/dashboard/(auth)/users/_tables/UsersTable/UsersTable.tsx
@@ -10,59 +10,65 @@ import columns, { UserRow } from "./columns";
 import { Table, Text } from "@mantine/core";
 
 interface Props {
-	users: UserRow[]
+	users: UserRow[];
 }
 
-export default function UsersTable({users}: Props) {
-
+export default function UsersTable({ users }: Props) {
 	const table = useReactTable({
 		data: users,
 		columns,
 		getCoreRowModel: getCoreRowModel(),
 		defaultColumn: {
-			cell: (props) => <Text>{props.getValue() as React.ReactNode}</Text>
-		}
+			cell: (props) => <Text>{props.getValue() as React.ReactNode}</Text>,
+		},
 	});
-
-	// TODO: Add view when data is empty
-
+	
 	return (
-		<>
-			<Table verticalSpacing="xs" horizontalSpacing="xs">
-				{/* Thead */}
-				<Table.Thead>
-					{table.getHeaderGroups().map((headerGroup) => (
-						<Table.Tr key={headerGroup.id}>
-							{headerGroup.headers.map((header) => (
-								<Table.Th key={header.id} style={{maxWidth: `${header.column.columnDef.maxSize}px`, width: `${header.getSize()}`}}>
-									{header.isPlaceholder
-										? null
-										: flexRender(
-												header.column.columnDef.header,
-												header.getContext()
-										)}
-								</Table.Th>
-							))}
-						</Table.Tr>
-					))}
-				</Table.Thead>
+		<Table verticalSpacing="xs" horizontalSpacing="xs">
+			{/* Thead */}
+			<Table.Thead>
+				{table.getHeaderGroups().map((headerGroup) => (
+					<Table.Tr key={headerGroup.id}>
+						{headerGroup.headers.map((header) => (
+							<Table.Th
+								key={header.id}
+								style={{
+									maxWidth: `${header.column.columnDef.maxSize}px`,
+									width: `${header.getSize()}`,
+								}}
+							>
+								{header.isPlaceholder
+									? null
+									: flexRender(
+											header.column.columnDef.header,
+											header.getContext()
+									  )}
+							</Table.Th>
+						))}
+					</Table.Tr>
+				))}
+			</Table.Thead>
 
-				{/* TBody */}
-				<Table.Tbody>
-					{table.getRowModel().rows.map((row) => (
-						<Table.Tr key={row.id}>
-							{row.getVisibleCells().map((cell) => (
-								<Table.Td key={cell.id} style={{maxWidth: `${cell.column.columnDef.maxSize}px`}}>
-									{flexRender(
-										cell.column.columnDef.cell,
-										cell.getContext(),
-									)}
-								</Table.Td>
-							))}
-						</Table.Tr>
-					))}
-				</Table.Tbody>
-			</Table>
-		</>
+			{/* TBody */}
+			<Table.Tbody>
+				{table.getRowModel().rows.map((row) => (
+					<Table.Tr key={row.id}>
+						{row.getVisibleCells().map((cell) => (
+							<Table.Td
+								key={cell.id}
+								style={{
+									maxWidth: `${cell.column.columnDef.maxSize}px`,
+								}}
+							>
+								{flexRender(
+									cell.column.columnDef.cell,
+									cell.getContext()
+								)}
+							</Table.Td>
+						))}
+					</Table.Tr>
+				))}
+			</Table.Tbody>
+		</Table>
 	);
 }
diff --git a/src/app/dashboard/(auth)/users/page.tsx b/src/app/dashboard/(auth)/users/page.tsx
index 583fd0e..606126a 100644
--- a/src/app/dashboard/(auth)/users/page.tsx
+++ b/src/app/dashboard/(auth)/users/page.tsx
@@ -46,8 +46,6 @@ export default async function UsersPage({searchParams}: Props) {
 		return null;
 	}
 
-	// TODO: Add functinoality for create new user
-
 	return (
 		<Stack className="flex flex-col">
 			<Title order={1}>Users</Title>