diff --git a/src/lib/components/assignment/AssignmentGrid/AssignmentBox.svelte b/src/lib/components/assignment/AssignmentGrid/AssignmentBox.svelte
index ae5b465..a00a325 100644
--- a/src/lib/components/assignment/AssignmentGrid/AssignmentBox.svelte
+++ b/src/lib/components/assignment/AssignmentGrid/AssignmentBox.svelte
@@ -15,6 +15,7 @@
 	import Modal from '$lib/components/modal/Modal.svelte';
 	import Store from '$lib/components/utils/Store.svelte';
 	import { currentCustomDate, sort } from '$lib/utils/dates/custom';
+	import { useAuth } from '$lib/utils/store/auth';
 
 	export let assignment: Assignment;
 	export let school: string;
@@ -30,15 +31,13 @@
 
 	const state: Writable<State> = writable({ view: 'read' });
 
-	const userDetails = svocal('dlool.ownUserDetails');
 	const transparencyOfOverdue = svocal('settings.homework.transparency');
 
-	$: hasEditRights = $userDetails?.classes.some(({ name, school: schoolObj }) => {
-		const classMatches = assignment.class.name === name;
-		const schoolMatches = school === schoolObj.name;
+	const queryStore = writable({ school, classes: [assignment.class.name] });
+	$: queryStore.update((props) => ({ ...props, school }));
+	$: queryStore.update((props) => ({ ...props, classes: [assignment.class.name] }));
 
-		return classMatches && schoolMatches;
-	});
+	const { isLoggedIn, isInClass } = useAuth({ query: queryStore });
 
 	$: isOverdue = sort(assignment.due, currentCustomDate()) === -1;
 
@@ -56,7 +55,7 @@
 	>
 		<ReadAssignmentBox {assignment} />
 
-		{#if hasEditRights}
+		{#if $isInClass && $isLoggedIn}
 			<div class="flex w-full justify-evenly pt-2">
 				<QuickAction
 					icon={Trash}
diff --git a/src/lib/components/panes/Panes.svelte b/src/lib/components/panes/Panes.svelte
index 34111b0..a984a4a 100644
--- a/src/lib/components/panes/Panes.svelte
+++ b/src/lib/components/panes/Panes.svelte
@@ -76,7 +76,7 @@
 			<div class="h-full w-1 rounded-full bg-zinc-200 touch:w-1.5 dark:bg-zinc-700" />
 		</button>
 
-		<div class="flex w-full max-w-full overflow-hidden">
+		<div class="flex w-full max-w-full overflow-hidden p-1">
 			<slot name="b" />
 		</div>
 	</div>
diff --git a/src/lib/components/select/NotTyppable.svelte b/src/lib/components/select/NotTyppable.svelte
index c5cb331..d9a292b 100644
--- a/src/lib/components/select/NotTyppable.svelte
+++ b/src/lib/components/select/NotTyppable.svelte
@@ -3,7 +3,7 @@
 
 	import { flip, offset, shift } from '@floating-ui/core';
 	import { createFloatingActions } from 'svelte-floating-ui';
-	import { ChevronDown } from 'svelte-hero-icons';
+	import { ChevronDown, Icon } from 'svelte-hero-icons';
 	import QuickAction from '../buttons/QuickAction.svelte';
 	import Frame from '../input/Frame.svelte';
 	import type { Readable } from 'svelte/store';
@@ -50,13 +50,15 @@
 				<Store store={i('select.select')} />
 			{/if}
 
-			<QuickAction
-				small
-				icon={ChevronDown}
-				on:click={() => {
-					showOptions = !showOptions;
-				}}
-			/>
+			<div
+				class="
+					rounded p-1
+					hover:bg-zinc-200 focus:bg-zinc-200
+					dark:hover:bg-zinc-800 dark:focus:bg-zinc-800
+				"
+			>
+				<Icon src={ChevronDown} micro class="h-5 w-5" />
+			</div>
 		</button>
 	</Frame>