diff --git a/src/lib/settings/ServerSettings.svelte b/src/lib/settings/ServerSettings.svelte
index 2f419ba..acb12d1 100644
--- a/src/lib/settings/ServerSettings.svelte
+++ b/src/lib/settings/ServerSettings.svelte
@@ -66,7 +66,7 @@
 	<input bind:value={headscaleAPIKey} minlength="54" maxlength="54" class="form-input" type="password" required placeholder="******************" />
 	<p class="text-xs text-base-content text-italics mb-8">Generate an API key for your headscale instance and place it here.</p>
 	<!-- disable the SaveServerSettings button if nothing has changed from stored values, or the dependent inputs do not validate -->
-	<div class="tooltip" data-tip="Note: API Key and URL currently save to localStorage (IE: Your Browser) Make sure you are using a trusted computer">
+	<div class="tooltip z-10" data-tip="Note: API Key and URL currently save to localStorage (IE: Your Browser) Make sure you are using a trusted computer">
 		<button disabled={headscaleAPIKey === $headscaleAPIKeyStore && headscaleURL === $headscaleURLStore} on:click={() => SaveServerSettings()} class="btn btn-sm btn-accent capitalize" type="button">Save Server Settings</button>
 	</div>
 	<button on:click={() => ClearServerSettings()} class="btn btn-sm btn-primary capitalize" type="button">Clear Server Settings</button>
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 9a907db..75b2300 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -5,11 +5,11 @@
 </script>
 
 <main class="flex flex-col" data-theme="hsui">
-	<div class="flex h-screen overflow-hidden">
+	<div class="flex h-screen">
 		<!-- sidebar -->
 		<Nav />
 		<!-- main window -->
-		<div class="flex flex-1 min-w-0 overflow-auto flex-col bg-base-100">
+		<div class="flex flex-1 min-w-0 flex-col bg-base-100">
 			<Alert></Alert>
 			<!-- header -->
 			<!-- <div class="flex bg-gray-100 h-12 p-4">Header</div> -->