diff --git a/src/lib/components/BoardCard.svelte b/src/lib/components/BoardCard.svelte
index 4e5e2f4..c6b3fdb 100644
--- a/src/lib/components/BoardCard.svelte
+++ b/src/lib/components/BoardCard.svelte
@@ -4,7 +4,7 @@
 	export let board;
 </script>
 
-<div class="card w-96 flex-none bg-base-100 shadow-xl">
+<div class="card w-96 bg-base-100 shadow-xl">
 	<div class="card-body">
 		<h2 class="card-title">{eventTitle(board)}</h2>
 		<div class="card-actions justify-end">
diff --git a/src/lib/components/Navbar.svelte b/src/lib/components/Navbar.svelte
index c9a7c44..aa2db7d 100644
--- a/src/lib/components/Navbar.svelte
+++ b/src/lib/components/Navbar.svelte
@@ -11,7 +11,7 @@
 		<div class="form-control">
 			<!-- <input type="text" placeholder="Search" class="input input-bordered w-24 md:w-auto" /> -->
 		</div>
-		{#if $user}
+		{#if $user?.pubkey}
 			<div class="dropdown dropdown-end">
 				<div tabindex="0" role="button" class="avatar btn btn-circle btn-ghost">
 					<div class="w-10 rounded-full">
@@ -29,7 +29,7 @@
 						</a>
 					</li>
 					<li><a>Settings</a></li>
-					<li><a>Logout</a></li>
+					<li><a onclick={() => user.set(null)}>Logout</a></li>
 				</ul>
 			</div>
 		{:else}
diff --git a/src/lib/db.js b/src/lib/db.js
index 7140eec..ff61724 100644
--- a/src/lib/db.js
+++ b/src/lib/db.js
@@ -63,8 +63,11 @@ export const cardsForColumn = (columnId) => {
 export const user = writable(null);
 
 export const userBoards = derived([user, boards], ([$user, $boards]) => {
-	const newUserBoards = $boards.filter((b) => b.pubkey === $user.pubkey);
-	return newUserBoards;
+	if ($user?.pubkey) {
+		const newUserBoards = $boards.filter((b) => b.pubkey === $user.pubkey);
+		return newUserBoards;
+	}
+	return [];
 });
 
 export const db = writable({
@@ -86,9 +89,9 @@ async function initNDK() {
 
 	const subDelete = ndk.subscribe({ kinds: [5] });
 	subDelete.on('event', async (event) => {
-		const toBeDeletedDs = event.getMatchingTags('a').map((e) => e[1].split(':')[2]);
+		const toBeDeletedDs = event.getMatchingTags('a').map((e) => e[1]);
 		events.update((events) => {
-			return events.filter((e) => !toBeDeletedDs.includes(e.dTag));
+			return events.filter((e) => !toBeDeletedDs.includes(e.tagAddress()));
 		});
 	});
 
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 94dbbc6..898f1dd 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -35,7 +35,7 @@
 
 	{#if $boards.length > 0}
 		<h1 class="mx-auto text-lg">Alle Boards</h1>
-		<div class="flex flex-wrap justify-start gap-2">
+		<div class="flex grid grid-flow-col grid-rows-2 overflow-y-auto">
 			{#if $user}
 				{#each $boards.filter((e) => e.pubkey !== $user.pubkey) as board (board.id)}
 					<BoardCard {board} />