diff --git a/apps/ui/src/lib/components/Usage.svelte b/apps/ui/src/lib/components/Usage.svelte
index 08e63e455..715946952 100644
--- a/apps/ui/src/lib/components/Usage.svelte
+++ b/apps/ui/src/lib/components/Usage.svelte
@@ -26,7 +26,7 @@
 	import { addToast, appSession } from '$lib/store';
 	import { onDestroy, onMount } from 'svelte';
 	import { get, post } from '$lib/api';
-	import { errorNotification } from '$lib/common';
+	import { asyncSleep, errorNotification } from '$lib/common';
 	async function getStatus() {
 		if (loading.usage) return;
 		loading.usage = true;
@@ -42,6 +42,25 @@
 			loading.restart = true;
 			try {
 				await post(`/internal/restart`, {});
+				let reachable = false;
+				let tries = 0;
+				do {
+					await asyncSleep(4000);
+					try {
+						await get(`/undead`);
+						reachable = true;
+					} catch (error) {
+						reachable = false;
+					}
+					if (reachable) break;
+					tries++;
+				} while (!reachable || tries < 120);
+				addToast({
+					message: 'New version reachable. Reloading...',
+					type: 'success'
+				});
+				await asyncSleep(3000);
+				return window.location.reload();
 				addToast({
 					type: 'success',
 					message: 'Coolify restarted successfully. It will take a moment.'
@@ -89,10 +108,8 @@
 		<h1 class="title lg:text-3xl">Hardware Details</h1>
 		<div class="flex lg:flex-row flex-col space-x-0 lg:space-x-2 space-y-2 lg:space-y-0">
 			{#if $appSession.teamId === '0'}
-				<button
-					on:click={manuallyCleanupStorage}
-					class:loading={loading.cleanup}
-					class="btn btn-sm">Cleanup Storage</button
+				<button on:click={manuallyCleanupStorage} class:loading={loading.cleanup} class="btn btn-sm"
+					>Cleanup Storage</button
 				>
 				<button
 					on:click={restartCoolify}
diff --git a/apps/ui/src/routes/applications/[id]/__layout.svelte b/apps/ui/src/routes/applications/[id]/__layout.svelte
index b4e1d3268..a9cd88482 100644
--- a/apps/ui/src/routes/applications/[id]/__layout.svelte
+++ b/apps/ui/src/routes/applications/[id]/__layout.svelte
@@ -402,6 +402,8 @@
 			</svg></button
 		></a
 	>
+
+	<Tooltip triggeredBy="#configurations">Configurations</Tooltip>
 	<a
 		href={$isDeploymentEnabled ? `/applications/${id}/secrets` : null}
 		sveltekit:prefetch
@@ -429,6 +431,7 @@
 			</svg></button
 		></a
 	>
+	<Tooltip triggeredBy="#secrets">Secrets</Tooltip>
 	<a
 		href={$isDeploymentEnabled ? `/applications/${id}/storages` : null}
 		sveltekit:prefetch
@@ -458,6 +461,7 @@
 			</svg>
 		</button></a
 	>
+	<Tooltip triggeredBy="#persistentstorages">Persistent Storages</Tooltip>
 	{#if !application.settings.isBot}
 		<a
 			href={$isDeploymentEnabled ? `/applications/${id}/previews` : null}
@@ -486,6 +490,7 @@
 				</svg></button
 			></a
 		>
+		<Tooltip triggeredBy="#previews">Previews</Tooltip>
 	{/if}
 	<div class="border border-coolgray-500 h-8" />
 	<a
@@ -519,6 +524,7 @@
 			</svg>
 		</button></a
 	>
+	<Tooltip triggeredBy="#applicationlogs">Application Logs</Tooltip>
 	<a
 		href={$isDeploymentEnabled ? `/applications/${id}/logs/build` : null}
 		sveltekit:prefetch
@@ -549,10 +555,12 @@
 			</svg>
 		</button></a
 	>
+	<Tooltip triggeredBy="#buildlogs">Build Logs</Tooltip>
 	<div class="border border-coolgray-500 h-8" />
 
 	{#if forceDelete}
 		<button
+			id="forcedelete"
 			on:click={() => deleteApplication(application.name, true)}
 			type="submit"
 			disabled={!$appSession.isAdmin}
@@ -562,6 +570,7 @@
 		>
 			Force Delete
 		</button>
+		<Tooltip triggeredBy="#forcedelete">Force Delete</Tooltip>
 	{:else}
 		<button
 			id="delete"
@@ -573,14 +582,7 @@
 		>
 			<DeleteIcon />
 		</button>
+		<Tooltip triggeredBy="#delete">Delete</Tooltip>
 	{/if}
 </nav>
 <slot />
-
-<Tooltip triggeredBy="#configurations">Configurations</Tooltip>
-<Tooltip triggeredBy="#secrets">Secrets</Tooltip>
-<Tooltip triggeredBy="#persistentstorages">Persistent Storages</Tooltip>
-<Tooltip triggeredBy="#previews">Previews</Tooltip>
-<Tooltip triggeredBy="#applicationlogs">Application Logs</Tooltip>
-<Tooltip triggeredBy="#buildlogs">Build Logs</Tooltip>
-<Tooltip triggeredBy="#delete">Delete</Tooltip>