diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index bd98d3f2a..4c0e03d40 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -19,7 +19,8 @@
 		"dbaeumer.vscode-eslint",
 		"svelte.svelte-vscode",
 		"ardenivanov.svelte-intellisense",
-		"Prisma.prisma"
+		"Prisma.prisma",
+		"bradlc.vscode-tailwindcss"
 	],
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	"forwardPorts": [3000],
diff --git a/apps/ui/src/lib/locales/en.json b/apps/ui/src/lib/locales/en.json
index 6bb1d62c9..809d38851 100644
--- a/apps/ui/src/lib/locales/en.json
+++ b/apps/ui/src/lib/locales/en.json
@@ -237,7 +237,7 @@
 		"logs": "Logs"
 	},
 	"destination": {
-		"delete_destination": "Delete Destination",
+		"delete_destination": "Delete",
 		"permission_denied_delete_destination": "You do not have permission to delete this destination",
 		"add_to_coolify": "Add to Coolify",
 		"coolify_proxy_stopped": "Coolify Proxy stopped!",
diff --git a/apps/ui/src/routes/destinations/[id]/_NewLocalDocker.svelte b/apps/ui/src/routes/destinations/[id]/_NewLocalDocker.svelte
index 595cefd8b..63e6d3fe9 100644
--- a/apps/ui/src/routes/destinations/[id]/_NewLocalDocker.svelte
+++ b/apps/ui/src/routes/destinations/[id]/_NewLocalDocker.svelte
@@ -35,8 +35,8 @@
 			<div class="title font-bold">{$t('forms.configuration')}</div>
 			<button
 				type="submit"
-				class:bg-sky-600={!loading}
-				class:hover:bg-sky-500={!loading}
+				class="btn btn-sm bg-destinations"
+				class:loading={loading}
 				disabled={loading}
 				>{loading
 					? payload.isCoolifyProxyUsed
diff --git a/apps/ui/src/routes/destinations/[id]/_NewRemoteDocker.svelte b/apps/ui/src/routes/destinations/[id]/_NewRemoteDocker.svelte
index 26d51ea29..597086c03 100644
--- a/apps/ui/src/routes/destinations/[id]/_NewRemoteDocker.svelte
+++ b/apps/ui/src/routes/destinations/[id]/_NewRemoteDocker.svelte
@@ -40,8 +40,8 @@
 			<div class="title font-bold">{$t('forms.configuration')}</div>
 			<button
 				type="submit"
-				class:bg-sky-600={!loading}
-				class:hover:bg-sky-500={!loading}
+				class="btn btn-sm bg-destinations"
+				class:loading={loading}
 				disabled={loading}
 				>{loading
 					? payload.isCoolifyProxyUsed
diff --git a/apps/ui/src/routes/destinations/[id]/__layout.svelte b/apps/ui/src/routes/destinations/[id]/__layout.svelte
index 0da7eaaf4..6a420ddb1 100644
--- a/apps/ui/src/routes/destinations/[id]/__layout.svelte
+++ b/apps/ui/src/routes/destinations/[id]/__layout.svelte
@@ -58,7 +58,7 @@
 	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
 
 	const { id } = $page.params;
-	const isDestinationDeletable = destination.application.length === 0 && destination.database.length === 0 && destination.service.length === 0
+	const isDestinationDeletable = destination?.application.length === 0 && destination?.database.length === 0 && destination?.service.length === 0
 	
 	async function deleteDestination(destination: any) {
 		if (!isDestinationDeletable) return