diff --git a/src/dashboards/Owner.tsx b/src/dashboards/Owner.tsx
index 575d61af..5d104808 100644
--- a/src/dashboards/Owner.tsx
+++ b/src/dashboards/Owner.tsx
@@ -40,89 +40,59 @@ export default function OwnerDashboard({user}: Props) {
 		</div>
 	);
 
-	const StudentsList = () => (
-		<>
-			<div className="flex flex-col gap-4">
-				<div
-					onClick={() => setPage("")}
-					className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-					<BsArrowLeft className="text-xl" />
-					<span>Back</span>
+	const StudentsList = () => {
+		const filter = (x: User) =>
+			x.type === "student" &&
+			(!!selectedUser
+				? groups
+						.filter((g) => g.admin === selectedUser.id)
+						.flatMap((g) => g.participants)
+						.includes(x.id) || false
+				: true);
+
+		return (
+			<>
+				<div className="flex flex-col gap-4">
+					<div
+						onClick={() => setPage("")}
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+						<BsArrowLeft className="text-xl" />
+						<span>Back</span>
+					</div>
+					<h2 className="text-2xl font-semibold">Students ({users.filter(filter).length})</h2>
 				</div>
-				<h2 className="text-2xl font-semibold">
-					Students (
-					{
-						users.filter(
-							(x) =>
-								x.type === "student" &&
-								(!!selectedUser
-									? groups
-											.filter((g) => g.admin === selectedUser.id)
-											.flatMap((g) => g.participants)
-											.includes(x.id) || false
-									: true),
-						).length
-					}
-					)
-				</h2>
-			</div>
 
-			<UserList
-				user={user}
-				filter={(x) =>
-					x.type === "student" &&
-					(!!selectedUser
-						? groups
-								.filter((g) => g.admin === selectedUser.id)
-								.flatMap((g) => g.participants)
-								.includes(x.id) || false
-						: true)
-				}
-			/>
-		</>
-	);
+				<UserList user={user} filter={filter} />
+			</>
+		);
+	};
 
-	const TeachersList = () => (
-		<>
-			<div className="flex flex-col gap-4">
-				<div
-					onClick={() => setPage("")}
-					className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-					<BsArrowLeft className="text-xl" />
-					<span>Back</span>
+	const TeachersList = () => {
+		const filter = (x: User) =>
+			x.type === "teacher" &&
+			(!!selectedUser
+				? groups
+						.filter((g) => g.admin === selectedUser.id)
+						.flatMap((g) => g.participants)
+						.includes(x.id) || false
+				: true);
+
+		return (
+			<>
+				<div className="flex flex-col gap-4">
+					<div
+						onClick={() => setPage("")}
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+						<BsArrowLeft className="text-xl" />
+						<span>Back</span>
+					</div>
+					<h2 className="text-2xl font-semibold">Teachers ({users.filter(filter).length})</h2>
 				</div>
-				<h2 className="text-2xl font-semibold">
-					Teachers (
-					{
-						users.filter(
-							(x) =>
-								x.type === "teacher" &&
-								(!!selectedUser
-									? groups
-											.filter((g) => g.admin === selectedUser.id)
-											.flatMap((g) => g.participants)
-											.includes(x.id) || false
-									: true),
-						).length
-					}
-					)
-				</h2>
-			</div>
 
-			<UserList
-				user={user}
-				filter={(x) =>
-					x.type === "teacher" &&
-					(!!selectedUser
-						? groups
-								.filter((g) => g.admin === selectedUser.id)
-								.flatMap((g) => g.participants)
-								.includes(x.id) || false
-						: true)
-				}
-			/>
-		</>
-	);
+				<UserList user={user} filter={filter} />
+			</>
+		);
+	};
 
 	const CorporateList = () => (
 		<>
@@ -140,43 +110,45 @@ export default function OwnerDashboard({user}: Props) {
 		</>
 	);
 
-	const InactiveStudentsList = () => (
-		<>
-			<div className="flex flex-col gap-4">
-				<div
-					onClick={() => setPage("")}
-					className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-					<BsArrowLeft className="text-xl" />
-					<span>Back</span>
+	const InactiveStudentsList = () => {
+		const filter = (x: User) => x.type === "student" && (x.isDisabled || moment().isAfter(x.subscriptionExpirationDate));
+
+		return (
+			<>
+				<div className="flex flex-col gap-4">
+					<div
+						onClick={() => setPage("")}
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+						<BsArrowLeft className="text-xl" />
+						<span>Back</span>
+					</div>
+					<h2 className="text-2xl font-semibold">Inactive Students ({users.filter(filter).length})</h2>
 				</div>
-				<h2 className="text-2xl font-semibold">
-					Inactive Students (
-					{users.filter((x) => x.type === "student" && (x.isDisabled || moment().isAfter(x.subscriptionExpirationDate))).length})
-				</h2>
-			</div>
 
-			<UserList user={user} filter={(x) => x.type === "student" && (x.isDisabled || moment().isAfter(x.subscriptionExpirationDate))} />
-		</>
-	);
+				<UserList user={user} filter={filter} />
+			</>
+		);
+	};
 
-	const InactiveCorporateList = () => (
-		<>
-			<div className="flex flex-col gap-4">
-				<div
-					onClick={() => setPage("")}
-					className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-					<BsArrowLeft className="text-xl" />
-					<span>Back</span>
+	const InactiveCorporateList = () => {
+		const filter = (x: User) => x.type === "admin" && (x.isDisabled || moment().isAfter(x.subscriptionExpirationDate));
+
+		return (
+			<>
+				<div className="flex flex-col gap-4">
+					<div
+						onClick={() => setPage("")}
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+						<BsArrowLeft className="text-xl" />
+						<span>Back</span>
+					</div>
+					<h2 className="text-2xl font-semibold">Inactive Corporate ({users.filter(filter).length})</h2>
 				</div>
-				<h2 className="text-2xl font-semibold">
-					Inactive Corporate (
-					{users.filter((x) => x.type === "admin" && (x.isDisabled || moment().isAfter(x.subscriptionExpirationDate))).length})
-				</h2>
-			</div>
 
-			<UserList user={user} filter={(x) => x.type === "admin" && (x.isDisabled || moment().isAfter(x.subscriptionExpirationDate))} />
-		</>
-	);
+				<UserList user={user} filter={filter} />
+			</>
+		);
+	};
 
 	const DefaultDashboard = () => (
 		<>