diff --git a/.gitignore b/.gitignore
index cb934cd76..500cd6776 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ dist
 client
 apps/api/db/*.db
 local-serve
-apps/api/db/migration.db-journal
\ No newline at end of file
+apps/api/db/migration.db-journal
+apps/api/core*
\ No newline at end of file
diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts
index dac8d34ef..00865adca 100644
--- a/apps/api/src/index.ts
+++ b/apps/api/src/index.ts
@@ -161,7 +161,7 @@ async function initServer() {
 	} catch (error) { }
 	try {
 		const isOlder = compareVersions('3.8.1', version);
-		if (isOlder === -1) {
+		if (isOlder === 1) {
 			await prisma.build.updateMany({ where: { status: { in: ['running', 'queued'] } }, data: { status: 'failed' } });
 		}
 	} catch (error) { }
diff --git a/apps/api/src/jobs/deployApplication.ts b/apps/api/src/jobs/deployApplication.ts
index bb65fb77d..dc3b0d41d 100644
--- a/apps/api/src/jobs/deployApplication.ts
+++ b/apps/api/src/jobs/deployApplication.ts
@@ -4,7 +4,7 @@ import fs from 'fs/promises';
 import yaml from 'js-yaml';
 
 import { copyBaseConfigurationFiles, makeLabelForStandaloneApplication, saveBuildLog, setDefaultConfiguration } from '../lib/buildPacks/common';
-import { createDirectories, decrypt, defaultComposeConfiguration, executeDockerCmd, getDomain, prisma } from '../lib/common';
+import { createDirectories, decrypt, defaultComposeConfiguration, executeDockerCmd, getDomain, prisma, decryptApplication } from '../lib/common';
 import * as importers from '../lib/importers';
 import * as buildpacks from '../lib/buildPacks';
 
@@ -27,7 +27,7 @@ import * as buildpacks from '../lib/buildPacks';
 
 		const th = throttle(async () => {
 			try {
-				const queuedBuilds = await prisma.build.findMany({ where: { status: 'queued' }, orderBy: { createdAt: 'asc' } });
+				const queuedBuilds = await prisma.build.findMany({ where: { status: { in: ['queued', 'running'] } }, orderBy: { createdAt: 'asc' } });
 				const { concurrentBuilds } = await prisma.setting.findFirst({})
 				if (queuedBuilds.length > 0) {
 					parentPort.postMessage({ deploying: true });
@@ -37,68 +37,72 @@ import * as buildpacks from '../lib/buildPacks';
 
 					for (const queueBuild of queuedBuilds) {
 						actions.push(async () => {
-							const application = await prisma.application.findUnique({ where: { id: queueBuild.applicationId }, include: { destinationDocker: true, gitSource: { include: { githubApp: true, gitlabApp: true } }, persistentStorage: true, secrets: true, settings: true, teams: true } })
-							const { id: buildId, type, sourceBranch = null, pullmergeRequestId = null, forceRebuild } = queueBuild
-							const {
-								id: applicationId,
-								repository,
-								name,
-								destinationDocker,
-								destinationDockerId,
-								gitSource,
-								configHash,
-								fqdn,
-								projectId,
-								secrets,
-								phpModules,
-								settings,
-								persistentStorage,
-								pythonWSGI,
-								pythonModule,
-								pythonVariable,
-								denoOptions,
-								exposePort,
-								baseImage,
-								baseBuildImage,
-								deploymentType,
-							} = application
-							let {
-								branch,
-								buildPack,
-								port,
-								installCommand,
-								buildCommand,
-								startCommand,
-								baseDirectory,
-								publishDirectory,
-								dockerFileLocation,
-								denoMainFile
-							} = application
-							const currentHash = crypto
-								.createHash('sha256')
-								.update(
-									JSON.stringify({
-										pythonWSGI,
-										pythonModule,
-										pythonVariable,
-										deploymentType,
-										denoOptions,
-										baseImage,
-										baseBuildImage,
-										buildPack,
-										port,
-										exposePort,
-										installCommand,
-										buildCommand,
-										startCommand,
-										secrets,
-										branch,
-										repository,
-										fqdn
-									})
-								)
-								.digest('hex');
+							let application = await prisma.application.findUnique({ where: { id: queueBuild.applicationId }, include: { destinationDocker: true, gitSource: { include: { githubApp: true, gitlabApp: true } }, persistentStorage: true, secrets: true, settings: true, teams: true } })
+							let { id: buildId, type, sourceBranch = null, pullmergeRequestId = null, forceRebuild } = queueBuild
+							application = decryptApplication(application)
 							try {
+								if (queueBuild.status === 'running') {
+									await saveBuildLog({ line: 'Building halted, restarting...', buildId, applicationId: application.id });
+								}
+								const {
+									id: applicationId,
+									repository,
+									name,
+									destinationDocker,
+									destinationDockerId,
+									gitSource,
+									configHash,
+									fqdn,
+									projectId,
+									secrets,
+									phpModules,
+									settings,
+									persistentStorage,
+									pythonWSGI,
+									pythonModule,
+									pythonVariable,
+									denoOptions,
+									exposePort,
+									baseImage,
+									baseBuildImage,
+									deploymentType,
+								} = application
+								let {
+									branch,
+									buildPack,
+									port,
+									installCommand,
+									buildCommand,
+									startCommand,
+									baseDirectory,
+									publishDirectory,
+									dockerFileLocation,
+									denoMainFile
+								} = application
+								const currentHash = crypto
+									.createHash('sha256')
+									.update(
+										JSON.stringify({
+											pythonWSGI,
+											pythonModule,
+											pythonVariable,
+											deploymentType,
+											denoOptions,
+											baseImage,
+											baseBuildImage,
+											buildPack,
+											port,
+											exposePort,
+											installCommand,
+											buildCommand,
+											startCommand,
+											secrets,
+											branch,
+											repository,
+											fqdn
+										})
+									)
+									.digest('hex');
 								const { debug } = settings;
 								if (concurrency === 1) {
 									await prisma.build.updateMany({
@@ -258,7 +262,6 @@ import * as buildpacks from '../lib/buildPacks';
 									];
 									if (secrets.length > 0) {
 										secrets.forEach((secret) => {
-											secret.value = decrypt(secret.value)
 											if (pullmergeRequestId) {
 												if (secret.isPRMRSecret) {
 													envs.push(`${secret.name}=${secret.value}`);
@@ -353,13 +356,16 @@ import * as buildpacks from '../lib/buildPacks';
 									where: { id: buildId, status: { in: ['queued', 'running'] } },
 									data: { status: 'failed' }
 								});
-								await saveBuildLog({ line: error, buildId, applicationId });
+								await saveBuildLog({ line: error, buildId, applicationId: application.id });
 							}
 						});
+
 					}
+
 					await pAll.default(actions, { concurrency })
 				}
 			} catch (error) {
+				console.log(error)
 			} finally {
 			}
 		})
diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts
index e73093d08..d6e30aa03 100644
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@@ -19,7 +19,7 @@ import * as serviceFields from './serviceFields'
 import { saveBuildLog } from './buildPacks/common';
 import { scheduler } from './scheduler';
 
-export const version = '3.8.3';
+export const version = '3.8.4';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';
@@ -1977,6 +1977,12 @@ export async function cleanupDockerStorage(dockerId, lowDiskSpace, force) {
 		} catch (error) {
 			//console.log(error);
 		}
+		// Cleanup build caches
+		try {
+			await executeDockerCmd({ dockerId, command: `docker builder prune -a -f` })
+		} catch (error) {
+			//console.log(error);
+		}
 	}
 }
 
@@ -2022,3 +2028,27 @@ export function defaultComposeConfiguration(network: string): any {
 		}
 	}
 }
+export function decryptApplication(application: any) {
+    if (application) {
+        if (application?.gitSource?.githubApp?.clientSecret) {
+            application.gitSource.githubApp.clientSecret = decrypt(application.gitSource.githubApp.clientSecret) || null;
+        }
+        if (application?.gitSource?.githubApp?.webhookSecret) {
+            application.gitSource.githubApp.webhookSecret = decrypt(application.gitSource.githubApp.webhookSecret) || null;
+        }
+        if (application?.gitSource?.githubApp?.privateKey) {
+            application.gitSource.githubApp.privateKey = decrypt(application.gitSource.githubApp.privateKey) || null;
+        }
+        if (application?.gitSource?.gitlabApp?.appSecret) {
+            application.gitSource.gitlabApp.appSecret = decrypt(application.gitSource.gitlabApp.appSecret) || null;
+        }
+        if (application?.secrets.length > 0) {
+            application.secrets = application.secrets.map((s: any) => {
+                s.value = decrypt(s.value) || null
+                return s;
+            });
+        }
+
+        return application;
+    }
+}
\ No newline at end of file
diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts
index 26b0d2bb9..cb0bf38fe 100644
--- a/apps/api/src/routes/api/v1/applications/handlers.ts
+++ b/apps/api/src/routes/api/v1/applications/handlers.ts
@@ -451,6 +451,7 @@ export async function deployApplication(request: FastifyRequest<DeployApplicatio
                 data: {
                     id: buildId,
                     applicationId: id,
+                    sourceBranch: branch,
                     branch: application.branch,
                     pullmergeRequestId,
                     forceRebuild,
diff --git a/apps/api/src/routes/api/v1/iam/handlers.ts b/apps/api/src/routes/api/v1/iam/handlers.ts
index 72d648793..b423b16bb 100644
--- a/apps/api/src/routes/api/v1/iam/handlers.ts
+++ b/apps/api/src/routes/api/v1/iam/handlers.ts
@@ -158,8 +158,11 @@ export async function getTeam(request: FastifyRequest<OnlyId>, reply: FastifyRep
         });
         const team = await prisma.team.findUnique({ where: { id }, include: { permissions: true } });
         const invitations = await prisma.teamInvitation.findMany({ where: { teamId: team.id } });
+        const { teams } = await prisma.user.findUnique({ where: { id: userId }, include: { teams: true } })
         return {
+            currentTeam: teamId,
             team,
+            teams,
             permissions,
             invitations
         };
@@ -275,10 +278,10 @@ export async function inviteToTeam(request: FastifyRequest<InviteToTeam>, reply:
         if (!userFound) {
             throw {
                 message: `No user found with '${email}' email address.`
-            };         
+            };
         }
         const uid = userFound.id;
-        if (uid === userId) {          
+        if (uid === userId) {
             throw {
                 message: `Invitation to yourself? Whaaaaat?`
             };
diff --git a/apps/api/src/routes/api/v1/sources/handlers.ts b/apps/api/src/routes/api/v1/sources/handlers.ts
index 8a1c19987..f363b6ff9 100644
--- a/apps/api/src/routes/api/v1/sources/handlers.ts
+++ b/apps/api/src/routes/api/v1/sources/handlers.ts
@@ -9,7 +9,7 @@ export async function listSources(request: FastifyRequest) {
     try {
         const teamId = request.user?.teamId;
         const sources = await prisma.gitSource.findMany({
-            where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } },
+            where: { teams: { some: { id: teamId === '0' ? undefined : teamId } }, githubApp: { gitSource: { forPublic: false } } },
             include: { teams: true, githubApp: true, gitlabApp: true }
         });
         return {
diff --git a/apps/api/src/routes/webhooks/github/handlers.ts b/apps/api/src/routes/webhooks/github/handlers.ts
index 275a72979..106311c5c 100644
--- a/apps/api/src/routes/webhooks/github/handlers.ts
+++ b/apps/api/src/routes/webhooks/github/handlers.ts
@@ -146,7 +146,7 @@ export async function gitHubEvents(request: FastifyRequest<GitHubEvents>): Promi
                     message: 'Queued. Thank you!'
                 };
             } else if (githubEvent === 'pull_request') {
-                const pullmergeRequestId = body.number;
+                const pullmergeRequestId = body.number.toString();
                 const pullmergeRequestAction = body.action;
                 const sourceBranch = body.pull_request.head.ref.includes('/') ? body.pull_request.head.ref.split('/')[2] : body.pull_request.head.ref;
                 if (!allowedActions.includes(pullmergeRequestAction)) {
diff --git a/apps/ui/src/lib/components/Usage.svelte b/apps/ui/src/lib/components/Usage.svelte
index a461f8419..0e7630370 100644
--- a/apps/ui/src/lib/components/Usage.svelte
+++ b/apps/ui/src/lib/components/Usage.svelte
@@ -86,8 +86,8 @@
 
 <div class="w-full">
 	<div class="flex items-center">
-		<h1 class="title text-4xl">Hardware Details</h1>
-		<div class="flex  space-x-4">
+		<h1 class="title lg:text-3xl">Hardware Details</h1>
+		<div class="flex space-x-4">
 			{#if $appSession.teamId === '0'}
 				<button on:click={manuallyCleanupStorage} class:loading={loading.cleanup} class="btn btn-sm"
 					>Cleanup Storage</button
@@ -101,42 +101,41 @@
 		</div>
 	</div>
 	<div class="divider" />
-	<div class="grid grid-flow-col gap-4 grid-rows-3 lg:grid-rows-1">
-		<div class="stats stats-vertical lg:stats-horizontal w-full mb-5 bg-transparent rounded">
-			<div class="font-bold flex lg:justify-center">Memory</div>
+	<div class="grid grid-flow-col gap-4 grid-rows-3 justify-start lg:justify-center lg:grid-rows-1">
+		<div class="stats stats-vertical min-w-[16rem] mb-5 rounded bg-transparent">
 			<div class="stat">
-				<div class="stat-title">Total</div>
+				<div class="stat-title">Total Memory</div>
 				<div class="stat-value text-2xl">
 					{(usage?.memory.totalMemMb).toFixed(0)}<span class="text-sm">MB</span>
 				</div>
 			</div>
 
 			<div class="stat">
-				<div class="stat-title">Used</div>
+				<div class="stat-title">Used Memory</div>
 				<div class="stat-value text-2xl">
 					{(usage?.memory.usedMemMb).toFixed(0)}<span class="text-sm">MB</span>
 				</div>
 			</div>
 
 			<div class="stat">
-				<div class="stat-title">Free</div>
+				<div class="stat-title">Free Memory</div>
 				<div class="stat-value text-2xl">
 					{usage?.memory.freeMemPercentage}<span class="text-sm">%</span>
 				</div>
 			</div>
 		</div>
 
-		<div class="stats stats-vertical lg:stats-horizontal w-full mb-5 bg-transparent rounded">
-			<div class="font-bold flex lg:justify-center">CPU</div>
+		<div class="stats stats-vertical min-w-[20rem] mb-5 bg-transparent rounded">
+
 			<div class="stat">
-				<div class="stat-title">Total</div>
+				<div class="stat-title">Total CPU</div>
 				<div class="stat-value text-2xl">
 					{usage?.cpu.count}
 				</div>
 			</div>
 
 			<div class="stat">
-				<div class="stat-title">Usage</div>
+				<div class="stat-title">CPU Usage</div>
 				<div class="stat-value text-2xl">
 					{usage?.cpu.usage}<span class="text-sm">%</span>
 				</div>
@@ -147,24 +146,23 @@
 				<div class="stat-value text-2xl">{usage?.cpu.load}</div>
 			</div>
 		</div>
-		<div class="stats stats-vertical lg:stats-horizontal w-full mb-5 bg-transparent rounded">
-			<div class="font-bold flex lg:justify-center">Disk</div>
+		<div class="stats stats-vertical min-w-[16rem] mb-5 bg-transparent rounded">
 			<div class="stat">
-				<div class="stat-title">Total</div>
+				<div class="stat-title">Total Disk</div>
 				<div class="stat-value text-2xl">
 					{usage?.disk.totalGb}<span class="text-sm">GB</span>
 				</div>
 			</div>
 
 			<div class="stat">
-				<div class="stat-title">Used</div>
+				<div class="stat-title">Used Disk</div>
 				<div class="stat-value text-2xl">
 					{usage?.disk.usedGb}<span class="text-sm">GB</span>
 				</div>
 			</div>
 
 			<div class="stat">
-				<div class="stat-title">Free</div>
+				<div class="stat-title">Free Disk</div>
 				<div class="stat-value text-2xl">
 					{usage?.disk.freePercentage}<span class="text-sm">%</span>
 				</div>
diff --git a/apps/ui/src/lib/components/svg/applications/Docker.svelte b/apps/ui/src/lib/components/svg/applications/Docker.svelte
index ea1787bd9..74ba0ebf0 100644
--- a/apps/ui/src/lib/components/svg/applications/Docker.svelte
+++ b/apps/ui/src/lib/components/svg/applications/Docker.svelte
@@ -3,7 +3,7 @@
 </script>
 
 
-<svg viewBox="0 0 128 128" class={isAbsolute ? 'absolute top-0 left-0 -m-8 h-16 w-16' : 'mx-auto w-10 h-10'}>
+<svg viewBox="0 0 128 128" class={isAbsolute ? 'absolute top-0 left-0 -m-5 h-12 w-12' : 'mx-auto w-10 h-10'}>
 	<path d="M124.8 52.1c-4.3-2.5-10-2.8-14.8-1.4-.6-5.2-4-9.7-8-12.9l-1.6-1.3-1.4 1.6c-2.7 3.1-3.5 8.3-3.1 12.3.3 2.9 1.2 5.9 3 8.3-1.4.8-2.9 1.9-4.3 2.4-2.8 1-5.9 2-8.9 2H79V49H66V24H51v12H26v13H13v14H1.8l-.2 1.5c-.5 6.4.3 12.6 3 18.5l1.1 2.2.1.2c7.9 13.4 21.7 19 36.8 19 29.2 0 53.3-13.1 64.3-40.6 7.4.4 15-1.8 18.6-8.9l.9-1.8-1.6-1zM28 39h10v11H28V39zm13.1 44.2c0 1.7-1.4 3.1-3.1 3.1-1.7 0-3.1-1.4-3.1-3.1 0-1.7 1.4-3.1 3.1-3.1 1.7.1 3.1 1.4 3.1 3.1zM28 52h10v11H28V52zm-13 0h11v11H15V52zm27.7 50.2c-15.8-.1-24.3-5.4-31.3-12.4 2.1.1 4.1.2 5.9.2 1.6 0 3.2 0 4.7-.1 3.9-.2 7.3-.7 10.1-1.5 2.3 5.3 6.5 10.2 14 13.8h-3.4zM51 63H40V52h11v11zm0-13H40V39h11v11zm13 13H53V52h11v11zm0-13H53V39h11v11zm0-13H53V26h11v11zm13 26H66V52h11v11zM38.8 81.2c-.2-.1-.5-.2-.8-.2-1.2 0-2.2 1-2.2 2.2 0 1.2 1 2.2 2.2 2.2s2.2-1 2.2-2.2c0-.3-.1-.6-.2-.8-.2.3-.4.5-.8.5-.5 0-.9-.4-.9-.9.1-.4.3-.7.5-.8z" fill="#019BC6"></path>
 	</svg>
   
diff --git a/apps/ui/src/lib/components/svg/services/Ghost.svelte b/apps/ui/src/lib/components/svg/services/Ghost.svelte
index 567ab69bc..d01ab2e3f 100644
--- a/apps/ui/src/lib/components/svg/services/Ghost.svelte
+++ b/apps/ui/src/lib/components/svg/services/Ghost.svelte
@@ -4,6 +4,6 @@
 
 <img
 	alt="ghost logo"
-	class={isAbsolute ? 'w-12 absolute top-0 left-0 -m-3 -mt-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-12 h-12 absolute top-0 left-0 -m-3 -mt-5' : 'w-8 h-8 mx-auto'}
 	src="/ghost.png"
 />
diff --git a/apps/ui/src/lib/components/svg/services/Hasura.svelte b/apps/ui/src/lib/components/svg/services/Hasura.svelte
index aaac145ca..51a427ccd 100644
--- a/apps/ui/src/lib/components/svg/services/Hasura.svelte
+++ b/apps/ui/src/lib/components/svg/services/Hasura.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <svg
-	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
 	viewBox="0 0 81 84"
 	fill="none"
 	xmlns="http://www.w3.org/2000/svg"
diff --git a/apps/ui/src/lib/components/svg/services/LanguageTool.svelte b/apps/ui/src/lib/components/svg/services/LanguageTool.svelte
index 65a8f0a03..ce3ec948a 100644
--- a/apps/ui/src/lib/components/svg/services/LanguageTool.svelte
+++ b/apps/ui/src/lib/components/svg/services/LanguageTool.svelte
@@ -4,7 +4,7 @@
 
 <svg
 	xmlns="http://www.w3.org/2000/svg"
-	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
 	fill="none"
 	viewBox="0 0 140 140"
 	data-lt-extension-installed="true"
diff --git a/apps/ui/src/lib/components/svg/services/MeiliSearch.svelte b/apps/ui/src/lib/components/svg/services/MeiliSearch.svelte
index b8d4ed788..c3cd9b1f1 100644
--- a/apps/ui/src/lib/components/svg/services/MeiliSearch.svelte
+++ b/apps/ui/src/lib/components/svg/services/MeiliSearch.svelte
@@ -4,7 +4,7 @@
 
 <svg
 	viewBox="0 0 127 74"
-	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8mx-auto'}
 	xmlns="http://www.w3.org/2000/svg"
 	><path
 		d="M.825 73.993l23.244-59.47A21.85 21.85 0 0144.42.625h14.014L35.19 60.096a21.85 21.85 0 01-20.352 13.897H.825z"
diff --git a/apps/ui/src/lib/components/svg/services/MinIO.svelte b/apps/ui/src/lib/components/svg/services/MinIO.svelte
index b6c535357..5a314bf73 100644
--- a/apps/ui/src/lib/components/svg/services/MinIO.svelte
+++ b/apps/ui/src/lib/components/svg/services/MinIO.svelte
@@ -4,6 +4,6 @@
 
 <img
 	alt="minio logo"
-	class={isAbsolute ? 'w-7 absolute top-0 left-0 -m-3 -mt-5' : 'w-4  mx-auto'}
+	class={isAbsolute ? 'w-7 h-12 absolute top-0 left-0 -m-3 -mt-5' : 'w-4 h-8 mx-auto'}
 	src="/minio.png"
 />
diff --git a/apps/ui/src/lib/components/svg/services/Moodle.svelte b/apps/ui/src/lib/components/svg/services/Moodle.svelte
index ad8aec880..a52ddc6f7 100644
--- a/apps/ui/src/lib/components/svg/services/Moodle.svelte
+++ b/apps/ui/src/lib/components/svg/services/Moodle.svelte
@@ -3,6 +3,6 @@
 </script>
 <img
 	alt="moodle logo"
-	class={isAbsolute ? 'w-9 absolute top-0 left-0 -m-3 -mt-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-9 h-9 absolute top-0 left-0 -m-3 -mt-5' : 'w-8 h-8 mx-auto'}
 	src="/moodle.png"
 />
diff --git a/apps/ui/src/lib/components/svg/services/N8n.svelte b/apps/ui/src/lib/components/svg/services/N8n.svelte
index 04b2e8216..da7ab2b88 100644
--- a/apps/ui/src/lib/components/svg/services/N8n.svelte
+++ b/apps/ui/src/lib/components/svg/services/N8n.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <svg
-	class={isAbsolute ? 'w-12 h-12 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-12 h-12 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
 	viewBox="0 0 220 105"
 >
 	<g>
diff --git a/apps/ui/src/lib/components/svg/services/NocoDB.svelte b/apps/ui/src/lib/components/svg/services/NocoDB.svelte
index ba93c4f78..fcaac6a96 100644
--- a/apps/ui/src/lib/components/svg/services/NocoDB.svelte
+++ b/apps/ui/src/lib/components/svg/services/NocoDB.svelte
@@ -4,6 +4,6 @@
 
 <img
 	alt="nocodb logo"
-	class={isAbsolute ? 'w-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
 	src="/nocodb.png"
 />
diff --git a/apps/ui/src/lib/components/svg/services/Umami.svelte b/apps/ui/src/lib/components/svg/services/Umami.svelte
index e1c9b1e67..7faeca3fb 100644
--- a/apps/ui/src/lib/components/svg/services/Umami.svelte
+++ b/apps/ui/src/lib/components/svg/services/Umami.svelte
@@ -7,7 +7,7 @@
 	xmlns="http://www.w3.org/2000/svg"
 	viewBox="0 0 856.000000 856.000000"
 	preserveAspectRatio="xMidYMid meet"
-	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
 >
 	<metadata> Created by potrace 1.11, written by Peter Selinger 2001-2013 </metadata>
 	<g
diff --git a/apps/ui/src/lib/components/svg/services/VSCodeServer.svelte b/apps/ui/src/lib/components/svg/services/VSCodeServer.svelte
index 3b100e470..00f3d0edd 100644
--- a/apps/ui/src/lib/components/svg/services/VSCodeServer.svelte
+++ b/apps/ui/src/lib/components/svg/services/VSCodeServer.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <svg
-	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8mx-auto'}
 	viewBox="0 0 128 128"
 >
 	<path
diff --git a/apps/ui/src/lib/components/svg/services/VaultWarden.svelte b/apps/ui/src/lib/components/svg/services/VaultWarden.svelte
index 3e4f6b8b5..83f212241 100644
--- a/apps/ui/src/lib/components/svg/services/VaultWarden.svelte
+++ b/apps/ui/src/lib/components/svg/services/VaultWarden.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <svg
-	class={isAbsolute ? 'w-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8mx-auto'}
 	xmlns="http://www.w3.org/2000/svg"
 	xmlns:xlink="http://www.w3.org/1999/xlink"
 	version="1.1"
diff --git a/apps/ui/src/lib/components/svg/services/Wordpress.svelte b/apps/ui/src/lib/components/svg/services/Wordpress.svelte
index aaccb931a..c6a79e5e9 100644
--- a/apps/ui/src/lib/components/svg/services/Wordpress.svelte
+++ b/apps/ui/src/lib/components/svg/services/Wordpress.svelte
@@ -2,7 +2,7 @@
 	export let isAbsolute = false;
 </script>
 
-<svg class={isAbsolute ? 'w-10  absolute top-0 left-0 -m-5' : 'w-8 mx-auto'} viewBox="0 0 128 128">
+<svg class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8mx-auto'} viewBox="0 0 128 128">
 	<path
 		fill-rule="evenodd"
 		clip-rule="evenodd"
diff --git a/apps/ui/src/routes/applications/[id]/_Secret.svelte b/apps/ui/src/routes/applications/[id]/_Secret.svelte
index 12d69db19..780dea726 100644
--- a/apps/ui/src/routes/applications/[id]/_Secret.svelte
+++ b/apps/ui/src/routes/applications/[id]/_Secret.svelte
@@ -57,11 +57,12 @@
 					message: 'Secret added.',
 					type: 'success'
 				});
-			}
-			addToast({
+			} else {
+				addToast({
 				message: 'Secret updated.',
 				type: 'success'
 			});
+			}
 			dispatch('refresh');
 		} catch (error) {
 			console.log(error);
diff --git a/apps/ui/src/routes/iam/team/[id]/__layout.svelte b/apps/ui/src/routes/iam/team/[id]/__layout.svelte
index ff308d5db..235f008ff 100644
--- a/apps/ui/src/routes/iam/team/[id]/__layout.svelte
+++ b/apps/ui/src/routes/iam/team/[id]/__layout.svelte
@@ -25,18 +25,38 @@
 </script>
 
 <script lang="ts">
+	export let team: any;
+	export let currentTeam: string;
+	export let teams: any;
 	import { page } from '$app/stores';
 	import { errorNotification, handlerNotFoundLoad } from '$lib/common';
 	import { appSession } from '$lib/store';
 	import { t } from '$lib/translations';
 	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
 	import { goto } from '$app/navigation';
+	import Cookies from 'js-cookie';
 	const { id } = $page.params;
+
 	async function deleteTeam() {
 		const sure = confirm('Are you sure you want to delete this team?');
 		if (sure) {
 			try {
 				await del(`/iam/team/${id}`, { id });
+				if (currentTeam === id) {
+					const switchTeam = teams.find((team: any) => team.id !== id);
+					const payload = await get(`/user?teamId=${switchTeam.id}`);
+					if (payload.token) {
+						Cookies.set('token', payload.token, {
+							path: '/'
+						});
+						$appSession.teamId = payload.teamId;
+						$appSession.userId = payload.userId;
+						$appSession.permission = payload.permission;
+						$appSession.isAdmin = payload.isAdmin;
+						return window.location.assign('/iam');
+					}
+				}
+
 				return await goto('/iam', { replaceState: true });
 			} catch (error) {
 				return errorNotification(error);
@@ -47,16 +67,18 @@
 
 {#if id !== 'new'}
 	<nav class="nav-side">
-		<button
-			on:click={deleteTeam}
-			type="submit"
-			disabled={!$appSession.isAdmin}
-			class:hover:text-red-500={$appSession.isAdmin}
-			class="icons tooltip tooltip-primary tooltip-left bg-transparent text-sm"
-			data-tip={$appSession.isAdmin
-				? 'Delete'
-				: $t('destination.permission_denied_delete_destination')}><DeleteIcon /></button
-		>
+		{#if team.id !== '0'}
+			<button
+				on:click={deleteTeam}
+				type="submit"
+				disabled={!$appSession.isAdmin}
+				class:hover:text-red-500={$appSession.isAdmin}
+				class="icons tooltip tooltip-primary tooltip-left bg-transparent text-sm"
+				data-tip={$appSession.isAdmin
+					? 'Delete'
+					: $t('destination.permission_denied_delete_destination')}><DeleteIcon /></button
+			>
+		{/if}
 	</nav>
 {/if}
 <slot />
diff --git a/apps/ui/src/routes/index.svelte b/apps/ui/src/routes/index.svelte
index 1a8734f9b..f01ffd33e 100644
--- a/apps/ui/src/routes/index.svelte
+++ b/apps/ui/src/routes/index.svelte
@@ -76,13 +76,13 @@
 <div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">{$t('index.dashboard')}</div>
 </div>
-<div class="container lg:mx-auto lg:p-0 p-5">
+<div class="container lg:mx-auto lg:p-0 px-8 p-5">
 	{#if $appSession.teamId === '0'}
 		<Usage />
 	{/if}
-	<h1 class="title text-4xl mt-10">Applications</h1>
+	<h1 class="title lg:text-3xl mt-10">Applications</h1>
 	<div class="divider" />
-	<div class="grid grid-col gap-4 auto-cols-max grid-cols-1 lg:grid-cols-3 p-4">
+	<div class="grid grid-col gap-8 auto-cols-max grid-cols-1 lg:grid-cols-3 p-4">
 		{#if applications.length > 0}
 			{#each applications as application}
 				<a class="no-underline mb-5" href={`/applications/${application.id}`}>
@@ -97,12 +97,12 @@
 							{/if}
 						{/await}
 						<div class="w-full flex flex-row">
-							<ApplicationsIcons {application} isAbsolute={false} />
-							<div class="w-full flex flex-col ml-5">
-								<h1 class="font-bold text-xl truncate">
+							<ApplicationsIcons {application} isAbsolute={true} />
+							<div class="w-full flex flex-col">
+								<h1 class="font-bold text-lg lg:text-sm truncate">
 									{application.name}
 									{#if application.settings.isBot}
-										<span class="text-xs"> BOT</span>
+										<span class="text-xs">BOT</span>
 									{/if}
 								</h1>
 								<div class="h-10">
@@ -165,9 +165,9 @@
 			<h1 class="">Nothing is configured yet.</h1>
 		{/if}
 	</div>
-	<h1 class="title text-4xl mt-10">Services</h1>
+	<h1 class="title lg:text-3xl mt-10">Services</h1>
 	<div class="divider" />
-	<div class="grid grid-col gap-4 auto-cols-max grid-cols-1 lg:grid-cols-3 p-4">
+	<div class="grid grid-col gap-8 auto-cols-max grid-cols-1 lg:grid-cols-3 p-4">
 		{#if services.length > 0}
 			{#each services as service}
 				<a class="no-underline mb-5" href={`/services/${service.id}`}>
@@ -182,9 +182,9 @@
 							{/if}
 						{/await}
 						<div class="w-full flex flex-row">
-							<ServiceIcons type={service.type} isAbsolute={false} />
-							<div class="w-full flex flex-col ml-5">
-								<h1 class="font-bold text-xl truncate">{service.name}</h1>
+							<ServiceIcons type={service.type} isAbsolute={true} />
+							<div class="w-full flex flex-col">
+								<h1 class="font-bold text-lg lg:text-sm truncate">{service.name}</h1>
 								<div class="h-10">
 									{#if service?.fqdn}
 										<h2>{service?.fqdn.replace('https://', '').replace('http://', '')}</h2>
@@ -223,9 +223,9 @@
 		{/if}
 	</div>
 
-	<h1 class="title text-4xl mt-10">Databases</h1>
+	<h1 class="title lg:text-3xl mt-10">Databases</h1>
 	<div class="divider" />
-	<div class="grid grid-col gap-4 auto-cols-max grid-cols-1 lg:grid-cols-3 p-4 mb-32">
+	<div class="grid grid-col gap-8 auto-cols-max grid-cols-1 lg:grid-cols-3 p-4 mb-32">
 		{#if databases.length > 0}
 			{#each databases as database}
 				<a class="no-underline mb-5" href={`/databases/${database.id}`}>
@@ -239,14 +239,14 @@
 								<span class="indicator-item badge bg-error badge-xs" />
 							{/if}
 						{/await}
-						<div class="w-full flex flex-row pt-2">
-							<DatabaseIcons type={database.type} isAbsolute={false} />
-							<div class="w-full flex flex-col ml-5">
+						<div class="w-full flex flex-row">
+							<DatabaseIcons type={database.type} isAbsolute={true} />
+							<div class="w-full flex flex-col">
 								<div class="h-10">
-									<h1 class="font-bold text-xl truncate">{database.name}</h1>
+									<h1 class="font-bold text-lg lg:text-sm truncate">{database.name}</h1>
 									<div class="h-10">
 										{#if database?.version}
-											<h2>{database?.version}</h2>
+											<h2 class="text-xs">{database?.version}</h2>
 										{:else}
 											<h2 class="text-red-500">Not configured</h2>
 										{/if}
diff --git a/package.json b/package.json
index ecf58e487..4e3a1d486 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "coolify",
   "description": "An open-source & self-hostable Heroku / Netlify alternative.",
-  "version": "3.8.3",
+  "version": "3.8.4",
   "license": "Apache-2.0",
   "repository": "github:coollabsio/coolify",
   "scripts": {