diff --git a/materialious/src/lib/components/layout/ItemsList.svelte b/materialious/src/lib/components/layout/ItemsList.svelte
index 1256857a..426f4938 100644
--- a/materialious/src/lib/components/layout/ItemsList.svelte
+++ b/materialious/src/lib/components/layout/ItemsList.svelte
@@ -82,7 +82,7 @@
 				<article
 					{...mergeAttrs(spatialItem.attrs, {
 						onclick: () => goToItem(uniqueItemId),
-						id: `item-${index}`
+						id: uniqueItemId
 					})}
 					class="no-padding item-select border"
 					class:item-select-focused={spatialItem.highlighted}
diff --git a/materialious/src/lib/components/player/Player.svelte b/materialious/src/lib/components/player/Player.svelte
index 9d2151fd..ac007c8c 100644
--- a/materialious/src/lib/components/player/Player.svelte
+++ b/materialious/src/lib/components/player/Player.svelte
@@ -436,7 +436,6 @@
 				}
 			}
 		});
-		playerElement = document.getElementById('player') as HTMLMediaElement;
 
 		playerElement.loop = $playerAlwaysLoopStore;
 
@@ -839,7 +838,7 @@
 	<video
 		controls={false}
 		autoplay={$playerAutoPlayStore}
-		id="player"
+		bind:this={playerElement}
 		poster={getBestThumbnail(data.video.videoThumbnails, 9999, 9999)}
 	></video>
 	{#if isEmbed && !$isAndroidTvStore}
diff --git a/materialious/src/lib/components/settings/Settings.svelte b/materialious/src/lib/components/settings/Settings.svelte
index 462a9b8f..73566500 100644
--- a/materialious/src/lib/components/settings/Settings.svelte
+++ b/materialious/src/lib/components/settings/Settings.svelte
@@ -150,7 +150,7 @@
 							class:active={isActive(tab.id)}
 							class:surface-container-lowest={isActive(tab.id)}
 							class:surface-container-highest={!isActive(tab.id)}
-							{...mergeAttrs(tabCategories.getTrigger(tab.id), { id: tab.id })}
+							{...tabCategories.getTrigger(tab.id)}
 						>
 							<i>{tab.icon}</i>
 							<span>{tab.label}</span>
diff --git a/materialious/src/routes/(app)/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte
index a502272a..4b1c909f 100644
--- a/materialious/src/routes/(app)/+layout.svelte
+++ b/materialious/src/routes/(app)/+layout.svelte
@@ -382,9 +382,7 @@
 		{#if $navigating}
 			<PageLoading />
 		{:else}
-			<div tabindex="0">
-				{@render children?.()}
-			</div>
+			{@render children?.()}
 		{/if}
 
 		<SyncParty />