diff --git a/Wave/Components/Layout/MainLayout.razor b/Wave/Components/Layout/MainLayout.razor
index 05a2116..30b77d9 100644
--- a/Wave/Components/Layout/MainLayout.razor
+++ b/Wave/Components/Layout/MainLayout.razor
@@ -87,7 +87,7 @@
 		
 		<div class="bg-base-200 p-4 h-full flex flex-col gap-4 w-48 lg:w-64">
 			<NavMenu />
-			<a class="absolute left-2 right-2 bottom-2 text-center text-slate-400" href="https://github.com/miawinter98/wave/releases/">@Version</a>
+			<a aria-hidden="true" tabindex="-1" class="absolute left-2 right-2 bottom-2 text-center text-slate-400" href="https://github.com/miawinter98/wave/releases/">@Version</a>
 		</div>
 	</div>
 </div>
diff --git a/Wave/Components/Pages/Home.razor b/Wave/Components/Pages/Home.razor
index 529e3f1..ecd18fd 100644
--- a/Wave/Components/Pages/Home.razor
+++ b/Wave/Components/Pages/Home.razor
@@ -107,17 +107,33 @@
 
 <div class="grid place-content-center my-3">
 	<div class="join">
-		<a class="join-item btn" target="_top" href="@(Page < 2 ? "/" : $"/?page={Page - 1}")" disabled="@(Page < 1)" title="@Localizer["Paging_Previous"]">
-			<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
-				<path fill-rule="evenodd" d="M7.72 12.53a.75.75 0 0 1 0-1.06l7.5-7.5a.75.75 0 1 1 1.06 1.06L9.31 12l6.97 6.97a.75.75 0 1 1-1.06 1.06l-7.5-7.5Z" clip-rule="evenodd" />
-			</svg>
-		</a>
-		<button class="join-item btn md:btn-wide no-animation">@Localizer["Paging_Page"] @(Page+1)</button>
-		<a class="join-item btn" target="_top" href="/?page=@(Page + 1)" disabled="@(Page >= TotalPages - 1)" title="@Localizer["Paging_Next"]">
-			<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
-				<path fill-rule="evenodd" d="M16.28 11.47a.75.75 0 0 1 0 1.06l-7.5 7.5a.75.75 0 0 1-1.06-1.06L14.69 12 7.72 5.03a.75.75 0 0 1 1.06-1.06l7.5 7.5Z" clip-rule="evenodd" />
-			</svg>
-		</a>
+		@if (Page < 1) {
+			<button class="join-item btn" disabled title="@Localizer["Paging_Previous"]">
+				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
+					<path fill-rule="evenodd" d="M7.72 12.53a.75.75 0 0 1 0-1.06l7.5-7.5a.75.75 0 1 1 1.06 1.06L9.31 12l6.97 6.97a.75.75 0 1 1-1.06 1.06l-7.5-7.5Z" clip-rule="evenodd" />
+				</svg>
+			</button>
+		} else {
+			<a class="join-item btn" target="_top" href="@(Page < 2 ? "/" : $"/?page={Page - 1}")" title="@Localizer["Paging_Previous"]">
+				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
+					<path fill-rule="evenodd" d="M7.72 12.53a.75.75 0 0 1 0-1.06l7.5-7.5a.75.75 0 1 1 1.06 1.06L9.31 12l6.97 6.97a.75.75 0 1 1-1.06 1.06l-7.5-7.5Z" clip-rule="evenodd"/>
+				</svg>
+			</a>
+		}
+		<button class="join-item btn md:btn-wide no-animation">@Localizer["Paging_Page"] @(Page + 1)</button>
+		@if (Page >= TotalPages - 1) {
+			<button class="join-item btn" disabled title="@Localizer["Paging_Next"]">
+				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
+					<path fill-rule="evenodd" d="M16.28 11.47a.75.75 0 0 1 0 1.06l-7.5 7.5a.75.75 0 0 1-1.06-1.06L14.69 12 7.72 5.03a.75.75 0 0 1 1.06-1.06l7.5 7.5Z" clip-rule="evenodd"/>
+				</svg>
+			</button>
+		} else {
+			<a class="join-item btn" target="_top" href="/?page=@(Page + 1)" title="@Localizer["Paging_Next"]">
+				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
+					<path fill-rule="evenodd" d="M16.28 11.47a.75.75 0 0 1 0 1.06l-7.5 7.5a.75.75 0 0 1-1.06-1.06L14.69 12 7.72 5.03a.75.75 0 0 1 1.06-1.06l7.5 7.5Z" clip-rule="evenodd"/>
+				</svg>
+			</a>
+		}
 	</div>
 </div>