Merge pull request #612 from kaname-png/some-tweaks

feat(routes): ui for mobile and fixes
2022-09-19 08:54:23 +02:00
parent ad80e7f48b 2eda24799b
commit 98e1deec88
65 changed files with 2440 additions and 2376 deletions
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
--- a/apps/ui/src/lib/api.ts
+++ b/apps/ui/src/lib/api.ts
@@ -3,33 +3,35 @@ import Cookies from 'js-cookie';

 export function getAPIUrl() {
 	if (GITPOD_WORKSPACE_URL) {
-		const { href } = new URL(GITPOD_WORKSPACE_URL)
-		const newURL = href.replace('https://', 'https://3001-').replace(/\/$/, '')
-		return newURL
+		const { href } = new URL(GITPOD_WORKSPACE_URL);
+		const newURL = href.replace('https://', 'https://3001-').replace(/\/$/, '');
+		return newURL;
 	}
 	if (CODESANDBOX_HOST) {
-		     return `https://${CODESANDBOX_HOST.replace(/\$PORT/,'3001')}`
+		return `https://${CODESANDBOX_HOST.replace(/\$PORT/, '3001')}`;
 	}
-	return dev ? 'http://localhost:3001' : 'http://localhost:3000';
+	return dev
+		? 'http://localhost:3001'
+		: 'http://localhost:3000';
 }
 export function getWebhookUrl(type: string) {
 	if (GITPOD_WORKSPACE_URL) {
-		const { href } = new URL(GITPOD_WORKSPACE_URL)
-		const newURL = href.replace('https://', 'https://3001-').replace(/\/$/, '')
+		const { href } = new URL(GITPOD_WORKSPACE_URL);
+		const newURL = href.replace('https://', 'https://3001-').replace(/\/$/, '');
 		if (type === 'github') {
-			return `${newURL}/webhooks/github/events`
+			return `${newURL}/webhooks/github/events`;
 		}
 		if (type === 'gitlab') {
-			return `${newURL}/webhooks/gitlab/events`
+			return `${newURL}/webhooks/gitlab/events`;
 		}
 	}
 	if (CODESANDBOX_HOST) {
-		const newURL = `https://${CODESANDBOX_HOST.replace(/\$PORT/,'3001')}`
+		const newURL = `https://${CODESANDBOX_HOST.replace(/\$PORT/, '3001')}`;
 		if (type === 'github') {
-			return `${newURL}/webhooks/github/events`
+			return `${newURL}/webhooks/github/events`;
 		}
 		if (type === 'gitlab') {
-			return `${newURL}/webhooks/gitlab/events`
+			return `${newURL}/webhooks/gitlab/events`;
 		}
 	}
 	return `https://webhook.site/0e5beb2c-4e9b-40e2-a89e-32295e570c21/events`;
@@ -103,7 +105,11 @@ async function send({
 		return {};
 	}
 	if (!response.ok) {
-		if (response.status === 401 && !path.startsWith('https://api.github') && !path.includes('/v4/user')) {
+		if (
+			response.status === 401 &&
+			!path.startsWith('https://api.github') &&
+			!path.includes('/v4/user')
+		) {
 			Cookies.remove('token');
 		}

--- a/apps/ui/src/lib/components/CopyPasswordField.svelte
+++ b/apps/ui/src/lib/components/CopyPasswordField.svelte
@@ -13,8 +13,9 @@
 	export let id: string;
 	export let name: string;
 	export let placeholder = '';
+	export let inputStyle = '';

-	let disabledClass = 'bg-coolback disabled:bg-coolblack';
+	let disabledClass = 'bg-coolback disabled:bg-coolblack w-full';
 	let isHttps = browser && window.location.protocol === 'https:';

 	function copyToClipboard() {
@@ -32,6 +33,7 @@
 	{#if !isPasswordField || showPassword}
 		{#if textarea}
 			<textarea
+				style={inputStyle}
 				rows="5"
 				class={disabledClass}
 				class:pr-10={true}
@@ -47,6 +49,7 @@
 			>
 		{:else}
 			<input
+				style={inputStyle}
 				class={disabledClass}
 				type="text"
 				class:pr-10={true}
@@ -63,6 +66,7 @@
 		{/if}
 	{:else}
 		<input
+			style={inputStyle}
 			class={disabledClass}
 			class:pr-10={true}
 			class:pr-20={value && isHttps}
--- a/apps/ui/src/lib/components/Usage.svelte
+++ b/apps/ui/src/lib/components/Usage.svelte
@@ -79,7 +79,7 @@
 			BETA
 		</div>
 	{/if}
-	<div class="w-full flex flex-row space-x-4">
+	<div class="w-full flex flex-col lg:flex-row space-y-4 lg:space-y-0">
 		<div class="flex flex-col">
 			<h1 class="font-bold text-lg lg:text-xl truncate">
 				{server.name}
--- a/apps/ui/src/routes/_NewResource.svelte
+++ b/apps/ui/src/routes/_NewResource.svelte
@@ -16,7 +16,7 @@
 	}
 </script>

-<div class="dropdown dropdown-hover">
+<div class="dropdown dropdown-left">
 	<slot>
 		<label for="new" tabindex="0" class="btn btn-square btn-sm bg-coollabs">
 			<svg
--- a/apps/ui/src/routes/__layout.svelte
+++ b/apps/ui/src/routes/__layout.svelte
@@ -120,8 +120,11 @@
 		<PageLoader />
 	</div>
 {/if}
+<div class="drawer">
+	<input id="main-drawer" type="checkbox" class="drawer-toggle" />
+	<div class="drawer-content">
 		{#if $appSession.userId}
-	<nav class="nav-main">
+			<nav class="nav-main hidden lg:block z-20">
 				<div class="flex h-screen w-full flex-col items-center transition-all duration-100">
 					{#if !$appSession.whiteLabeled}
 						<div class="mb-2 mt-4 h-10 w-10">
@@ -200,8 +203,7 @@
 							href="/iam"
 							class="icons bg-coolgray-200"
 							class:text-iam={$page.url.pathname.startsWith('/iam')}
-					class:bg-coolgray-500={$page.url.pathname === '/iam'}
-					class:bg-coolgray-200={!($page.url.pathname === '/iam')}
+							class:bg-coolgray-500={$page.url.pathname.startsWith('/iam')}
 							><svg
 								xmlns="http://www.w3.org/2000/svg"
 								viewBox="0 0 24 24"
@@ -225,8 +227,7 @@
 							href={$appSession.teamId === '0' ? '/settings/global' : '/settings/ssh-keys'}
 							class="icons bg-coolgray-200"
 							class:text-settings={$page.url.pathname.startsWith('/settings')}
-					class:bg-coolgray-500={$page.url.pathname === '/settings'}
-					class:bg-coolgray-200={!($page.url.pathname === '/settings')}
+							class:bg-coolgray-500={$page.url.pathname.startsWith('/settings')}
 						>
 							<svg
 								xmlns="http://www.w3.org/2000/svg"
@@ -282,11 +283,170 @@
 				>
 			{/if}
 		{/if}
+		<div
+			class="navbar bg-neutral-focus lg:hidden space-x-2 flex flex-row items-center"
+			class:hidden={!$appSession.userId}
+		>
+			<label for="main-drawer" class="drawer-button btn btn-square btn-ghost">
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					fill="none"
+					viewBox="0 0 24 24"
+					class="inline-block w-5 h-5 stroke-current"
+					><path
+						stroke-linecap="round"
+						stroke-linejoin="round"
+						stroke-width="2"
+						d="M4 6h16M4 12h16M4 18h16"
+					/></svg
+				>
+			</label>
+			<div class="prose flex flex-row justify-between space-x-1 w-full items-center pr-3">
+				<h3 class="mb-0">Coolify</h3>
+				<UpdateAvailable />
+			</div>
+		</div>
 		<main>
-	<div class={$appSession.userId ? 'pl-14 lg:px-20' : null}>
+			<div class={$appSession.userId ? 'lg:pl-16' : null}>
 				<slot />
 			</div>
 		</main>
+	</div>
+	<div class="drawer-side">
+		<label for="main-drawer" class="drawer-overlay w-full" />
+		<ul class="menu bg-base-100 w-80 p-2 rounded-r-lg space-y-3">
+			<li class="menu-title">
+				<span>Main</span>
+			</li>
+			<li>
+				<a
+					class="no-underline"
+					sveltekit:prefetch
+					href="/"
+					class:bg-primary={$page.url.pathname === '/'}
+				>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						class="h-9 w-9"
+						viewBox="0 0 24 24"
+						stroke-width="1.5"
+						stroke="currentColor"
+						fill="none"
+						stroke-linecap="round"
+						stroke-linejoin="round"
+					>
+						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+						<path
+							d="M19 8.71l-5.333 -4.148a2.666 2.666 0 0 0 -3.274 0l-5.334 4.148a2.665 2.665 0 0 0 -1.029 2.105v7.2a2 2 0 0 0 2 2h12a2 2 0 0 0 2 -2v-7.2c0 -.823 -.38 -1.6 -1.03 -2.105"
+						/>
+						<path d="M16 15c-2.21 1.333 -5.792 1.333 -8 0" />
+					</svg>
+					Dashboard
+				</a>
+			</li>
+			<li class="menu-title">
+				<span>Manage</span>
+			</li>
+			<li>
+				<a
+					class="no-underline"
+					sveltekit:prefetch
+					href="/servers"
+					class:bg-applications={$page.url.pathname.startsWith('/servers')}
+				>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						class="w-8 h-8"
+						viewBox="0 0 24 24"
+						stroke-width="1.5"
+						stroke="currentColor"
+						fill="none"
+						stroke-linecap="round"
+						stroke-linejoin="round"
+					>
+						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+						<rect x="3" y="4" width="18" height="8" rx="3" />
+						<rect x="3" y="12" width="18" height="8" rx="3" />
+						<line x1="7" y1="8" x2="7" y2="8.01" />
+						<line x1="7" y1="16" x2="7" y2="16.01" />
+					</svg>
+					Servers
+				</a>
+			</li>
+			<li class="menu-title">
+				<span>Dashboard settings</span>
+			</li>
+			<li>
+				<a class="no-underline" href="/iam" class:bg-iam={$page.url.pathname.startsWith('/iam')}
+					><svg
+						xmlns="http://www.w3.org/2000/svg"
+						viewBox="0 0 24 24"
+						class="h-9 w-9"
+						stroke-width="1.5"
+						stroke="currentColor"
+						fill="none"
+						stroke-linecap="round"
+						stroke-linejoin="round"
+					>
+						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+						<circle cx="9" cy="7" r="4" />
+						<path d="M3 21v-2a4 4 0 0 1 4 -4h4a4 4 0 0 1 4 4v2" />
+						<path d="M16 3.13a4 4 0 0 1 0 7.75" />
+						<path d="M21 21v-2a4 4 0 0 0 -3 -3.85" />
+					</svg>
+					IAM
+				</a>
+			</li>
+			<li>
+				<a
+					class="no-underline"
+					href={$appSession.teamId === '0' ? '/settings/global' : '/settings/ssh-keys'}
+					class:bg-settings={$page.url.pathname.startsWith('/settings')}
+					class:text-black={$page.url.pathname.startsWith('/settings')}
+				>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						viewBox="0 0 24 24"
+						class="h-9 w-9"
+						stroke-width="1.5"
+						stroke="currentColor"
+						fill="none"
+						stroke-linecap="round"
+						stroke-linejoin="round"
+					>
+						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+						<path
+							d="M10.325 4.317c.426 -1.756 2.924 -1.756 3.35 0a1.724 1.724 0 0 0 2.573 1.066c1.543 -.94 3.31 .826 2.37 2.37a1.724 1.724 0 0 0 1.065 2.572c1.756 .426 1.756 2.924 0 3.35a1.724 1.724 0 0 0 -1.066 2.573c.94 1.543 -.826 3.31 -2.37 2.37a1.724 1.724 0 0 0 -2.572 1.065c-.426 1.756 -2.924 1.756 -3.35 0a1.724 1.724 0 0 0 -2.573 -1.066c-1.543 .94 -3.31 -.826 -2.37 -2.37a1.724 1.724 0 0 0 -1.065 -2.572c-1.756 -.426 -1.756 -2.924 0 -3.35a1.724 1.724 0 0 0 1.066 -2.573c-.94 -1.543 .826 -3.31 2.37 -2.37c1 .608 2.296 .07 2.572 -1.065z"
+						/>
+						<circle cx="12" cy="12" r="3" />
+					</svg>
+					Settings
+				</a>
+			</li>
+			<li>
+				<div class="no-underline hover:bg-error" on:click={logout}>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						class="ml-1 h-8 w-8"
+						viewBox="0 0 24 24"
+						stroke-width="1.5"
+						stroke="currentColor"
+						fill="none"
+						stroke-linecap="round"
+						stroke-linejoin="round"
+					>
+						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+						<path
+							d="M14 8v-2a2 2 0 0 0 -2 -2h-7a2 2 0 0 0 -2 2v12a2 2 0 0 0 2 2h7a2 2 0 0 0 2 -2v-2"
+						/>
+						<path d="M7 12h14l-3 -3m0 6l3 -3" />
+					</svg>
+					Logout
+				</div>
+			</li>
+		</ul>
+	</div>
+</div>

 <Tooltip triggeredBy="#iam" placement="right" color="bg-iam">IAM</Tooltip>
 <Tooltip triggeredBy="#settings" placement="right" color="bg-settings  text-black">Settings</Tooltip
--- a/apps/ui/src/routes/applications/[id]/_Secret.svelte
+++ b/apps/ui/src/routes/applications/[id]/_Secret.svelte
@@ -93,6 +93,7 @@

 <td>
 	<input
+		style="min-width: 350px !important;"
 		id={isNewSecret ? 'secretName' : 'secretNameNew'}
 		bind:value={name}
 		required
@@ -110,6 +111,7 @@
 		bind:value
 		required
 		placeholder="J$#@UIO%HO#$U%H"
+		inputStyle="min-width: 350px; !important"
 	/>
 </td>
 <td class="text-center">
--- a/apps/ui/src/routes/applications/[id]/__layout.svelte
+++ b/apps/ui/src/routes/applications/[id]/__layout.svelte
@@ -190,13 +190,69 @@
 	});
 </script>

-<nav class="nav-side">
+<nav class="header">
+	<div class="hidden items-center space-x-2 p-5 px-6 font-bold lg:flex">
+		<div class="flex flex-col">
+			<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
+				Configuration
+			</div>
+			<span class="text-xs">{application.name}</span>
+		</div>
+		{#if application.gitSource?.htmlUrl && application.repository && application.branch}
+			<a
+				id="git"
+				href="{application.gitSource.htmlUrl}/{application.repository}/tree/{application.branch}"
+				target="_blank"
+				class="w-10"
+			>
+				{#if application.gitSource?.type === 'gitlab'}
+					<svg viewBox="0 0 128 128" class="icons">
+						<path
+							fill="#FC6D26"
+							d="M126.615 72.31l-7.034-21.647L105.64 7.76c-.716-2.206-3.84-2.206-4.556 0l-13.94 42.903H40.856L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664 1.385 72.31a4.792 4.792 0 001.74 5.358L64 121.894l60.874-44.227a4.793 4.793 0 001.74-5.357"
+						/><path fill="#E24329" d="M64 121.894l23.144-71.23H40.856L64 121.893z" /><path
+							fill="#FC6D26"
+							d="M64 121.894l-23.144-71.23H8.42L64 121.893z"
+						/><path
+							fill="#FCA326"
+							d="M8.42 50.663L1.384 72.31a4.79 4.79 0 001.74 5.357L64 121.894 8.42 50.664z"
+						/><path
+							fill="#E24329"
+							d="M8.42 50.663h32.436L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664z"
+						/><path fill="#FC6D26" d="M64 121.894l23.144-71.23h32.437L64 121.893z" /><path
+							fill="#FCA326"
+							d="M119.58 50.663l7.035 21.647a4.79 4.79 0 01-1.74 5.357L64 121.894l55.58-71.23z"
+						/><path
+							fill="#E24329"
+							d="M119.58 50.663H87.145l13.94-42.902c.717-2.206 3.84-2.206 4.557 0l13.94 42.903z"
+						/>
+					</svg>
+				{:else if application.gitSource?.type === 'github'}
+					<svg viewBox="0 0 128 128" class="icons">
+						<g fill="#ffffff"
+							><path
+								fill-rule="evenodd"
+								clip-rule="evenodd"
+								d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"
+							/><path
+								d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm2.446 2.729c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zM31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm3.261 3.361c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm4.5 1.951c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm4.943.361c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm4.598-.782c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"
+							/></g
+						>
+					</svg>
+				{/if}
+			</a>
+			<Tooltip triggeredBy="#git">Open on Git</Tooltip>
+		{/if}
+	</div>
+	<div
+		class="flex flex-row flex-wrap space-x-4 space-y-3 justify-center lg:justify-start py-2 lg:py-0"
+	>
 		{#if $location}
 			<a
 				id="open"
 				href={$location}
 				target="_blank"
-			class="icons flex items-center bg-transparent text-sm"
+				class="icons flex items-center bg-transparent text-sm mt-3"
 				><svg
 					xmlns="http://www.w3.org/2000/svg"
 					class="h-6 w-6"
@@ -217,7 +273,6 @@

 			<div class="border border-coolgray-500 h-8" />
 		{/if}
-
 		{#if $status.application.isExited || $status.application.isRestarting}
 			<a
 				id="applicationerror"
@@ -243,34 +298,11 @@
 					<line x1="12" y1="16" x2="12.01" y2="16" />
 				</svg>
 			</a>
-		<Tooltip triggeredBy="#applicationerror">Application exited or restarting!</Tooltip>
-		<button
-			id="stop"
-			on:click={stopApplication}
-			type="submit"
-			disabled={!$isDeploymentEnabled}
-			class="icons bg-transparent text-sm flex items-center space-x-2 text-error"
-		>
-			<svg
-				xmlns="http://www.w3.org/2000/svg"
-				class="w-6 h-6"
-				viewBox="0 0 24 24"
-				stroke-width="1.5"
-				stroke="currentColor"
-				fill="none"
-				stroke-linecap="round"
-				stroke-linejoin="round"
-			>
-				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-				<rect x="6" y="5" width="4" height="14" rx="1" />
-				<rect x="14" y="5" width="4" height="14" rx="1" />
-			</svg>
-		</button>
-		<Tooltip triggeredBy="#stop">Stop</Tooltip>
+			<Tooltip triggeredBy="#applicationerror">Application exited with an error!</Tooltip>
 		{/if}
 		{#if $status.application.initialLoading}
 			<button
-			class="icons flex animate-spin items-center space-x-2 bg-transparent text-sm duration-500 ease-in-out hover:bg-transparent"
+				class="icons flex animate-spin items-center space-x-2 bg-transparent text-sm duration-500 ease-in-out"
 			>
 				<svg
 					xmlns="http://www.w3.org/2000/svg"
@@ -520,7 +552,9 @@
 		{/if}
 		<div class="border border-coolgray-500 h-8" />
 		<a
-		href={$isDeploymentEnabled && $status.application.isRunning ? `/applications/${id}/logs` : null}
+			href={$isDeploymentEnabled && $status.application.isRunning
+				? `/applications/${id}/logs`
+				: null}
 			sveltekit:prefetch
 			class="hover:text-sky-500 rounded"
 			class:text-sky-500={$page.url.pathname === `/applications/${id}/logs`}
@@ -610,5 +644,6 @@
 			</button>
 			<Tooltip triggeredBy="#delete">Delete</Tooltip>
 		{/if}
+	</div>
 </nav>
 <slot />
--- a/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
@@ -413,7 +413,7 @@
 			>{loading.save ? $t('forms.saving') : $t('forms.save')}</button
 		>
 		{#if tryAgain}
-			<div>
+			<div class="p-5">
 				An error occured during authenticating with GitLab. Please check your GitLab Source
 				configuration <a href={`/sources/${application.gitSource.id}`}>here.</a>
 			</div>
--- a/apps/ui/src/routes/applications/[id]/configuration/_PublicRepository.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/_PublicRepository.svelte
@@ -157,11 +157,13 @@
 </script>

 <div class="mx-auto max-w-5xl">
-	<div class="grid grid-flow-row gap-2 px-10">
-		<div class="flex">
-			<form class="flex" on:submit|preventDefault={loadBranches}>
-				<div class="space-y-4">
+	<form
+		class="flex flex-col lg:flex-row w-full lg:px-32 space-y-5 lg:space-y-0 lg:space-x-5 lg:items-center"
+		on:submit|preventDefault={loadBranches}
+	>
+		<div class="space-y-4 w-full">
 			<input
+				class="w-full"
 				placeholder="eg: https://github.com/coollabsio/nodejs-example/tree/main"
 				bind:value={publicRepositoryLink}
 			/>
@@ -185,11 +187,8 @@
 			{/if}
 		</div>

-				<button class="btn mx-4 bg-orange-600" class:loading={loading.branches} type="submit"
-					>Load Repository</button
-				>
+		<button class="btn bg-orange-600" class:loading={loading.branches} type="submit">
+			Load Repository
+		</button>
 	</form>
 </div>
-	</div>
-	
-</div>
--- a/apps/ui/src/routes/applications/[id]/configuration/source.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/source.svelte
@@ -73,7 +73,7 @@
 		{$t('application.configuration.select_a_git_source')}
 	</div>
 </div>
-<div class="max-w-5xl mx-auto ">
+<div class="max-w-5xl mx-auto px-5">
 	<div class="title pb-8">Git App</div>
 	<div class="flex flex-wrap justify-center">
 		{#if !filteredSources || ownSources.length === 0}
@@ -192,7 +192,7 @@
 			</div>
 		{/if}
 	</div>
-	<div class="flex items-center">
+	<div class="flex flex-row items-center">
 		<div class="title py-4">Public Repository</div>
 		<DocLink url="https://docs.coollabs.io/coolify/applications/#public-repository" />
 	</div>
--- a/apps/ui/src/routes/applications/[id]/index.svelte
+++ b/apps/ui/src/routes/applications/[id]/index.svelte
@@ -94,7 +94,7 @@
 		}
 	];
 	function containerClass() {
-		return 'text-white bg-transparent font-thin px-0';
+		return 'text-white bg-transparent font-thin px-0 w-full';
 	}

 	async function getUsage() {
@@ -294,8 +294,8 @@
 	}
 </script>

-<div class="flex items-center space-x-2 p-5 px-6 font-bold">
-	<div class="-mb-5 flex-col">
+<div class="flex items-center space-x-2 p-5 px-6 font-bold lg:hidden">
+	<div class="flex-col">
 		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
 			Configuration
 		</div>
@@ -348,7 +348,7 @@
 	{/if}
 </div>

-<div class="mx-auto max-w-4xl px-6 py-4">
+<div class="mx-auto max-w-4xl px-6 pt-4">
 	<div class="text-2xl font-bold">Application Usage</div>
 	<div class="text-center">
 		<div class="stat w-64">
@@ -370,8 +370,8 @@
 <div class="mx-auto max-w-4xl px-6">
 	<!-- svelte-ignore missing-declaration -->
 	<form on:submit|preventDefault={handleSubmit} class="py-4">
-		<div class="flex space-x-1 pb-5">
-			<div class="title">{$t('general')}</div>
+		<div class="flex space-x-1 pb-5 justify-between items-center">
+			<h1 class="title">{$t('general')}</h1>
 			{#if $appSession.isAdmin}
 				<button
 					class="btn btn-sm"
@@ -384,7 +384,8 @@
 				>
 			{/if}
 		</div>
-		<div class="grid grid-flow-row gap-2 px-10">
+
+		<div class="grid grid-flow-row gap-2 lg:px-10 pr-5">
 			<div class="mt-2 grid grid-cols-2 items-center">
 				<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
 				<input name="name" id="name" bind:value={application.name} required />
@@ -459,7 +460,7 @@
 						value={application.destinationDocker.name}
 						id="destination"
 						disabled
-						class="bg-transparent"
+						class="bg-transparent w-full"
 					/>
 				</div>
 			</div>
@@ -473,11 +474,9 @@
 								: 'Image that will be used during the build process.'}
 						/>
 					</label>
-
-					<div class="custom-select-wrapper">
 					<Select
 						{isDisabled}
-							containerClasses={isDisabled && containerClass()}
+						containerClasses={(isDisabled && containerClass()) || 'bg-neutral border-0 w-full'}
 						id="baseBuildImages"
 						showIndicator={!$status.application.isRunning}
 						items={application.baseBuildImages}
@@ -486,7 +485,6 @@
 						isClearable={false}
 					/>
 				</div>
-				</div>
 			{/if}
 			{#if application.buildPack !== 'docker'}
 				<div class="grid grid-cols-2 items-center">
@@ -494,10 +492,9 @@
 						>{$t('application.base_image')}
 						<Explainer explanation={'Image that will be used for the deployment.'} /></label
 					>
-					<div class="custom-select-wrapper">
 					<Select
 						{isDisabled}
-							containerClasses={isDisabled && containerClass()}
+						containerClasses={(isDisabled && containerClass()) || 'bg-neutral border-0'}
 						id="baseImages"
 						showIndicator={!$status.application.isRunning}
 						items={application.baseImages}
@@ -506,7 +503,6 @@
 						isClearable={false}
 					/>
 				</div>
-				</div>
 			{/if}
 			{#if application.buildPack !== 'docker' && (application.buildPack === 'nextjs' || application.buildPack === 'nuxtjs')}
 				<div class="grid grid-cols-2 items-center pb-8">
@@ -574,7 +570,7 @@
 		<div class="flex space-x-1 py-5 font-bold">
 			<div class="title">{$t('application.application')}</div>
 		</div>
-		<div class="grid grid-flow-row gap-2 px-10">
+		<div class="grid grid-flow-row gap-2 lg:px-10 pr-5">
 			<div class="grid grid-cols-2 items-center">
 				<Setting
 					id="isBot"
@@ -866,7 +862,7 @@
 	<div class="flex space-x-1 pb-5 font-bold">
 		<div class="title">{$t('application.features')}</div>
 	</div>
-	<div class="px-10 pb-10">
+	<div class="lg:px-10 lg:pb-10 pb-6">
 		{#if !application.settings.isPublicRepository}
 			<div class="grid grid-cols-2 items-center">
 				<Setting
@@ -891,7 +887,7 @@
 				/>
 			</div>
 		{/if}
-		<div class="grid grid-cols-2 items-center">
+		<div class="grid grid-cols-2 items-center w-full">
 			<Setting
 				id="debug"
 				isCenter={false}
--- a/apps/ui/src/routes/applications/[id]/logs/_BuildLog.svelte
+++ b/apps/ui/src/routes/applications/[id]/logs/_BuildLog.svelte
@@ -154,18 +154,13 @@
 			{/if}
 		</div>
 		{#if logs.length > 0}
-			<div
-				class="font-mono leading-6 text-left text-md tracking-tighter rounded bg-coolgray-200 py-5 px-6 whitespace-pre-wrap break-words overflow-auto max-h-[80vh] -mt-12 overflow-y-scroll scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200"
-				bind:this={logsEl}
-			>
+			<div class="font-mono w-full rounder bg-coolgray-200 p-5 overflow-x-auto overflox-y-auto max-h-[80vh] rounded-md mb-20 flex flex-col whitespace-nowrap -mt-12 scrollbar-thumb-coollabs scrollbar-track-coolgray-200 scrollbar-w-1">
 				{#each logs as log}
-					<div>{log.line + '\n'}</div>
+					<p>{log.line + '\n'}</p>
 				{/each}
 			</div>
 		{:else}
-			<div
-				class="font-mono leading-6 text-left text-md tracking-tighter rounded bg-coolgray-200 py-5 px-6 whitespace-pre-wrap break-words overflow-auto max-h-[80vh] -mt-12 overflow-y-scroll scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200"
-			>
+		<div class="font-mono w-full rounder bg-coolgray-200 p-5 overflow-x-auto overflox-y-auto max-h-[80vh] rounded-md mb-20 flex flex-col whitespace-nowrap -mt-12 scrollbar-thumb-coollabs scrollbar-track-coolgray-200 scrollbar-w-1">
 			No logs found.
 		</div>
 		{/if}
--- a/apps/ui/src/routes/applications/[id]/logs/index.svelte
+++ b/apps/ui/src/routes/applications/[id]/logs/index.svelte
@@ -177,17 +177,11 @@
 				</button>
 				<Tooltip triggeredBy="#follow">Follow Logs</Tooltip>
 			</div>
-			<div
-				class="font-mono w-full leading-6 text-left text-md tracking-tighter rounded bg-coolgray-200 py-5 px-6 whitespace-pre-wrap break-words overflow-auto max-h-[80vh] -mt-12 overflow-y-scroll scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200"
-				bind:this={logsEl}
-				on:scroll={detect}
-			>
-				<div class="px-2 pr-14">
+			<div class="font-mono w-full rounder bg-coolgray-200 p-5 overflow-x-auto overflox-y-auto max-h-[80vh] rounded-md mb-20 flex flex-col whitespace-nowrap -mt-12 scrollbar-thumb-coollabs scrollbar-track-coolgray-200 scrollbar-w-1">
 				{#each logs as log}
-						{log + '\n'}
+					<p>{log + '\n'}</p>
 				{/each}
 			</div>
 		</div>
-		</div>
 	{/if}
 </div>
--- a/apps/ui/src/routes/applications/[id]/previews.svelte
+++ b/apps/ui/src/routes/applications/[id]/previews.svelte
@@ -89,62 +89,14 @@
 	});
 </script>

-<div class="flex items-center space-x-2 p-5 px-6 font-bold">
-	<div class="-mb-5 flex-col">
-		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
-			Preview Deployments
-		</div>
-		<span class="text-xs">{application?.name}</span>
-	</div>
-	{#if application.gitSource?.htmlUrl && application.repository && application.branch}
-		<a
-			href="{application.gitSource.htmlUrl}/{application.repository}/tree/{application.branch}"
-			target="_blank"
-			class="w-10"
-		>
-			{#if application.gitSource?.type === 'gitlab'}
-				<svg viewBox="0 0 128 128" class="icons">
-					<path
-						fill="#FC6D26"
-						d="M126.615 72.31l-7.034-21.647L105.64 7.76c-.716-2.206-3.84-2.206-4.556 0l-13.94 42.903H40.856L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664 1.385 72.31a4.792 4.792 0 001.74 5.358L64 121.894l60.874-44.227a4.793 4.793 0 001.74-5.357"
-					/><path fill="#E24329" d="M64 121.894l23.144-71.23H40.856L64 121.893z" /><path
-						fill="#FC6D26"
-						d="M64 121.894l-23.144-71.23H8.42L64 121.893z"
-					/><path
-						fill="#FCA326"
-						d="M8.42 50.663L1.384 72.31a4.79 4.79 0 001.74 5.357L64 121.894 8.42 50.664z"
-					/><path
-						fill="#E24329"
-						d="M8.42 50.663h32.436L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664z"
-					/><path fill="#FC6D26" d="M64 121.894l23.144-71.23h32.437L64 121.893z" /><path
-						fill="#FCA326"
-						d="M119.58 50.663l7.035 21.647a4.79 4.79 0 01-1.74 5.357L64 121.894l55.58-71.23z"
-					/><path
-						fill="#E24329"
-						d="M119.58 50.663H87.145l13.94-42.902c.717-2.206 3.84-2.206 4.557 0l13.94 42.903z"
-					/>
-				</svg>
-			{:else if application.gitSource?.type === 'github'}
-				<svg viewBox="0 0 128 128" class="icons">
-					<g fill="#ffffff"
-						><path
-							fill-rule="evenodd"
-							clip-rule="evenodd"
-							d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"
-						/><path
-							d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm2.446 2.729c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zM31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm3.261 3.361c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm4.5 1.951c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm4.943.361c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm4.598-.782c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"
-						/></g
-					>
-				</svg>
-			{/if}
-		</a>
-	{/if}
-</div>
 {#if loading.init}
 	<Loading />
 {:else}
 	<div class="mx-auto max-w-6xl px-6 pt-4">
-		<div class="flex justify-center py-4 text-center">
+		<div class="flex flex-col justify-center py-4 text-center">
+			<h1 class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block font-bold mb-4">
+				Preview Deployments
+			</h1>
 			<SimpleExplainer
 				customClass="w-full"
 				text={applicationSecrets.length === 0
--- a/apps/ui/src/routes/applications/[id]/secrets.svelte
+++ b/apps/ui/src/routes/applications/[id]/secrets.svelte
@@ -67,58 +67,11 @@
 	}
 </script>

-<div class="flex items-center space-x-2 p-5 px-6 font-bold">
-	<div class="-mb-5 flex-col">
-		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
-			{$t('application.secret')}
-		</div>
-		<span class="text-xs">{application.name} </span>
-	</div>
-	{#if application.gitSource?.htmlUrl && application.repository && application.branch}
-		<a
-			href="{application.gitSource.htmlUrl}/{application.repository}/tree/{application.branch}"
-			target="_blank"
-			class="w-10"
-		>
-			{#if application.gitSource?.type === 'gitlab'}
-				<svg viewBox="0 0 128 128" class="icons">
-					<path
-						fill="#FC6D26"
-						d="M126.615 72.31l-7.034-21.647L105.64 7.76c-.716-2.206-3.84-2.206-4.556 0l-13.94 42.903H40.856L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664 1.385 72.31a4.792 4.792 0 001.74 5.358L64 121.894l60.874-44.227a4.793 4.793 0 001.74-5.357"
-					/><path fill="#E24329" d="M64 121.894l23.144-71.23H40.856L64 121.893z" /><path
-						fill="#FC6D26"
-						d="M64 121.894l-23.144-71.23H8.42L64 121.893z"
-					/><path
-						fill="#FCA326"
-						d="M8.42 50.663L1.384 72.31a4.79 4.79 0 001.74 5.357L64 121.894 8.42 50.664z"
-					/><path
-						fill="#E24329"
-						d="M8.42 50.663h32.436L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664z"
-					/><path fill="#FC6D26" d="M64 121.894l23.144-71.23h32.437L64 121.893z" /><path
-						fill="#FCA326"
-						d="M119.58 50.663l7.035 21.647a4.79 4.79 0 01-1.74 5.357L64 121.894l55.58-71.23z"
-					/><path
-						fill="#E24329"
-						d="M119.58 50.663H87.145l13.94-42.902c.717-2.206 3.84-2.206 4.557 0l13.94 42.903z"
-					/>
-				</svg>
-			{:else if application.gitSource?.type === 'github'}
-				<svg viewBox="0 0 128 128" class="icons">
-					<g fill="#ffffff"
-						><path
-							fill-rule="evenodd"
-							clip-rule="evenodd"
-							d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"
-						/><path
-							d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm2.446 2.729c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zM31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm3.261 3.361c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm4.5 1.951c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm4.943.361c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm4.598-.782c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"
-						/></g
-					>
-				</svg>
-			{/if}
-		</a>
-	{/if}
-</div>
 <div class="mx-auto max-w-6xl px-6 pt-4">
+	<h1 class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block font-bold mb-4">
+		Secrets
+	</h1>
+	<div class="overflow-x-auto">
 		<table class="mx-auto border-separate text-left">
 			<thead>
 				<tr class="h-12">
@@ -148,6 +101,7 @@
 				</tr>
 			</tbody>
 		</table>
+	</div>
 	<h2 class="title my-6 font-bold">Paste .env file</h2>
 	<form on:submit|preventDefault={getValues} class="mb-12 w-full">
 		<textarea bind:value={batchSecrets} class="mb-2 min-h-[200px] w-full" />
--- a/apps/ui/src/routes/applications/[id]/storages.svelte
+++ b/apps/ui/src/routes/applications/[id]/storages.svelte
@@ -34,60 +34,12 @@
 	}
 </script>

-<div class="flex items-center space-x-2 p-5 px-6 font-bold">
-	<div class="-mb-5 flex-col">
-		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
-			Persistent Storage
-		</div>
-		<span class="text-xs">{application.name} </span>
-	</div>
-	{#if application.gitSource?.htmlUrl && application.repository && application.branch}
-		<a
-			href="{application.gitSource.htmlUrl}/{application.repository}/tree/{application.branch}"
-			target="_blank"
-			class="w-10"
-		>
-			{#if application.gitSource?.type === 'gitlab'}
-				<svg viewBox="0 0 128 128" class="icons">
-					<path
-						fill="#FC6D26"
-						d="M126.615 72.31l-7.034-21.647L105.64 7.76c-.716-2.206-3.84-2.206-4.556 0l-13.94 42.903H40.856L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664 1.385 72.31a4.792 4.792 0 001.74 5.358L64 121.894l60.874-44.227a4.793 4.793 0 001.74-5.357"
-					/><path fill="#E24329" d="M64 121.894l23.144-71.23H40.856L64 121.893z" /><path
-						fill="#FC6D26"
-						d="M64 121.894l-23.144-71.23H8.42L64 121.893z"
-					/><path
-						fill="#FCA326"
-						d="M8.42 50.663L1.384 72.31a4.79 4.79 0 001.74 5.357L64 121.894 8.42 50.664z"
-					/><path
-						fill="#E24329"
-						d="M8.42 50.663h32.436L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664z"
-					/><path fill="#FC6D26" d="M64 121.894l23.144-71.23h32.437L64 121.893z" /><path
-						fill="#FCA326"
-						d="M119.58 50.663l7.035 21.647a4.79 4.79 0 01-1.74 5.357L64 121.894l55.58-71.23z"
-					/><path
-						fill="#E24329"
-						d="M119.58 50.663H87.145l13.94-42.902c.717-2.206 3.84-2.206 4.557 0l13.94 42.903z"
-					/>
-				</svg>
-			{:else if application.gitSource?.type === 'github'}
-				<svg viewBox="0 0 128 128" class="icons">
-					<g fill="#ffffff"
-						><path
-							fill-rule="evenodd"
-							clip-rule="evenodd"
-							d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"
-						/><path
-							d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm2.446 2.729c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zM31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm3.261 3.361c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm4.5 1.951c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm4.943.361c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm4.598-.782c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"
-						/></g
-					>
-				</svg>
-			{/if}
-		</a>
-	{/if}
-</div>
-
 <div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
-	<div class="flex justify-center py-4 text-center">
+	
+	<div class="flex flex-col justify-center py-4 text-center">
+		<h1 class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block font-bold mb-4">
+			Persistent Storage
+		</h1>
 		<SimpleExplainer customClass="w-full" text={$t('application.storage.persistent_storage_explainer')} />
 	</div>
 	<table class="mx-auto border-separate text-left">
--- a/apps/ui/src/routes/applications/_index.svelte
+++ b/apps/ui/src/routes/applications/_index.svelte
@@ -44,8 +44,8 @@
 	}
 </script>

-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl">{$t('index.applications')}</div>
+<nav class="header">
+	<h1 class="mr-4 text-2xl font-bold">{$t('index.applications')}</h1>
 	{#if $appSession.isAdmin}
 		<button on:click={newApplication} class="btn btn-square btn-sm bg-applications">
 			<svg
@@ -63,8 +63,9 @@
 			>
 		</button>
 	{/if}
-</div>
-<div class="flex-col justify-center mt-10 pb-12 sm:pb-16">
+</nav>
+<br />
+<div class="flex flex-col justify-center mt-10 pb-12 lg:pt-16 sm:pb-16">
 	{#if !applications || ownApplications.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">{$t('application.no_applications_found')}</div>
--- a/apps/ui/src/routes/databases/[id]/_Databases/_CouchDb.svelte
+++ b/apps/ui/src/routes/databases/[id]/_Databases/_CouchDb.svelte
@@ -5,9 +5,9 @@
 </script>

 <div class="flex space-x-1 py-5 font-bold">
-	<div class="title">CouchDB</div>
+	<h1 class="title">CouchDB</h1>
 </div>
-<div class="space-y-2 px-10">
+<div class="space-y-2 lg:px-10">
 	<div class="grid grid-cols-2 items-center">
 		<label for="defaultDatabase" class="text-base font-bold text-stone-100"
 			>{$t('database.default_database')}</label
--- a/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte
+++ b/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte
@@ -107,33 +107,30 @@
 	}
 </script>

-<div class="mx-auto max-w-4xl px-6">
+<div class="mx-auto max-w-4xl p-4">
 	<form on:submit|preventDefault={handleSubmit} class="py-4">
-		<div class="flex space-x-1 pb-5">
-			<div class="title">{$t('general')}</div>
+		<div class="flex flex-col lg:flex-row justify-between lg:space-x-1 space-y-3 pb-5 lg:items-center items-start">
+			<h1 class="title">{$t('general')}</h1>
 			{#if $appSession.isAdmin}
 				<button
 					type="submit"
-					class="btn btn-sm"
+					class="btn btn-sm w-full lg:w-auto"
 					class:loading
 					class:bg-databases={!loading}
 					disabled={loading}>{$t('forms.save')}</button
 				>
 			{/if}
 		</div>
-
-		<div class="grid grid-flow-row gap-2 px-10">
-			<div class="grid grid-cols-2 items-center">
+		<div class="grid gap-4 grid-cols-2 auto-rows-max lg:px-10">
 			<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
 			<input
+				class="w-full"
 				readonly={!$appSession.isAdmin}
 				name="name"
 				id="name"
 				bind:value={database.name}
 				required
 			/>
-			</div>
-			<div class="grid grid-cols-2 items-center">
 			<label for="destination" class="text-base font-bold text-stone-100"
 				>{$t('application.destination')}</label
 			>
@@ -144,13 +141,10 @@
 						id="destination"
 						disabled
 						readonly
-							class="bg-transparent "
+						class="bg-transparent w-full"
 					/>
 				</div>
 			{/if}
-			</div>
-
-			<div class="grid grid-cols-2 items-center">
 			<label for="version" class="text-base font-bold text-stone-100">Version / Tag</label>
 			<a
 				href={$appSession.isAdmin && !$status.database.isRunning
@@ -159,17 +153,13 @@
 				class="no-underline"
 			>
 				<input
+					class="w-full"
 					value={database.version}
 					readonly
 					disabled={$status.database.isRunning || $status.database.initialLoading}
 					class:cursor-pointer={!$status.database.isRunning}
 				/></a
 			>
-			</div>
-		</div>
-
-		<div class="grid grid-flow-row gap-2 px-10 pt-2">
-			<div class="grid grid-cols-2 items-center">
 			<label for="host" class="text-base font-bold text-stone-100">{$t('forms.host')}</label>
 			<CopyPasswordField
 				placeholder={$t('forms.generated_automatically_after_start')}
@@ -180,10 +170,7 @@
 				name="host"
 				value={database.id}
 			/>
-			</div>
-			<div class="grid grid-cols-2 items-center">
-				<label for="publicPort" class="text-base font-bold text-stone-100">{$t('forms.port')}</label
-				>
+			<label for="publicPort" class="text-base font-bold text-stone-100">{$t('forms.port')}</label>
 			<CopyPasswordField
 				placeholder={$t('database.generated_automatically_after_set_to_public')}
 				id="publicPort"
@@ -193,8 +180,6 @@
 				value={publicLoading ? 'Loading...' : $status.database.isPublic ? database.publicPort : privatePort}
 			/>
 		</div>
-		</div>
-		<div class="grid grid-flow-row gap-2">
 		{#if database.type === 'mysql'}
 			<MySql bind:database />
 		{:else if database.type === 'postgresql'}
@@ -210,7 +195,7 @@
 		{:else if database.type === 'edgedb'}
 			<EdgeDB {database} />
 		{/if}
-			<div class="grid grid-cols-2 items-center px-10 pb-8">
+		<div class="flex flex-col space-y-3 mt-5">
 			<div>
 				<label for="url" class="text-base font-bold text-stone-100"
 					>{$t('database.connection_string')}
@@ -221,6 +206,7 @@
 					{/if}</label
 				>
 			</div>
+			<div class="lg:px-10">
 				<CopyPasswordField
 					textarea={true}
 					placeholder={$t('forms.generated_automatically_after_start')}
@@ -235,10 +221,9 @@
 		</div>
 	</form>
 	<div class="flex space-x-1 pb-5 font-bold">
-		<div class="title">{$t('application.features')}</div>
+		<h1 class="title">{$t('application.features')}</h1>
 	</div>
-	<div class="px-10 pb-10">
-		<div class="grid grid-cols-2 items-center">
+	<div class="grid gap-4 grid-cols-2 auto-rows-max lg:px-10">
 		<Setting
 			id="isPublic"
 			loading={publicLoading}
@@ -248,9 +233,7 @@
 			description={$t('database.warning_database_public')}
 			disabled={!$status.database.isRunning}
 		/>
-		</div>
 		{#if database.type === 'redis'}
-			<div class="grid grid-cols-2 items-center">
 			<Setting
 				id="appendOnly"
 				loading={publicLoading}
@@ -259,7 +242,6 @@
 				title={$t('database.change_append_only_mode')}
 				description={$t('database.warning_append_only')}
 			/>
-			</div>
 		{/if}
 	</div>
 </div>
--- a/apps/ui/src/routes/databases/[id]/_Databases/_MariaDB.svelte
+++ b/apps/ui/src/routes/databases/[id]/_Databases/_MariaDB.svelte
@@ -7,9 +7,9 @@
 </script>

 <div class="flex space-x-1 py-5 font-bold">
-	<div class="title">MariaDB</div>
+	<h1 class="title">MariaDB</h1>
 </div>
-<div class="space-y-2 px-10">
+<div class="space-y-2 lg:px-10">
 	<div class="grid grid-cols-2 items-center">
 		<label for="defaultDatabase" class="text-base font-bold text-stone-100"
 			>{$t('database.default_database')}</label
@@ -63,7 +63,8 @@
 	</div>
 	<div class="grid grid-cols-2 items-center">
 		<label for="rootUserPassword" class="text-base font-bold text-stone-100"
-			>{$t('forms.roots_password')} <Explainer explanation="Could be changed while the database is running." /></label
+			>{$t('forms.roots_password')}
+			<Explainer explanation="Could be changed while the database is running." /></label
 		>
 		<CopyPasswordField
 			disabled={!$status.database.isRunning}
--- a/apps/ui/src/routes/databases/[id]/_Databases/_MongoDB.svelte
+++ b/apps/ui/src/routes/databases/[id]/_Databases/_MongoDB.svelte
@@ -7,9 +7,9 @@
 </script>

 <div class="flex space-x-1 py-5 font-bold">
-	<div class="title">MongoDB</div>
+	<h1 class="title">MongoDB</h1>
 </div>
-<div class="space-y-2 px-10">
+<div class="space-y-2 lg:px-10">
 	<div class="grid grid-cols-2 items-center">
 		<label for="rootUser" class="text-base font-bold text-stone-100">{$t('forms.root_user')}</label>
 		<CopyPasswordField
--- a/apps/ui/src/routes/databases/[id]/_Databases/_MySQL.svelte
+++ b/apps/ui/src/routes/databases/[id]/_Databases/_MySQL.svelte
@@ -7,9 +7,9 @@
 </script>

 <div class="flex space-x-1 py-5 font-bold">
-	<div class="title">MySQL</div>
+	<h1 class="title">MySQL</h1>
 </div>
-<div class="space-y-2 px-10">
+<div class="space-y-2 lg:px-10">
 	<div class="grid grid-cols-2 items-center">
 		<label for="defaultDatabase" class="text-base font-bold text-stone-100"
 			>{$t('database.default_database')}</label
--- a/apps/ui/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte
+++ b/apps/ui/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte
@@ -7,9 +7,9 @@
 </script>

 <div class="flex space-x-1 py-5 font-bold">
-	<div class="title">PostgreSQL</div>
+	<h1 class="title">PostgreSQL</h1>
 </div>
-<div class="space-y-2 px-10">
+<div class="space-y-2 lg:px-10">
 	<div class="grid grid-cols-2 items-center">
 		<label for="defaultDatabase" class="text-base font-bold text-stone-100"
 			>{$t('database.default_database')}</label
--- a/apps/ui/src/routes/databases/[id]/_Databases/_Redis.svelte
+++ b/apps/ui/src/routes/databases/[id]/_Databases/_Redis.svelte
@@ -7,9 +7,9 @@
 </script>

 <div class="flex space-x-1 py-5 font-bold">
-	<div class="title">Redis</div>
+	<h1 class="title">Redis</h1>
 </div>
-<div class="space-y-2 px-10">
+<div class="space-y-2 lg:px-10">
 	<div class="grid grid-cols-2 items-center">
 		<label for="dbUserPassword" class="text-base font-bold text-stone-100"
 			>{$t('forms.password')}
--- a/apps/ui/src/routes/databases/[id]/__layout.svelte
+++ b/apps/ui/src/routes/databases/[id]/__layout.svelte
@@ -62,6 +62,7 @@
 	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
 	import { onDestroy, onMount } from 'svelte';
 	import Tooltip from '$lib/components/Tooltip.svelte';
+	import DatabaseLinks from './_DatabaseLinks.svelte';
 	const { id } = $page.params;

 	$status.database.isPublic = database.settings.isPublic || false;
@@ -149,7 +150,19 @@
 </script>

 {#if id !== 'new'}
-	<nav class="nav-side">
+	<nav class="header justify-center lg:justify-between">
+		<div class="hidden items-center space-x-2 p-5 px-6 font-bold lg:flex">
+			<div class="flex flex-col">
+				<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
+					Configuration
+				</div>
+				<span class="text-xs">{database.name}</span>
+			</div>
+			<DatabaseLinks {database} />
+		</div>
+		<div
+			class="flex flex-row flex-wrap space-x-4 space-y-3 justify-center lg:justify-start py-2 lg:py-0"
+		>
 			{#if database.type && database.destinationDockerId && database.version}
 				{#if $status.database.isExited}
 					<a
@@ -180,7 +193,7 @@
 				{/if}
 				{#if $status.database.initialLoading}
 					<button
-					class="icons flex animate-spin items-center space-x-2 bg-transparent text-sm duration-500 ease-in-out hover:bg-transparent"
+						class="icons flex animate-spin items-center space-x-2 bg-transparent text-sm duration-500 ease-in-out"
 					>
 						<svg
 							xmlns="http://www.w3.org/2000/svg"
@@ -207,7 +220,7 @@
 						on:click={stopDatabase}
 						type="submit"
 						disabled={!$appSession.isAdmin}
-					class="icons bg-transparent text-sm flex items-center space-x-2 text-red-500"
+						class="icons bg-transparent text-sm flex items-center space-x-2 text-red-500 mt-3"
 					>
 						<svg
 							xmlns="http://www.w3.org/2000/svg"
@@ -248,6 +261,7 @@
 					</button>
 					<Tooltip triggeredBy="#start">{'Start'}</Tooltip>
 				{/if}
+			{/if}
 			<div class="border border-stone-700 h-8" />
 			<a
 				id="configuration"
@@ -282,34 +296,6 @@
 				></a
 			>
 			<Tooltip triggeredBy="#configuration">{'Configuration'}</Tooltip>
-			<a
-				href="/databases/{id}/secrets"
-				sveltekit:prefetch
-				class="hover:text-pink-500 rounded"
-				class:text-pink-500={$page.url.pathname === `/databases/${id}/secrets`}
-				class:bg-coolgray-500={$page.url.pathname === `/databases/${id}/secrets`}
-			>
-				<button id="secrets" disabled={$isDeploymentEnabled} class="icons bg-transparent text-sm ">
-					<svg
-						xmlns="http://www.w3.org/2000/svg"
-						class="w-6 h-6"
-						viewBox="0 0 24 24"
-						stroke-width="1.5"
-						stroke="currentColor"
-						fill="none"
-						stroke-linecap="round"
-						stroke-linejoin="round"
-					>
-						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-						<path
-							d="M12 3a12 12 0 0 0 8.5 3a12 12 0 0 1 -8.5 15a12 12 0 0 1 -8.5 -15a12 12 0 0 0 8.5 -3"
-						/>
-						<circle cx="12" cy="11" r="1" />
-						<line x1="12" y1="12" x2="12" y2="14.5" />
-					</svg></button
-				></a
-			>
-			<Tooltip triggeredBy="#secrets">Secrets</Tooltip>
 			<div class="border border-stone-700 h-8" />
 			<a
 				id="databaselogs"
@@ -340,8 +326,6 @@
 				></a
 			>
 			<Tooltip triggeredBy="#databaselogs">{'Logs'}</Tooltip>
-		{/if}
-
 			{#if forceDelete}
 				<button
 					on:click={() => deleteDatabase(true)}
@@ -363,6 +347,7 @@
 			{/if}

 			<Tooltip triggeredBy="#delete">{'Delete'}</Tooltip>
+		</div>
 	</nav>
 {/if}
 <slot />
--- a/apps/ui/src/routes/databases/[id]/index.svelte
+++ b/apps/ui/src/routes/databases/[id]/index.svelte
@@ -48,8 +48,8 @@
 	});
 </script>

-<div class="flex h-20 items-center space-x-2 p-5 px-6 font-bold">
-	<div class="-mb-5 flex-col">
+<div class="flex items-center space-x-2 p-5 font-bold lg:hidden">
+	<div class="flex-col">
 		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
 			Configuration
 		</div>
@@ -58,7 +58,7 @@
 	<DatabaseLinks {database} />
 </div>

-<div class="mx-auto max-w-4xl px-6 py-4">
+<div class="mx-auto max-w-4xl p-5">
 	<div class="text-2xl font-bold">Database Usage</div>
 	<div class="text-center">
 		<div class="stat w-64">
--- a/apps/ui/src/routes/databases/[id]/logs/index.svelte
+++ b/apps/ui/src/routes/databases/[id]/logs/index.svelte
@@ -134,7 +134,12 @@
 				</button>
 				<Tooltip triggeredBy="#follow">Follow Logs</Tooltip>
 			</div>
-			<div
+			<div class="font-mono w-full rounder bg-coolgray-200 p-5 overflow-x-auto overflox-y-auto max-h-[80vh] rounded-md mb-20 flex flex-col whitespace-nowrap -mt-12 scrollbar-thumb-coollabs scrollbar-track-coolgray-200 scrollbar-w-1">
+				{#each logs as log}
+					<p>{log + '\n'}</p>
+				{/each}
+			</div>
+			<!-- <div
 				class="font-mono w-full leading-6 text-left text-md tracking-tighter rounded bg-coolgray-200 py-5 px-6 whitespace-pre-wrap break-words overflow-auto max-h-[80vh] -mt-12 overflow-y-scroll scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200"
 				bind:this={logsEl}
 				on:scroll={detect}
@@ -144,7 +149,7 @@
 						{log + '\n'}
 					{/each}
 				</div>
-			</div>
+			</div> -->
 		</div>
 	{/if}
 </div>
--- a/apps/ui/src/routes/databases/_index.svelte
+++ b/apps/ui/src/routes/databases/_index.svelte
@@ -42,8 +42,8 @@
 	});
 </script>

-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">{$t('index.databases')}</div>
+<nav class="header">
+	<h1 class="mr-4 text-2xl font-bold">{$t('index.databases')}</h1>
 	{#if $appSession.isAdmin}
 		<button on:click={newDatabase} class="btn btn-square btn-sm bg-databases">
 			<svg
@@ -61,9 +61,9 @@
 			>
 		</button>
 	{/if}
-</div>
-
-<div class="flex-col justify-center mt-10 pb-12 sm:pb-16">
+</nav>
+<br />
+<div class="flex-col justify-center mt-10 pb-12 sm:pb-16 lg:pt-16">
 	{#if !databases || ownDatabases.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">{$t('database.no_databases_found')}</div>
--- a/apps/ui/src/routes/destinations/[id]/_LocalDocker.svelte
+++ b/apps/ui/src/routes/destinations/[id]/_LocalDocker.svelte
@@ -141,40 +141,37 @@
 	}
 </script>

-<form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4">
-	<div class="flex md:flex-row space-y-2 md:space-y-0 space-x-0 md:space-x-2 flex-col pb-5">
-		<div class="title">{$t('forms.configuration')}</div>
-		{#if $appSession.isAdmin}
+<form on:submit|preventDefault={handleSubmit} class="py-4">
+	<div class="grid gap-4 grid-cols-2 grid-rows-1">
 		<button
 			type="submit"
-				class="btn btn-sm"
+			class="btn btn-sm w-full"
 			class:bg-destinations={!loading.save}
 			class:loading={loading.save}
 			disabled={loading.save}
 			>{$t('forms.save')}
 		</button>
 		<button
-				class="btn btn-sm"
+			class="btn btn-sm w-full"
 			class:loading={loading.restart}
 			class:bg-error={!loading.restart}
 			disabled={loading.restart}
 			on:click|preventDefault={forceRestartProxy}>{$t('destination.force_restart_proxy')}</button
 		>
-		{/if}
 	</div>
-	<div class="grid lg:grid-cols-2 items-center px-10 ">
-		<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
+	<div class="grid gap-4 grid-cols-2 auto-rows-max mt-10 items-center">
+		<label for="name" class="text-base font-bold text-stone-100 w-full">{$t('forms.name')}</label>
 		<input
+			class="w-full"
 			name="name"
 			placeholder={$t('forms.name')}
 			disabled={!$appSession.isAdmin}
 			readonly={!$appSession.isAdmin}
 			bind:value={destination.name}
 		/>
-	</div>
-
-	<div class="grid lg:grid-cols-2 items-center px-10">
-		<label for="engine" class="text-base font-bold text-stone-100">{$t('forms.engine')}</label>
+		<label for="engine" class="text-base font-bold text-stone-100 w-full"
+			>{$t('forms.engine')}</label
+		>
 		<CopyPasswordField
 			id="engine"
 			readonly
@@ -183,8 +180,6 @@
 			placeholder="{$t('forms.eg')}: /var/run/docker.sock"
 			value={destination.engine}
 		/>
-	</div>
-	<div class="grid lg:grid-cols-2 items-center px-10">
 		<label for="network" class="text-base font-bold text-stone-100">{$t('forms.network')}</label>
 		<CopyPasswordField
 			id="network"
@@ -194,9 +189,7 @@
 			placeholder="{$t('forms.default')}: coolify"
 			value={destination.network}
 		/>
-	</div>
 		{#if $appSession.teamId === '0'}
-		<div class="grid lg:grid-cols-2 items-center px-10">
 			<Setting
 				id="changeProxySetting"
 				loading={loading.proxy}
@@ -210,6 +203,6 @@
 						: ''
 				}`}
 			/>
-		</div>
 		{/if}
+	</div>
 </form>
--- a/apps/ui/src/routes/destinations/[id]/_NewLocalDocker.svelte
+++ b/apps/ui/src/routes/destinations/[id]/_NewLocalDocker.svelte
@@ -31,9 +31,9 @@

 <div class="flex justify-center px-6 pb-8">
 	<form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4">
-		<div class="flex items-center space-x-2 pb-5">
+		<div class="flex items-start lg:items-center space-x-0 lg:space-x-4 pb-5 flex-col space-y-4 lg:space-y-0">
 			<div class="title font-bold">{$t('forms.configuration')}</div>
-			<button type="submit" class="btn btn-sm bg-destinations" class:loading disabled={loading}
+			<button type="submit" class="btn btn-sm bg-destinations w-full lg:w-fit" class:loading disabled={loading}
 				>{loading
 					? payload.isCoolifyProxyUsed
 						? $t('destination.new.saving_and_configuring_proxy')
@@ -41,12 +41,12 @@
 					: $t('forms.save')}</button
 			>
 		</div>
-		<div class="mt-2 grid grid-cols-2 items-center px-10">
+		<div class="mt-2 grid grid-cols-2 items-center lg:pl-10">
 			<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
 			<input required name="name" placeholder={$t('forms.name')} bind:value={payload.name} />
 		</div>

-		<div class="grid grid-cols-2 items-center px-10">
+		<div class="grid grid-cols-2 items-center lg:pl-10">
 			<label for="engine" class="text-base font-bold text-stone-100">{$t('forms.engine')}</label>
 			<input
 				required
@@ -55,7 +55,7 @@
 				bind:value={payload.engine}
 			/>
 		</div>
-		<div class="grid grid-cols-2 items-center px-10">
+		<div class="grid grid-cols-2 items-center lg:pl-10">
 			<label for="network" class="text-base font-bold text-stone-100">{$t('forms.network')}</label>
 			<input
 				required
@@ -65,7 +65,7 @@
 			/>
 		</div>
 		{#if $appSession.teamId === '0'}
-			<div class="grid grid-cols-2 items-center px-10">
+			<div class="grid grid-cols-2 items-center lg:pl-10">
 				<Setting
 					id="changeProxySetting"
 					bind:setting={payload.isCoolifyProxyUsed}
--- a/apps/ui/src/routes/destinations/[id]/_NewRemoteDocker.svelte
+++ b/apps/ui/src/routes/destinations/[id]/_NewRemoteDocker.svelte
@@ -38,9 +38,9 @@
 </div>
 <div class="flex justify-center px-6 pb-8">
 	<form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4">
-		<div class="flex items-center space-x-2 pb-5">
+		<div class="flex items-start lg:items-center space-x-0 lg:space-x-4 pb-5 flex-col lg:flex-row space-y-4 lg:space-y-0">
 			<div class="title font-bold">{$t('forms.configuration')}</div>
-			<button type="submit" class="btn btn-sm bg-destinations" class:loading disabled={loading}
+			<button type="submit" class="btn btn-sm bg-destinations w-full lg:w-fit" class:loading disabled={loading}
 				>{loading
 					? payload.isCoolifyProxyUsed
 						? $t('destination.new.saving_and_configuring_proxy')
@@ -48,12 +48,12 @@
 					: $t('forms.save')}</button
 			>
 		</div>
-		<div class="mt-2 grid grid-cols-2 items-center px-10">
+		<div class="mt-2 grid grid-cols-2 items-center lg:pl-10">
 			<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
 			<input required name="name" placeholder={$t('forms.name')} bind:value={payload.name} />
 		</div>

-		<div class="grid grid-cols-2 items-center px-10">
+		<div class="grid grid-cols-2 items-center lg:pl-10">
 			<label for="remoteIpAddress" class="text-base font-bold text-stone-100"
 				>{$t('forms.ip_address')}</label
 			>
@@ -65,7 +65,7 @@
 			/>
 		</div>

-		<div class="grid grid-cols-2 items-center px-10">
+		<div class="grid grid-cols-2 items-center lg:pl-10">
 			<label for="remoteUser" class="text-base font-bold text-stone-100">{$t('forms.user')}</label>
 			<input
 				required
@@ -75,7 +75,7 @@
 			/>
 		</div>

-		<div class="grid grid-cols-2 items-center px-10">
+		<div class="grid grid-cols-2 items-center lg:pl-10">
 			<label for="remotePort" class="text-base font-bold text-stone-100">{$t('forms.port')}</label>
 			<input
 				required
@@ -84,7 +84,7 @@
 				bind:value={payload.remotePort}
 			/>
 		</div>
-		<div class="grid grid-cols-2 items-center px-10">
+		<div class="grid grid-cols-2 items-center lg:pl-10">
 			<label for="network" class="text-base font-bold text-stone-100">{$t('forms.network')}</label>
 			<input
 				required
@@ -93,7 +93,7 @@
 				bind:value={payload.network}
 			/>
 		</div>
-		<div class="grid grid-cols-2 items-center px-10">
+		<div class="grid grid-cols-2 items-center lg:pl-10">
 			<Setting
 				id="isCoolifyProxyUsed"
 				bind:setting={payload.isCoolifyProxyUsed}
--- a/apps/ui/src/routes/destinations/_index.svelte
+++ b/apps/ui/src/routes/destinations/_index.svelte
@@ -36,8 +36,8 @@
 	});
 </script>

-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">{$t('index.destinations')}</div>
+<nav class="header">
+	<h1 class="mr-4 text-2xl font-bold">{$t('index.destinations')}</h1>
 	{#if $appSession.isAdmin}
 		<a href="/destinations/new" class="btn btn-square btn-sm bg-destinations">
 			<svg
@@ -55,8 +55,9 @@
 			>
 		</a>
 	{/if}
-</div>
-<div class="flex-col justify-center mt-10 pb-12 sm:pb-16">
+</nav>
+<br />
+<div class="flex-col justify-center mt-10 pb-12 sm:pb-16 lg:pt-16">
 	{#if !destinations || ownDestinations.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">{$t('destination.no_destination_found')}</div>
--- a/apps/ui/src/routes/iam/index.svelte
+++ b/apps/ui/src/routes/iam/index.svelte
@@ -106,8 +106,8 @@
 	}
 </script>

-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Identity and Access Management</div>
+<nav class="header">
+	<h1 class="mr-4 text-2xl tracking-tight font-bold">Identity and Access Management</h1>
 	<button on:click={newTeam} class="btn btn-square btn-sm bg-iam">
 		<svg
 			class="h-6 w-6"
@@ -123,7 +123,8 @@
 			/></svg
 		>
 	</button>
-</div>
+</nav>
+<br />

 {#if invitations.length > 0}
 	<div class="mx-auto max-w-4xl px-6 py-4">
--- a/apps/ui/src/routes/index.svelte
+++ b/apps/ui/src/routes/index.svelte
@@ -276,14 +276,13 @@
   
 </script>

-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">{$t('index.dashboard')}</div>
+<nav class="header p-7">
+	<h1 class="mr-4 text-2xl font-bold">{$t('index.dashboard')}</h1>
 	{#if $appSession.isAdmin && (applications.length !== 0 || destinations.length !== 0 || databases.length !== 0 || services.length !== 0 || gitSources.length !== 0 || destinations.length !== 0)}
 		<NewResource />
 	{/if}
-    
-</div>
-<div class="container lg:mx-auto lg:p-0 px-8 p-5">
+</nav>
+<div class="container lg:mx-auto lg:p-0 px-8 pt-5">
 	<!-- {#if $appSession.teamId === '0'}
 		<Usage />
 	{/if} -->
@@ -319,7 +318,7 @@
 					on:input={() => doSearch()}
 				/>
 			</div>
-			<label for="search" class="label w-full">
+			<label for="search" class="label w-full mt-3">
 				<span class="label-text text-xs flex flex-wrap gap-2 items-center">
 					<button
 						class:bg-coollabs={$search === '!notmine'}
--- a/apps/ui/src/routes/servers/index.svelte
+++ b/apps/ui/src/routes/servers/index.svelte
@@ -29,10 +29,10 @@
 	}
 </script>

-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Servers</div>
+<div class="header">
+	<h1 class="text-2xl font-bold">Servers</h1>
 </div>
-<div class="container lg:mx-auto lg:p-0 px-8 p-5">
+<div class="container lg:mx-auto lg:p-0 px-8 p-5 lg:pt-20">
 	{#if servers.length > 0}
 		<div class="grid grid-col gap-8 auto-cols-max grid-cols-1  p-4">
 			{#each servers as server}
--- a/apps/ui/src/routes/services/[id]/_Secret.svelte
+++ b/apps/ui/src/routes/services/[id]/_Secret.svelte
@@ -50,6 +50,8 @@

 <td>
 	<input
+		
+	style="min-width: 350px !important;"
 		id={isNewSecret ? 'secretName' : 'secretNameNew'}
 		bind:value={name}
 		required
@@ -67,6 +69,7 @@
 		bind:value
 		required
 		placeholder="J$#@UIO%HO#$U%H"
+		inputStyle="min-width: 350px; !important"
 	/>
 </td>

--- a/apps/ui/src/routes/services/[id]/_Services/_Appwrite.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_Appwrite.svelte
@@ -10,8 +10,8 @@
 	<div class="title">Appwrite</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="opensslKeyV1">Encryption Key</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="opensslKeyV1">Encryption Key</label>
 	<CopyPasswordField
 		name="opensslKeyV1"
 		id="opensslKeyV1"
@@ -21,8 +21,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="executorSecret">Executor Secret</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="executorSecret">Executor Secret</label>
 	<CopyPasswordField
 		name="executorSecret"
 		id="executorSecret"
@@ -37,7 +37,7 @@
 	<div class="title">Redis</div>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="redisPassword">Password</label>
+	<label class="text-base font-bold text-stone-100" for="redisPassword">Password</label>
 	<CopyPasswordField
 		name="redisPassword"
 		id="redisPassword"
@@ -53,7 +53,7 @@
 </div>

 <!-- <div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbHost">MariaDB Host</label>
+	<label class="text-base font-bold text-stone-100" for="mariadbHost">MariaDB Host</label>
 	<CopyPasswordField
 		name="mariadbHost"
 		id="mariadbHost"
@@ -63,7 +63,7 @@
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbPort">MariaDB Port</label>
+	<label class="text-base font-bold text-stone-100" for="mariadbPort">MariaDB Port</label>
 	<CopyPasswordField
 		name="mariadbPort"
 		id="mariadbPort"
@@ -73,7 +73,7 @@
 	/>
 </div> -->
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbUser">{$t('forms.username')}</label>
+	<label class="text-base font-bold text-stone-100" for="mariadbUser">{$t('forms.username')}</label>
 	<CopyPasswordField
 		name="mariadbUser"
 		id="mariadbUser"
@@ -83,7 +83,7 @@
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbPassword">{$t('forms.password')}</label>
+	<label class="text-base font-bold text-stone-100" for="mariadbPassword">{$t('forms.password')}</label>
 	<CopyPasswordField
 		id="mariadbPassword"
 		isPasswordField
@@ -94,7 +94,7 @@
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbRootUser">Root User</label>
+	<label class="text-base font-bold text-stone-100" for="mariadbRootUser">Root User</label>
 	<CopyPasswordField
 		name="mariadbRootUser"
 		id="mariadbRootUser"
@@ -104,7 +104,7 @@
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbRootUserPassword">Root Password</label>
+	<label class="text-base font-bold text-stone-100" for="mariadbRootUserPassword">Root Password</label>
 	<CopyPasswordField
 		id="mariadbRootUserPassword"
 		isPasswordField
@@ -115,7 +115,7 @@
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbDatabase">{$t('index.database')}</label>
+	<label class="text-base font-bold text-stone-100" for="mariadbDatabase">{$t('index.database')}</label>
 	<CopyPasswordField
 		name="mariadbDatabase"
 		id="mariadbDatabase"
--- a/apps/ui/src/routes/services/[id]/_Services/_Fider.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_Fider.svelte
@@ -21,8 +21,8 @@
 	<div class="title">Fider</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="jwtSecret">JWT Secret</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="jwtSecret">JWT Secret</label>
 	<CopyPasswordField
 		name="jwtSecret"
 		id="jwtSecret"
@@ -33,9 +33,10 @@
 	/>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="emailNoreply">Noreply Email</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="emailNoreply">Noreply Email</label>
 	<input 
+		class="w-full"
 		name="emailNoreply"
 		id="emailNoreply"
 		type="email"
@@ -49,8 +50,8 @@
 <div class="flex space-x-1 py-5 font-bold">
 	<div class="title">Email</div>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="emailMailgunApiKey">Mailgun API Key</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="emailMailgunApiKey">Mailgun API Key</label>
 	<CopyPasswordField
 		name="emailMailgunApiKey"
 		id="emailMailgunApiKey"
@@ -62,9 +63,10 @@
 	/>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="emailMailgunDomain">Mailgun Domain</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="emailMailgunDomain">Mailgun Domain</label>
 	<input 
+		class="w-full"
 		name="emailMailgunDomain"
 		id="emailMailgunDomain"
 		readonly={readOnly}
@@ -73,8 +75,8 @@
 		placeholder="{$t('forms.eg')}: yourdomain.com"
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="emailMailgunRegion">Mailgun Region</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="emailMailgunRegion">Mailgun Region</label>
 	<div class="custom-select-wrapper">
 		<Select
 			id="baseBuildImages"
@@ -87,12 +89,13 @@
 	</div>
 </div>

-<div class="flex space-x-1 py-5 px-10 font-bold">
+<div class="flex space-x-1 py-5 lg:px-10 font-bold">
 	<div class="text-lg">Or</div>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="emailSmtpHost">SMTP Host</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="emailSmtpHost">SMTP Host</label>
 	<input 
+		class="w-full"
 		name="emailSmtpHost"
 		id="emailSmtpHost"
 		readonly={readOnly}
@@ -101,9 +104,10 @@
 		placeholder="{$t('forms.eg')}: smtp.yourdomain.com"
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="emailSmtpPort">SMTP Port</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="emailSmtpPort">SMTP Port</label>
 	<input 
+		class="w-full"
 		name="emailSmtpPort"
 		id="emailSmtpPort"
 		readonly={readOnly}
@@ -112,9 +116,10 @@
 		placeholder="{$t('forms.eg')}: 587"
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="emailSmtpUser">SMTP User</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="emailSmtpUser">SMTP User</label>
 	<input 
+		class="w-full"
 		name="emailSmtpUser"
 		id="emailSmtpUser"
 		readonly={readOnly}
@@ -123,8 +128,8 @@
 		placeholder="{$t('forms.eg')}: user@yourdomain.com"
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="emailSmtpPassword">SMTP Password</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="emailSmtpPassword">SMTP Password</label>
 	<CopyPasswordField
 		name="emailSmtpPassword"
 		id="emailSmtpPassword"
@@ -135,9 +140,10 @@
 		placeholder="{$t('forms.eg')}: s0m3p4ssw0rd"
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="emailSmtpEnableStartTls">SMTP Start TLS</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="emailSmtpEnableStartTls">SMTP Start TLS</label>
 	<input 
+		class="w-full"
 		name="emailSmtpEnableStartTls"
 		id="emailSmtpEnableStartTls"
 		readonly={readOnly}
@@ -150,8 +156,8 @@
 	<div class="title">PostgreSQL</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlUser">{$t('forms.username')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlUser">{$t('forms.username')}</label>
 	<CopyPasswordField
 		name="postgresqlUser"
 		id="postgresqlUser"
@@ -160,8 +166,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlPassword">{$t('forms.password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlPassword">{$t('forms.password')}</label>
 	<CopyPasswordField
 		id="postgresqlPassword"
 		isPasswordField
@@ -171,8 +177,8 @@
 		value={service.fider.postgresqlPassword}
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlDatabase">{$t('index.database')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlDatabase">{$t('index.database')}</label>
 	<CopyPasswordField
 		name="postgresqlDatabase"
 		id="postgresqlDatabase"
--- a/apps/ui/src/routes/services/[id]/_Services/_Ghost.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_Ghost.svelte
@@ -11,9 +11,10 @@
 		Ghost <Explainer explanation="You can change these values in the Ghost admin panel." />
 	</div>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="email">{$t('forms.default_email_address')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="email">{$t('forms.default_email_address')}</label>
 	<input 
+		class="w-full"
 		name="email"
 		id="email"
 		disabled
@@ -23,8 +24,8 @@
 		required
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="defaultPassword">{$t('forms.default_password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="defaultPassword">{$t('forms.default_password')}</label>
 	<CopyPasswordField
 		id="defaultPassword"
 		isPasswordField
@@ -37,8 +38,8 @@
 <div class="flex space-x-1 py-5 font-bold">
 	<div class="title">MariaDB</div>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbUser">{$t('forms.username')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="mariadbUser">{$t('forms.username')}</label>
 	<CopyPasswordField
 		name="mariadbUser"
 		id="mariadbUser"
@@ -47,8 +48,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbPassword">{$t('forms.password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="mariadbPassword">{$t('forms.password')}</label>
 	<CopyPasswordField
 		id="mariadbPassword"
 		isPasswordField
@@ -58,9 +59,10 @@
 		value={service.ghost.mariadbPassword}
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbDatabase">{$t('index.database')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="mariadbDatabase">{$t('index.database')}</label>
 	<input 
+		class="w-full"
 		name="mariadbDatabase"
 		id="mariadbDatabase"
 		required
@@ -70,8 +72,8 @@
 		placeholder="{$t('forms.eg')}: ghost_db"
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbRootUser">{$t('forms.root_db_user')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="mariadbRootUser">{$t('forms.root_db_user')}</label>
 	<CopyPasswordField
 		id="mariadbRootUser"
 		readonly
@@ -80,8 +82,8 @@
 		value={service.ghost.mariadbRootUser}
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbRootUserPassword">{$t('forms.root_db_password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="mariadbRootUserPassword">{$t('forms.root_db_password')}</label>
 	<CopyPasswordField
 		id="mariadbRootUserPassword"
 		isPasswordField
--- a/apps/ui/src/routes/services/[id]/_Services/_GlitchTip.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_GlitchTip.svelte
@@ -53,7 +53,7 @@
 	<div class="title">GlitchTip</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
+<div class="grid grid-cols-2 items-center lg:px-10">
 	<Setting
 		id="enableOpenUserRegistration"
 		bind:setting={service.glitchTip.enableOpenUserRegistration}
@@ -74,7 +74,7 @@
 <div class="flex space-x-1 py-2 font-bold">
 	<div class="subtitle">Email settings</div>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
+<div class="grid grid-cols-2 items-center lg:px-10">
 	<Setting
 		id="emailSmtpUseTls"
 		bind:setting={service.glitchTip.emailSmtpUseTls}
@@ -86,7 +86,7 @@
 	/>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
+<div class="grid grid-cols-2 items-center lg:px-10">
 	<Setting
 		id="emailSmtpUseSsl"
 		bind:setting={service.glitchTip.emailSmtpUseSsl}
@@ -97,8 +97,8 @@
 		description={''}
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="defaultEmailFrom">Default Email From</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="defaultEmailFrom">Default Email From</label>
 	<CopyPasswordField
 		required
 		name="defaultEmailFrom"
@@ -107,8 +107,8 @@
 	/>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="emailSmtpHost">SMTP Host</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="emailSmtpHost">SMTP Host</label>
 	<CopyPasswordField
 		name="emailSmtpHost"
 		id="emailSmtpHost"
@@ -116,8 +116,8 @@
 	/>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="emailSmtpPort">SMTP Port</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="emailSmtpPort">SMTP Port</label>
 	<CopyPasswordField
 		name="emailSmtpPort"
 		id="emailSmtpPort"
@@ -125,8 +125,8 @@
 	/>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="emailSmtpUser">SMTP User</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="emailSmtpUser">SMTP User</label>
 	<CopyPasswordField
 		name="emailSmtpUser"
 		id="emailSmtpUser"
@@ -134,8 +134,8 @@
 	/>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="emailSmtpPassword">SMTP Password</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="emailSmtpPassword">SMTP Password</label>
 	<CopyPasswordField
 		name="emailSmtpPassword"
 		id="emailSmtpPassword"
@@ -144,8 +144,8 @@
 	/>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="emailBackend">Email Backend</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="emailBackend">Email Backend</label>
 	<CopyPasswordField
 		name="emailBackend"
 		id="emailBackend"
@@ -153,8 +153,8 @@
 	/>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="mailgunApiKey">Mailgun API Key</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="mailgunApiKey">Mailgun API Key</label>
 	<CopyPasswordField
 		name="mailgunApiKey"
 		id="mailgunApiKey"
@@ -162,8 +162,8 @@
 	/>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="sendgridApiKey">SendGrid API Key</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="sendgridApiKey">SendGrid API Key</label>
 	<CopyPasswordField
 		name="sendgridApiKey"
 		id="sendgridApiKey"
@@ -175,8 +175,8 @@
 	<div class="subtitle">Default User & Superuser</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="defaultEmail">{$t('forms.email')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="defaultEmail">{$t('forms.email')}</label>
 	<CopyPasswordField
 		name="defaultEmail"
 		id="defaultEmail"
@@ -185,8 +185,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="defaultUsername">{$t('forms.username')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="defaultUsername">{$t('forms.username')}</label>
 	<CopyPasswordField
 		name="defaultUsername"
 		id="defaultUsername"
@@ -195,8 +195,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="defaultPassword">{$t('forms.password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="defaultPassword">{$t('forms.password')}</label>
 	<CopyPasswordField
 		name="defaultPassword"
 		id="defaultPassword"
@@ -211,8 +211,8 @@
 	<div class="title">PostgreSQL</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlUser">{$t('forms.username')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlUser">{$t('forms.username')}</label>
 	<CopyPasswordField
 		name="postgresqlUser"
 		id="postgresqlUser"
@@ -221,8 +221,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlPassword">{$t('forms.password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlPassword">{$t('forms.password')}</label>
 	<CopyPasswordField
 		id="postgresqlPassword"
 		isPasswordField
@@ -232,8 +232,8 @@
 		bind:value={service.glitchTip.postgresqlPassword}
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlDatabase">{$t('index.database')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlDatabase">{$t('index.database')}</label>
 	<CopyPasswordField
 		name="postgresqlDatabase"
 		id="postgresqlDatabase"
--- a/apps/ui/src/routes/services/[id]/_Services/_Hasura.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_Hasura.svelte
@@ -8,8 +8,8 @@
 	<div class="title">Hasura</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="graphQLAdminPassword">GraphQL Admin Password</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="graphQLAdminPassword">GraphQL Admin Password</label>
 	<CopyPasswordField
 		name="graphQLAdminPassword"
 		id="graphQLAdminPassword"
@@ -24,8 +24,8 @@
 	<div class="title">PostgreSQL</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlUser">{$t('forms.username')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlUser">{$t('forms.username')}</label>
 	<CopyPasswordField
 		name="postgresqlUser"
 		id="postgresqlUser"
@@ -34,8 +34,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlPassword">{$t('forms.password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlPassword">{$t('forms.password')}</label>
 	<CopyPasswordField
 		id="postgresqlPassword"
 		isPasswordField
@@ -45,8 +45,8 @@
 		value={service.hasura.postgresqlPassword}
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlDatabase">{$t('index.database')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlDatabase">{$t('index.database')}</label>
 	<CopyPasswordField
 		name="postgresqlDatabase"
 		id="postgresqlDatabase"
--- a/apps/ui/src/routes/services/[id]/_Services/_MeiliSearch.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_MeiliSearch.svelte
@@ -7,8 +7,8 @@
 <div class="flex space-x-1 py-5 font-bold">
 	<div class="title">MeiliSearch</div>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="masterKey">{$t('forms.admin_api_key')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="masterKey">{$t('forms.admin_api_key')}</label>
 	<CopyPasswordField
 		id="masterKey"
 		isPasswordField
--- a/apps/ui/src/routes/services/[id]/_Services/_MinIO.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_MinIO.svelte
@@ -8,9 +8,10 @@
 <div class="flex space-x-1 py-5 font-bold">
 	<div class="title">MinIO</div>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="rootUser">{$t('forms.root_user')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="rootUser">{$t('forms.root_user')}</label>
 	<input 
+		class="w-full"
 		name="rootUser"
 		id="rootUser"
 		placeholder={$t('forms.username')}
@@ -19,8 +20,8 @@
 		readonly
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="rootUserPassword">{$t('forms.roots_password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="rootUserPassword">{$t('forms.roots_password')}</label>
 	<CopyPasswordField
 		id="rootUserPassword"
 		isPasswordField
@@ -31,8 +32,8 @@
 	/>
 </div>
 {#if !service.minio.apiFqdn}
-	<div class="grid grid-cols-2 items-center px-10">
-		<label for="publicPort">{$t('forms.api_port')}</label>
+	<div class="grid grid-cols-2 items-center lg:px-10">
+		<label class="text-base font-bold text-stone-100" for="publicPort">{$t('forms.api_port')}</label>
 		<input
 			name="publicPort"
 			id="publicPort"
--- a/apps/ui/src/routes/services/[id]/_Services/_Moodle.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_Moodle.svelte
@@ -8,9 +8,10 @@
 <div class="flex space-x-1 py-5 font-bold">
 	<div class="title">Moodle</div>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="email">{$t('forms.default_email_address')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="email">{$t('forms.default_email_address')}</label>
 	<input 
+		class="w-full"
 		name="email"
 		id="email"
 		required
@@ -20,8 +21,8 @@
 		value={service.moodle.defaultEmail}
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="defaultUsername">Default Username</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="defaultUsername">Default Username</label>
 	<CopyPasswordField
 		id="defaultUsername"
 		required
@@ -31,8 +32,8 @@
 		value={service.moodle.defaultUsername}
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="defaultPassword">{$t('forms.default_password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="defaultPassword">{$t('forms.default_password')}</label>
 	<CopyPasswordField
 		id="defaultPassword"
 		isPasswordField
@@ -46,8 +47,8 @@
 <div class="flex space-x-1 py-5 font-bold">
 	<div class="title">MariaDB</div>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbUser">{$t('forms.username')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="mariadbUser">{$t('forms.username')}</label>
 	<CopyPasswordField
 		name="mariadbUser"
 		id="mariadbUser"
@@ -56,8 +57,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbPassword">{$t('forms.password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="mariadbPassword">{$t('forms.password')}</label>
 	<CopyPasswordField
 		id="mariadbPassword"
 		isPasswordField
@@ -67,9 +68,10 @@
 		value={service.moodle.mariadbPassword}
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbDatabase">{$t('index.database')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="mariadbDatabase">{$t('index.database')}</label>
 	<input 
+		class="w-full"
 		name="mariadbDatabase"
 		id="mariadbDatabase"
 		required
@@ -79,8 +81,8 @@
 		placeholder="{$t('forms.eg')}: moodle_db"
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbRootUser">{$t('forms.root_db_user')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="mariadbRootUser">{$t('forms.root_db_user')}</label>
 	<CopyPasswordField
 		id="mariadbRootUser"
 		readonly
@@ -89,8 +91,8 @@
 		value={service.moodle.mariadbRootUser}
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbRootUserPassword">{$t('forms.root_db_password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="mariadbRootUserPassword">{$t('forms.root_db_password')}</label>
 	<CopyPasswordField
 		id="mariadbRootUserPassword"
 		isPasswordField
--- a/apps/ui/src/routes/services/[id]/_Services/_PlausibleAnalytics.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_PlausibleAnalytics.svelte
@@ -10,13 +10,14 @@
 <div class="flex space-x-1 py-5 font-bold">
 	<div class="title">Plausible Analytics</div>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="scriptName"
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="scriptName"
 		>Script Name <Explainer
 			explanation="Useful if you would like to rename the collector script to prevent it blocked by AdBlockers."
 		/></label
 	>
 	<input 
+		class="w-full"
 		name="scriptName"
 		id="scriptName"
 		readonly={!$appSession.isAdmin && !$status.service.isRunning}
@@ -26,9 +27,10 @@
 		required
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="email">{$t('forms.email')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="email">{$t('forms.email')}</label>
 	<input 
+		class="w-full"
 		name="email"
 		id="email"
 		disabled={readOnly}
@@ -38,8 +40,8 @@
 		required
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="username">{$t('forms.username')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="username">{$t('forms.username')}</label>
 	<CopyPasswordField
 		name="username"
 		id="username"
@@ -50,8 +52,8 @@
 		required
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="password">{$t('forms.password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="password">{$t('forms.password')}</label>
 	<CopyPasswordField
 		id="password"
 		isPasswordField
@@ -64,8 +66,8 @@
 <div class="flex space-x-1 py-5 font-bold">
 	<div class="title">PostgreSQL</div>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlUser">{$t('forms.username')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlUser">{$t('forms.username')}</label>
 	<CopyPasswordField
 		name="postgresqlUser"
 		id="postgresqlUser"
@@ -74,8 +76,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlPassword">{$t('forms.password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlPassword">{$t('forms.password')}</label>
 	<CopyPasswordField
 		id="postgresqlPassword"
 		isPasswordField
@@ -85,8 +87,8 @@
 		value={service.plausibleAnalytics.postgresqlPassword}
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlDatabase">{$t('index.database')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlDatabase">{$t('index.database')}</label>
 	<CopyPasswordField
 		name="postgresqlDatabase"
 		id="postgresqlDatabase"
--- a/apps/ui/src/routes/services/[id]/_Services/_Searxng.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_Searxng.svelte
@@ -8,8 +8,8 @@
 	<div class="title">SearXNG</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="secretKey">Secret Key</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="secretKey">Secret Key</label>
 	<CopyPasswordField
 		name="secretKey"
 		id="secretKey"
@@ -23,8 +23,8 @@
 	<div class="title">Redis</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="redisPassword">{$t('forms.password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="redisPassword">{$t('forms.password')}</label>
 	<CopyPasswordField
 		name="redisPassword"
 		id="redisPassword"
--- a/apps/ui/src/routes/services/[id]/_Services/_Services.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_Services.svelte
@@ -180,8 +180,9 @@

 <div class="mx-auto max-w-4xl px-6 pb-12">
 	<form on:submit|preventDefault={handleSubmit} class="py-4">
-		<div class="flex space-x-1 pb-5">
+		<div class="flex flex-col lg:flex-row justify-between lg:space-x-1 space-y-3 pb-5 items-center">
 			<div class="title">{$t('general')}</div>
+			<div class="flex flex-row space-y-3 items-center">
 				{#if $appSession.isAdmin}
 				<button
 					type="submit"
@@ -216,18 +217,19 @@
 				>
 			{/if}
 			</div>
+		</div>

-		<div class="grid grid-flow-row gap-2">
 		{#if service.type === 'minio' && !service.minio.apiFqdn && $status.service.isRunning}
-				<div class="text-center">
-					<span class="font-bold text-red-500">IMPORTANT!</span> There was a small modification with
-					Minio in the latest version of Coolify. Now you can separate the Console URL from the API URL,
-					so you could use both through SSL. But this proccess cannot be done automatically, so you have
-					to stop your Minio instance, configure the new domain and start it back. Sorry for any inconvenience.
+			<div class="py-5">
+				<span class="font-bold text-red-500">IMPORTANT!</span> There was a small modification with Minio
+				in the latest version of Coolify. Now you can separate the Console URL from the API URL, so you
+				could use both through SSL. But this proccess cannot be done automatically, so you have to stop
+				your Minio instance, configure the new domain and start it back. Sorry for any inconvenience.
 			</div>
 		{/if}
-			<div class="mt-2 grid grid-cols-2 items-center px-10">
-				<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
+
+		<div class="grid gap-4 grid-cols-2 grid-rows-1 lg:px-10">
+			<label class="text-base font-bold text-stone-100" for="name" >{$t('forms.name')}</label>
 			<div>
 				<input
 					readonly={!$appSession.isAdmin}
@@ -237,9 +239,7 @@
 					required
 				/>
 			</div>
-			</div>
-			<div class="grid grid-cols-2 items-center px-10">
-				<label for="version" class="text-base font-bold text-stone-100">Version / Tag</label>
+			<label class="text-base font-bold text-stone-100" for="version">Version / Tag</label>
 			<a
 				href={$appSession.isAdmin && !$status.service.isRunning && !$status.service.initialLoading
 					? `/services/${id}/configuration/version?from=/services/${id}`
@@ -254,9 +254,7 @@
 					class:cursor-pointer={!$status.service.isRunning}
 				/></a
 			>
-			</div>
-			<div class="grid grid-cols-2 items-center px-10">
-				<label for="destination" class="text-base font-bold text-stone-100"
+			<label class="text-base font-bold text-stone-100" for="destination"
 				>{$t('application.destination')}</label
 			>
 			<div>
@@ -271,12 +269,9 @@
 					</div>
 				{/if}
 			</div>
-			</div>
+
 			{#if service.type === 'minio'}
-				<div class="grid grid-cols-2 px-10">
-					<div class="flex-col ">
-						<label for="fqdn" class="pt-2 text-base font-bold text-stone-100">Console URL</label>
-					</div>
+				<label class="text-base font-bold text-stone-100" for="fqdn">Console URL</label>

 				<CopyPasswordField
 					placeholder="eg: https://console.min.io"
@@ -288,14 +283,9 @@
 					bind:value={service.fqdn}
 					required
 				/>
-				</div>
-				<div class="grid grid-cols-2 px-10">
-					<div class="flex-col ">
-						<label for="apiFqdn" class="pt-2 text-base font-bold text-stone-100"
+				<label class="text-base font-bold text-stone-100" for="apiFqdn" 
 					>API URL <Explainer explanation={$t('application.https_explainer')} /></label
 				>
-					</div>
-
 				<CopyPasswordField
 					placeholder="eg: https://min.io"
 					readonly={!$appSession.isAdmin && !$status.service.isRunning}
@@ -306,16 +296,11 @@
 					bind:value={service.minio.apiFqdn}
 					required
 				/>
-				</div>
 			{:else}
-				<div class="grid grid-cols-2 px-10">
-					<div class="flex-col ">
-						<label for="fqdn" class="pt-2 text-base font-bold text-stone-100"
+				<label class="text-base font-bold text-stone-100" for="fqdn" 
 					>{$t('application.url_fqdn')}
 					<Explainer explanation={$t('application.https_explainer')} />
 				</label>
-					</div>
-
 				<CopyPasswordField
 					placeholder="eg: https://analytics.coollabs.io"
 					readonly={!$appSession.isAdmin && !$status.service.isRunning}
@@ -328,8 +313,8 @@
 					bind:value={service.fqdn}
 					required
 				/>
-				</div>
 			{/if}
+		</div>
 		{#if forceSave}
 			<div class="flex-col space-y-2 pt-4 text-center">
 				{#if isNonWWWDomainOK}
@@ -362,7 +347,8 @@
 				{/if}
 			</div>
 		{/if}
-			<div class="grid grid-cols-2 items-center px-10">
+
+		<div class="grid gap-4 grid-cols-2 grid-rows-1 lg:px-10">
 			<Setting
 				id="dualCerts"
 				disabled={$status.service.isRunning}
@@ -372,9 +358,7 @@
 				description={$t('services.generate_www_non_www_ssl')}
 				on:click={() => !$status.service.isRunning && changeSettings('dualCerts')}
 			/>
-			</div>
-			<div class="grid grid-cols-2 items-center px-10">
-				<label for="exposePort" class="text-base font-bold text-stone-100"
+			<label class="text-base font-bold text-stone-100" for="exposePort"
 				>Exposed Port <Explainer
 					explanation={'You can expose your application to a port on the host system.<br><br>Useful if you would like to use your own reverse proxy or tunnel and also in development mode. Otherwise leave empty.'}
 				/></label
@@ -390,7 +374,6 @@
 				placeholder="12345"
 			/>
 		</div>
-
 		{#if service.type === 'plausibleanalytics'}
 			<PlausibleAnalytics bind:service {readOnly} />
 		{:else if service.type === 'minio'}
@@ -422,6 +405,5 @@
 		{:else if service.type === 'taiga'}
 			<Taiga bind:service />
 		{/if}
-		</div>
 	</form>
 </div>
--- a/apps/ui/src/routes/services/[id]/_Services/_Taiga.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_Taiga.svelte
@@ -8,8 +8,8 @@
 	<div class="title">Taiga</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="secretKey">Secret Key</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="secretKey">Secret Key</label>
 	<CopyPasswordField
 		name="secretKey"
 		id="secretKey"
@@ -24,8 +24,8 @@
 	<div class="title">Django</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="djangoAdminUser">Admin User</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="djangoAdminUser">Admin User</label>
 	<CopyPasswordField
 		name="djangoAdminUser"
 		id="djangoAdminUser"
@@ -34,8 +34,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="djangoAdminPassword">Admin Password</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="djangoAdminPassword">Admin Password</label>
 	<CopyPasswordField
 		name="djangoAdminPassword"
 		id="djangoAdminPassword"
@@ -49,8 +49,8 @@
 	<div class="title">RabbitMQ</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="rabbitMQUser">User</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="rabbitMQUser">User</label>
 	<CopyPasswordField
 		name="rabbitMQUser"
 		id="rabbitMQUser"
@@ -59,8 +59,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="rabbitMQPassword">Password</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="rabbitMQPassword">Password</label>
 	<CopyPasswordField
 		name="rabbitMQPassword"
 		id="rabbitMQPassword"
@@ -75,8 +75,8 @@
 	<div class="title">PostgreSQL</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlHost">PostgreSQL Host</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlHost">PostgreSQL Host</label>
 	<CopyPasswordField
 		name="postgresqlHost"
 		id="postgresqlHost"
@@ -85,8 +85,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlPort">PostgreSQL Port</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlPort">PostgreSQL Port</label>
 	<CopyPasswordField
 		name="postgresqlPort"
 		id="postgresqlPort"
@@ -95,8 +95,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlUser">PostgreSQL User</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlUser">PostgreSQL User</label>
 	<CopyPasswordField
 		name="postgresqlUser"
 		id="postgresqlUser"
@@ -105,8 +105,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlPassword">PostgreSQL Password</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlPassword">PostgreSQL Password</label>
 	<CopyPasswordField
 		name="postgresqlPassword"
 		id="postgresqlPassword"
--- a/apps/ui/src/routes/services/[id]/_Services/_Umami.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_Umami.svelte
@@ -7,12 +7,12 @@
 <div class="flex space-x-1 py-5 font-bold">
 	<div class="title">Umami</div>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="adminUser">Admin User</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="adminUser">Admin User</label>
 	<input name="adminUser" id="adminUser" placeholder="admin" value="admin" disabled readonly />
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="umamiAdminPassword"
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="umamiAdminPassword"
 		>Initial Admin Password <Explainer
 			explanation="It could be changed in Umami. <br>This is just the password set initially after the first start."
 		/></label
--- a/apps/ui/src/routes/services/[id]/_Services/_VSCodeServer.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_VSCodeServer.svelte
@@ -8,8 +8,8 @@
 <div class="flex space-x-1 py-5 font-bold">
 	<div class="title">VSCode Server</div>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="password">{$t('forms.password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="password">{$t('forms.password')}</label>
 	<CopyPasswordField
 		id="password"
 		isPasswordField
--- a/apps/ui/src/routes/services/[id]/_Services/_Weblate.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_Weblate.svelte
@@ -7,8 +7,8 @@
 	<div class="title">Weblate</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="adminPassword">Admin password</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="adminPassword">Admin password</label>
 	<CopyPasswordField
 		name="adminPassword"
 		id="adminPassword"
@@ -23,8 +23,8 @@
 	<div class="title">PostgreSQL</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlHost">PostgreSQL Host</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlHost">PostgreSQL Host</label>
 	<CopyPasswordField
 		name="postgresqlHost"
 		id="postgresqlHost"
@@ -33,8 +33,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlPort">PostgreSQL Port</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlPort">PostgreSQL Port</label>
 	<CopyPasswordField
 		name="postgresqlPort"
 		id="postgresqlPort"
@@ -43,8 +43,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlUser">PostgreSQL User</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlUser">PostgreSQL User</label>
 	<CopyPasswordField
 		name="postgresqlUser"
 		id="postgresqlUser"
@@ -53,8 +53,8 @@
 		disabled
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlPassword">PostgreSQL Password</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="postgresqlPassword">PostgreSQL Password</label>
 	<CopyPasswordField
 		name="postgresqlPassword"
 		id="postgresqlPassword"
--- a/apps/ui/src/routes/services/[id]/_Services/_Wordpress.svelte
+++ b/apps/ui/src/routes/services/[id]/_Services/_Wordpress.svelte
@@ -72,8 +72,8 @@
 	<div class="title">Wordpress</div>
 </div>

-<div class="grid grid-cols-2 items-center px-10">
-	<label for="extraConfig">{$t('forms.extra_config')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="extraConfig">{$t('forms.extra_config')}</label>
 	<textarea
 		bind:value={service.wordpress.extraConfig}
 		disabled={$status.service.isRunning || $status.service.initialLoading}
@@ -91,7 +91,7 @@ define('SUBDOMAIN_INSTALL', false);`
 			: 'N/A'}
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
+<div class="grid grid-cols-2 items-center lg:px-10">
 	<Setting
 		id="ftpEnabled"
 		bind:setting={service.wordpress.ftpEnabled}
@@ -103,16 +103,16 @@ define('SUBDOMAIN_INSTALL', false);`
 	/>
 </div>
 {#if service.wordpress.ftpEnabled}
-	<div class="grid grid-cols-2 items-center px-10">
-		<label for="ftpUrl">sFTP Connection URI</label>
+	<div class="grid grid-cols-2 items-center lg:px-10">
+		<label class="text-base font-bold text-stone-100" for="ftpUrl">sFTP Connection URI</label>
 		<CopyPasswordField id="ftpUrl" readonly disabled name="ftpUrl" value={ftpUrl} />
 	</div>
-	<div class="grid grid-cols-2 items-center px-10">
-		<label for="ftpUser">User</label>
+	<div class="grid grid-cols-2 items-center lg:px-10">
+		<label class="text-base font-bold text-stone-100" for="ftpUser">User</label>
 		<CopyPasswordField id="ftpUser" readonly disabled name="ftpUser" value={ftpUser} />
 	</div>
-	<div class="grid grid-cols-2 items-center px-10">
-		<label for="ftpPassword">Password</label>
+	<div class="grid grid-cols-2 items-center lg:px-10">
+		<label class="text-base font-bold text-stone-100" for="ftpPassword">Password</label>
 		<CopyPasswordField
 			id="ftpPassword"
 			isPasswordField
@@ -126,7 +126,7 @@ define('SUBDOMAIN_INSTALL', false);`
 <div class="flex space-x-1 py-5 font-bold">
 	<div class="title">MySQL</div>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
+<div class="grid grid-cols-2 items-center lg:px-10">
 	<Setting
 		id="ownMysql"
 		dataTooltip={$t('forms.must_be_stopped_to_modify')}
@@ -138,8 +138,8 @@ define('SUBDOMAIN_INSTALL', false);`
 	/>
 </div>
 {#if service.wordpress.ownMysql}
-	<div class="grid grid-cols-2 items-center px-10">
-		<label for="mysqlHost">Host</label>
+	<div class="grid grid-cols-2 items-center lg:px-10">
+		<label class="text-base font-bold text-stone-100" for="mysqlHost">Host</label>
 		<input
 			name="mysqlHost"
 			id="mysqlHost"
@@ -150,8 +150,8 @@ define('SUBDOMAIN_INSTALL', false);`
 			placeholder="{$t('forms.eg')}: db.coolify.io"
 		/>
 	</div>
-	<div class="grid grid-cols-2 items-center px-10">
-		<label for="mysqlPort">Port</label>
+	<div class="grid grid-cols-2 items-center lg:px-10">
+		<label class="text-base font-bold text-stone-100" for="mysqlPort">Port</label>
 		<input
 			name="mysqlPort"
 			id="mysqlPort"
@@ -163,9 +163,10 @@ define('SUBDOMAIN_INSTALL', false);`
 		/>
 	</div>
 {/if}
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="mysqlDatabase">{$t('index.database')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="mysqlDatabase">{$t('index.database')}</label>
 	<input 
+		class="w-full"
 		name="mysqlDatabase"
 		id="mysqlDatabase"
 		required
@@ -176,8 +177,8 @@ define('SUBDOMAIN_INSTALL', false);`
 	/>
 </div>
 {#if !service.wordpress.ownMysql}
-	<div class="grid grid-cols-2 items-center px-10">
-		<label for="mysqlRootUser">{$t('forms.root_user')}</label>
+	<div class="grid grid-cols-2 items-center lg:px-10">
+		<label class="text-base font-bold text-stone-100" for="mysqlRootUser">{$t('forms.root_user')}</label>
 		<input
 			name="mysqlRootUser"
 			id="mysqlRootUser"
@@ -187,8 +188,8 @@ define('SUBDOMAIN_INSTALL', false);`
 			disabled={$status.service.isRunning || !service.wordpress.ownMysql}
 		/>
 	</div>
-	<div class="grid grid-cols-2 items-center px-10">
-		<label for="mysqlRootUserPassword">{$t('forms.roots_password')}</label>
+	<div class="grid grid-cols-2 items-center lg:px-10">
+		<label class="text-base font-bold text-stone-100" for="mysqlRootUserPassword">{$t('forms.roots_password')}</label>
 		<CopyPasswordField
 			id="mysqlRootUserPassword"
 			isPasswordField
@@ -199,9 +200,10 @@ define('SUBDOMAIN_INSTALL', false);`
 		/>
 	</div>
 {/if}
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="mysqlUser">{$t('forms.user')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="mysqlUser">{$t('forms.user')}</label>
 	<input 
+		class="w-full"
 		name="mysqlUser"
 		id="mysqlUser"
 		bind:value={service.wordpress.mysqlUser}
@@ -209,8 +211,8 @@ define('SUBDOMAIN_INSTALL', false);`
 		disabled={$status.service.isRunning || !service.wordpress.ownMysql}
 	/>
 </div>
-<div class="grid grid-cols-2 items-center px-10">
-	<label for="mysqlPassword">{$t('forms.password')}</label>
+<div class="grid grid-cols-2 items-center lg:px-10">
+	<label class="text-base font-bold text-stone-100" for="mysqlPassword">{$t('forms.password')}</label>
 	<CopyPasswordField
 		id="mysqlPassword"
 		isPasswordField
--- a/apps/ui/src/routes/services/[id]/__layout.svelte
+++ b/apps/ui/src/routes/services/[id]/__layout.svelte
@@ -69,6 +69,7 @@
 	} from '$lib/store';
 	import { onDestroy, onMount } from 'svelte';
 	import Tooltip from '$lib/components/Tooltip.svelte';
+	import ServiceLinks from './_ServiceLinks.svelte';
 	const { id } = $page.params;

 	export let service: any;
@@ -155,7 +156,19 @@
 	});
 </script>

-<nav class="nav-side">
+<nav class="header">
+	<div class="hidden items-center space-x-2 p-5 px-6 font-bold lg:flex">
+		<div class="flex flex-col">
+			<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
+				Configuration
+			</div>
+			<span class="text-xs">{service.name}</span>
+		</div>
+		<ServiceLinks {service} />
+	</div>
+	<div
+		class="flex flex-row flex-wrap space-x-4 space-y-3 justify-center lg:justify-start py-2 lg:py-0"
+	>
 		{#if $location}
 			<a
 				id="open"
@@ -323,11 +336,7 @@
 				class:text-pink-500={$page.url.pathname === `/services/${id}/secrets`}
 				class:bg-coolgray-500={$page.url.pathname === `/services/${id}/secrets`}
 			>
-			<button
-				id="secrets"
-				disabled={!$isDeploymentEnabled}
-				class="icons bg-transparent text-sm "
-			>
+				<button id="secrets" disabled={!$isDeploymentEnabled} class="icons bg-transparent text-sm ">
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
 						class="w-6 h-6"
@@ -386,7 +395,11 @@
 				class:text-pink-500={$page.url.pathname === `/services/${id}/logs`}
 				class:bg-coolgray-500={$page.url.pathname === `/services/${id}/logs`}
 			>
-			<button id="logs" disabled={!$status.service.isRunning} class="icons bg-transparent text-sm">
+				<button
+					id="logs"
+					disabled={!$status.service.isRunning}
+					class="icons bg-transparent text-sm"
+				>
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
 						class="h-6 w-6"
@@ -417,5 +430,6 @@
 			class="icons bg-transparent  text-sm"><DeleteIcon /></button
 		>
 		<Tooltip triggeredBy="#delete">Delete</Tooltip>
+	</div>
 </nav>
 <slot />
--- a/apps/ui/src/routes/services/[id]/index.svelte
+++ b/apps/ui/src/routes/services/[id]/index.svelte
@@ -50,8 +50,8 @@
 	});
 </script>

-<div class="flex h-20 items-center space-x-2 p-5 px-6 font-bold">
-	<div class="-mb-5 flex-col">
+<div class="flex items-center space-x-2 p-5 px-6 font-bold lg:hidden">
+	<div class="flex-col">
 		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
 			Configuration
 		</div>
--- a/apps/ui/src/routes/services/[id]/logs/index.svelte
+++ b/apps/ui/src/routes/services/[id]/logs/index.svelte
@@ -150,17 +150,11 @@
 				</button>
 				<Tooltip triggeredBy="#follow">Follow Logs</Tooltip>
 			</div>
-			<div
-				class="font-mono w-full leading-6 text-left text-md tracking-tighter rounded bg-coolgray-200 py-5 px-6 whitespace-pre-wrap break-words overflow-auto max-h-[80vh] -mt-12 overflow-y-scroll scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200"
-				bind:this={logsEl}
-				on:scroll={detect}
-			>
-				<div class="px-2 pr-14">
+			<div class="font-mono w-full rounder bg-coolgray-200 p-5 overflow-x-auto overflox-y-auto max-h-[80vh] rounded-md mb-20 flex flex-col whitespace-nowrap -mt-12 scrollbar-thumb-coollabs scrollbar-track-coolgray-200 scrollbar-w-1">
 				{#each logs as log}
-						{log + '\n'}
+					<p>{log.line + '\n'}</p>
 				{/each}
 			</div>
 		</div>
-		</div>
 	{/if}
 </div>
--- a/apps/ui/src/routes/services/[id]/secrets.svelte
+++ b/apps/ui/src/routes/services/[id]/secrets.svelte
@@ -68,44 +68,12 @@
 	}
 </script>

-<div
-	class="flex items-center space-x-2 p-5 px-6 font-bold"
-	class:p-5={service.fqdn}
-	class:p-6={!service.fqdn}
->
-	<div class="-mb-5 flex-col">
-		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
-			{$t('application.secret')}
-		</div>
-		<span class="text-xs">{service.name}</span>
-	</div>
-	{#if service.fqdn}
-		<a
-			href={service.fqdn}
-			target="_blank"
-			class="icons tooltip-bottom flex items-center bg-transparent text-sm"
-			><svg
-				xmlns="http://www.w3.org/2000/svg"
-				class="h-6 w-6"
-				viewBox="0 0 24 24"
-				stroke-width="1.5"
-				stroke="currentColor"
-				fill="none"
-				stroke-linecap="round"
-				stroke-linejoin="round"
-			>
-				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-				<path d="M11 7h-5a2 2 0 0 0 -2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2 -2v-5" />
-				<line x1="10" y1="14" x2="20" y2="4" />
-				<polyline points="15 4 20 4 20 9" />
-			</svg></a
-		>
-	{/if}
-
-	<ServiceLinks {service} />
-</div>
 <div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
-	<table class="mx-auto border-separate text-left">
+	<h1 class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block font-bold mb-4">
+		Secrets
+	</h1>
+	<div class="overflow-x-auto">
+		<table class="w-full border-separate text-left">
 			<thead>
 				<tr class="h-12">
 					<th scope="col">{$t('forms.name')}</th>
@@ -126,6 +94,7 @@
 				</tr>
 			</tbody>
 		</table>
+	</div>
 	<h2 class="title my-6 font-bold">Paste .env file</h2>
 	<form on:submit|preventDefault={getValues} class="mb-12 w-full">
 		<textarea bind:value={batchSecrets} class="mb-2 min-h-[200px] w-full" />
--- a/apps/ui/src/routes/services/_index.svelte
+++ b/apps/ui/src/routes/services/_index.svelte
@@ -43,9 +43,8 @@
 	});
 </script>

-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">{$t('index.services')}</div>
-	{#if $appSession.isAdmin}
+<nav class="header">
+	<h1 class="mr-4 text-2xl font-bold">{$t('index.services')}</h1>
 	<button on:click={newService} class="btn btn-square btn-sm bg-services">
 		<svg
 			class="h-6 w-6"
@@ -61,10 +60,9 @@
 			/></svg
 		>
 	</button>
-	{/if}
-</div>
-
-<div class="flex-col justify-center mt-10 pb-12 sm:pb-16">
+</nav>
+<br />
+<div class="flex-col justify-center mt-10 pb-12 sm:pb-16 lg:pt-16">
 	{#if !services || ownServices.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">{$t('service.no_service')}</div>
--- a/apps/ui/src/routes/settings/_Menu.svelte
+++ b/apps/ui/src/routes/settings/_Menu.svelte
@@ -7,7 +7,7 @@
 	{#if $appSession.teamId === '0'}
 		<a
 			href="/settings/global"
-			class="sub-menu no-underline"
+			class="sub-menu no-underline w-full"
 			class:sub-menu-active={$page.routeId === 'settings/global'}
 		>
 			Global Settings
@@ -15,7 +15,7 @@
 	{/if}
 	<a
 		href="/settings/ssh-keys"
-		class="sub-menu no-underline"
+		class="sub-menu no-underline w-full"
 		class:sub-menu-active={$page.routeId === 'settings/ssh-keys'}>SSH Keys</a
 	>
 </div>
--- a/apps/ui/src/routes/settings/global.svelte
+++ b/apps/ui/src/routes/settings/global.svelte
@@ -198,12 +198,15 @@
 	<div class="mr-4 text-2xl tracking-tight">{$t('index.settings')}</div>
 </div>
 <div class="mx-auto w-full">
-	<div class="flex flex-row">
+	<div class="flex lg:flex-row flex-col">
 		<Menu />
-		<div>
-			<form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4">
-				<div class="flex space-x-1 pb-6">
+		<div class="mt-5">
+			<form on:submit|preventDefault={handleSubmit}>
+				<div
+					class="flex flex-col space-y-4 p-6 lg:p-0 lg:flex-row lg:space-y0 lg:space-x-4 w-full lg:justify-between lg:items-center mb-5"
+				>
 					<div class="title font-bold">{$t('index.global_settings')}</div>
+					<div class="flex lg:flex-row lg:space-x-4 flex-col space-y-4 lg:space-y-0">
 						<button
 							class="btn btn-sm bg-settings text-black"
 							type="submit"
@@ -231,17 +234,14 @@
 							class="btn btn-sm bg-red-600 hover:bg-red-500">Restart Coolify</button
 						>
 					</div>
-				<div class="grid grid-flow-row gap-2 px-10">
-					<!-- <Language /> -->
-					<div class="grid grid-cols-2 items-start">
-						<div class="flex-col">
+				</div>
+				<div class="grid gap-4 grid-cols-2 auto-rows-max lg:px-10 p-6">
 					<div class="pt-2 text-base font-bold text-stone-100">
 						{$t('application.url_fqdn')}
 						<Explainer explanation={$t('setting.ssl_explainer')} />
 					</div>
-						</div>
-						<div class="justify-start text-left">
 					<input
+						class="w-full"
 						bind:value={fqdn}
 						readonly={!$appSession.isAdmin || isFqdnSet}
 						disabled={!$appSession.isAdmin || isFqdnSet}
@@ -286,34 +286,27 @@
 							{/if}
 						</div>
 					{/if}
-						</div>
-					</div>
-					<div class="grid grid-cols-2 items-start py-6">
-						<div class="flex-col">
 					<div class="pt-2 text-base font-bold text-stone-100">
 						{$t('forms.public_port_range')}
 						<Explainer explanation={$t('forms.public_port_range_explainer')} />
 					</div>
-						</div>
-						<div class="mx-auto flex-row items-center justify-center space-y-2">
+					<div class="flex flex-row items-center space-x-2">
 						<input
-								class="h-8 w-20 px-2"
+							class="h-8 w-full px-2"
 							type="number"
 							bind:value={minPort}
 							min="1024"
 							max={maxPort}
 						/>
-							-
+						<p>-</p>
 						<input
-								class="h-8 w-20 px-2"
+							class="h-8 w-full px-2"
 							type="number"
 							bind:value={maxPort}
 							min={minPort}
 							max="65543"
 						/>
 					</div>
-					</div>
-					<div class="grid grid-cols-2 items-center">
 					<Setting
 						id="isDNSCheckEnabled"
 						bind:setting={isDNSCheckEnabled}
@@ -321,19 +314,12 @@
 						description={$t('setting.is_dns_check_enabled_explainer')}
 						on:click={() => changeSettings('isDNSCheckEnabled')}
 					/>
-					</div>
-					<div class="grid grid-cols-2 items-center">
 					<div class="text-base font-bold text-stone-100">
 						Custom DNS servers <Explainer
 							explanation="You can specify a custom DNS server to verify your domains all over Coolify.<br><br>By default, the OS defined DNS servers are used."
 						/>
 					</div>
-
-						<div class="flex-row items-center justify-center">
-							<input placeholder="1.1.1.1,8.8.8.8" bind:value={DNSServers} />
-						</div>
-					</div>
-					<div class="grid grid-cols-2 items-center">
+					<input class="w-full" placeholder="1.1.1.1,8.8.8.8" bind:value={DNSServers} />
 					<Setting
 						id="dualCerts"
 						dataTooltip={$t('setting.must_remove_domain_before_changing')}
@@ -343,8 +329,6 @@
 						description={$t('setting.generate_www_non_www_ssl')}
 						on:click={() => !isFqdnSet && changeSettings('dualCerts')}
 					/>
-					</div>
-					<div class="grid grid-cols-2 items-center">
 					<Setting
 						id="isRegistrationEnabled"
 						bind:setting={isRegistrationEnabled}
@@ -352,8 +336,6 @@
 						description={$t('setting.registration_allowed_explainer')}
 						on:click={() => changeSettings('isRegistrationEnabled')}
 					/>
-					</div>
-					<div class="grid grid-cols-2 items-center">
 					<Setting
 						id="isAPIDebuggingEnabled"
 						bind:setting={isAPIDebuggingEnabled}
@@ -361,8 +343,7 @@
 						description="Enable API debugging. This will log all API requests and responses.<br><br>You need to restart the Coolify for this to take effect."
 						on:click={() => changeSettings('isAPIDebuggingEnabled')}
 					/>
-					</div>
-					<div class="grid grid-cols-2 items-center">
+					{#if browser && $features.beta}
 						<Setting
 							id="isAutoUpdateEnabled"
 							bind:setting={isAutoUpdateEnabled}
@@ -370,7 +351,7 @@
 							description={$t('setting.auto_update_enabled_explainer')}
 							on:click={() => changeSettings('isAutoUpdateEnabled')}
 						/>
-					</div>
+					{/if}
 				</div>
 			</form>
 		</div>
--- a/apps/ui/src/routes/settings/ssh-keys.svelte
+++ b/apps/ui/src/routes/settings/ssh-keys.svelte
@@ -61,10 +61,13 @@
 	<div class="mr-4 text-2xl tracking-tight">{$t('index.settings')}</div>
 </div>
 <div class="mx-auto w-full">
-	<div class="flex flex-row">
+	<div class="flex lg:flex-row flex-col">
 		<Menu />
-		<div class="grid grid-flow-row gap-2 py-4">
-			<div class="flex space-x-1 pb-6">
+		<div class="flex flex-col mt-5">
+			<div
+					class="flex flex-col space-y-4 p-6 lg:p-0 lg:flex-row lg:space-y0 lg:space-x-4 w-full lg:justify-between lg:items-center mb-5"
+					style="min-width: 83vw"
+				>
 				<div class="title font-bold">SSH Keys</div>
 				<button
 					on:click={() => (isModalActive = true)}
@@ -72,7 +75,7 @@
 					disabled={loading.save}>New SSH Key</button
 				>
 			</div>
-			<div class="grid grid-flow-col gap-2 px-10">
+			<div class="grid grid-flow-col gap-2 lg:px-10 px-6">
 				{#if sshKeys.length === 0}
 					<div class="text-sm ">No SSH keys found</div>
 				{:else}
--- a/apps/ui/src/routes/sources/[id]/_Github.svelte
+++ b/apps/ui/src/routes/sources/[id]/_Github.svelte
@@ -90,37 +90,33 @@
 	}
 </script>

-<div class="mx-auto max-w-4xl px-6">
+<div class="mx-auto max-w-4xl lg:px-6 px-3">
 	{#if !source.githubAppId}
 		<form on:submit|preventDefault={newGithubApp} class="py-4">
 			<div class="grid gap-1 lg:grid-flow-col pb-7">
-				<div class="title">General</div>
+				<h1 class="title">General</h1>
 				{#if !source.githubAppId}
-					<button class="btn btn-sm bg-sources" type="submit">Save & Redirect to GitHub</button>
+					<div class="w-full flex flex-rpw justify-end">
+						<button class="btn btn-sm bg-sources mt-5 w-full lg:w-fit" type="submit"
+							>Save & Redirect to GitHub</button
+						>
+					</div>
 				{/if}
 			</div>
-			<div class="grid grid-flow-row gap-2 px-10">
-				<div class="grid grid-flow-row gap-2">
-					<div class="mt-2 grid lg:grid-cols-2 items-center">
+			<div class="grid gap-4 grid-cols-2 auto-rows-max">
 				<label for="name" class="text-base font-bold text-stone-100">Name</label>
-						<input name="name" id="name" required bind:value={source.name} />
-					</div>
-				</div>
-				<div class="grid lg:grid-cols-2 items-center">
+				<input class="w-full" name="name" id="name" required bind:value={source.name} />
 				<label for="htmlUrl" class="text-base font-bold text-stone-100">HTML URL</label>
-					<input name="htmlUrl" id="htmlUrl" required bind:value={source.htmlUrl} />
-				</div>
-				<div class="grid lg:grid-cols-2 items-center">
+				<input class="w-full" name="htmlUrl" id="htmlUrl" required bind:value={source.htmlUrl} />
 				<label for="apiUrl" class="text-base font-bold text-stone-100">API URL</label>
-					<input name="apiUrl" id="apiUrl" required bind:value={source.apiUrl} />
-				</div>
-				<div class="grid lg:grid-cols-2 items-center">
+				<input class="w-full" name="apiUrl" id="apiUrl" required bind:value={source.apiUrl} />
 				<label for="customPort" class="text-base font-bold text-stone-100"
 					>Custom SSH Port <Explainer
 						explanation={'If you use a self-hosted version of Git, you can provide custom port for all the Git related actions.'}
 					/></label
 				>
 				<input
+					class="w-full"
 					name="customPort"
 					id="customPort"
 					disabled={!selfHosted || source.githubAppId}
@@ -128,31 +124,27 @@
 					required
 					value={source.customPort}
 				/>
-				</div>
-				<div class="grid lg:grid-cols-2">
-					<div class="flex flex-col">
 				<label for="organization" class="pt-2 text-base font-bold text-stone-100"
 					>Organization
 					<Explainer
 						explanation={"Fill it if you would like to use an organization's as your Git Source. Otherwise your user will be used."}
 					/></label
 				>
-					</div>
 				<input
+					class="w-full"
 					name="organization"
 					id="organization"
 					placeholder="eg: coollabsio"
 					bind:value={source.organization}
 				/>
 			</div>
-			</div>
 		</form>
 	{:else if source.githubApp?.installationId}
 		<form on:submit|preventDefault={handleSubmit} class="py-4">
-			<div class="flex md:flex-row space-y-2 md:space-y-0 space-x-0 md:space-x-2 flex-col pb-5">
-				<div class="title">{$t('general')}</div>
-
+			<div class="flex lg:flex-row lg:justify-between flex-col space-y-3 w-full lg:items-center">
+				<h1 class="title">{$t('general')}</h1>
 				{#if $appSession.isAdmin}
+					<div class="flex flex-col lg:flex-row lg:space-x-4 lg:w-fit space-y-4 lg:space-y-0 w-full">
 						<button class="btn btn-sm bg-sources" type="submit" disabled={loading}
 							>{loading ? 'Saving...' : 'Save'}</button
 						>
@@ -163,18 +155,15 @@
 							}/${source.githubApp.name}/installations/new`}
 							>{$t('source.change_app_settings', { name: 'GitHub' })}</a
 						>
+					</div>
 				{/if}
 			</div>
-			<div class="grid grid-flow-row gap-2 px-10">
-				<div class="grid grid-flow-row gap-2">
-					<div class="mt-2 grid lg:grid-cols-2 items-center">
+			<div class="grid gap-4 grid-cols-2 auto-rows-max mt-4">
 				<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
-						<input name="name" id="name" required bind:value={source.name} />
-					</div>
-				</div>
-				<div class="grid lg:grid-cols-2 items-center">
+				<input class="w-full" name="name" id="name" required bind:value={source.name} />
 				<label for="htmlUrl" class="text-base font-bold text-stone-100">HTML URL</label>
 				<input
+					class="w-full"
 					name="htmlUrl"
 					id="htmlUrl"
 					disabled={source.githubAppId}
@@ -182,10 +171,9 @@
 					required
 					bind:value={source.htmlUrl}
 				/>
-				</div>
-				<div class="grid lg:grid-cols-2 items-center">
 				<label for="apiUrl" class="text-base font-bold text-stone-100">API URL</label>
 				<input
+					class="w-full"
 					name="apiUrl"
 					id="apiUrl"
 					required
@@ -193,15 +181,13 @@
 					readonly={source.githubAppId}
 					bind:value={source.apiUrl}
 				/>
-				</div>
-				{#if selfHosted}
-					<div class="grid lg:grid-cols-2 items-center">
 				<label for="customPort" class="text-base font-bold text-stone-100"
 					>Custom SSH Port <Explainer
 						explanation="If you use a self-hosted version of Git, you can provide custom port for all the Git related actions."
 					/></label
 				>
 				<input
+					class="w-full"
 					name="customPort"
 					id="customPort"
 					disabled={!selfHosted}
@@ -209,15 +195,11 @@
 					required
 					value={source.customPort}
 				/>
-					</div>
-				{/if}
-				<div class="grid lg:grid-cols-2">
-					<div class="flex flex-col">
 				<label for="organization" class="pt-2 text-base font-bold text-stone-100"
 					>Organization</label
 				>
-					</div>
 				<input
+					class="w-full"
 					readonly
 					disabled
 					name="organization"
@@ -226,7 +208,6 @@
 					bind:value={source.organization}
 				/>
 			</div>
-			</div>
 		</form>
 	{:else}
 		<div class="text-center">
--- a/apps/ui/src/routes/sources/[id]/_Gitlab.svelte
+++ b/apps/ui/src/routes/sources/[id]/_Gitlab.svelte
@@ -145,8 +145,9 @@

 <div class="mx-auto max-w-4xl px-6">
 	<form on:submit|preventDefault={handleSubmit} class="py-4">
-		<div class="flex space-x-1 pb-7">
-			<div class="title">General</div>
+		<div class="flex lg:flex-row lg:justify-between flex-col space-y-3 w-full lg:items-center">
+			<h1 class="title">General</h1>
+			<div class="flex flex-col lg:flex-row lg:space-x-4 lg:w-fit space-y-4 lg:space-y-0 w-full">
 				{#if $appSession.isAdmin}
 					<button type="submit" class="btn btn-sm bg-sources" disabled={loading}
 						>{loading ? $t('forms.saving') : $t('forms.save')}</button
@@ -162,7 +163,8 @@
 					{/if}
 				{/if}
 			</div>
-		<div class="grid grid-flow-row gap-2 px-10">
+		</div>
+		<div class="grid grid-flow-row gap-2 lg:px-10">
 			{#if !source.gitlabAppId}
 				<a
 					href="https://docs.coollabs.io/coolify/sources#how-to-integrate-with-gitlab"
@@ -172,7 +174,7 @@
 				>
 				<div class="grid grid-cols-2 items-center">
 					<label for="type" class="text-base font-bold text-stone-100">Application Type</label>
-					<select name="type" id="type" class="w-96" bind:value={applicationType}>
+					<select name="type" id="type" class="lg:w-96 w-full" bind:value={applicationType}>
 						<option value="user">{$t('source.gitlab.user_owned')}</option>
 						<option value="group">{$t('source.gitlab.group_owned')}</option>
 						{#if source.htmlUrl !== 'https://gitlab.com'}
@@ -185,6 +187,7 @@
 					<div class="grid grid-cols-2 items-center">
 						<label for="groupName" class="text-base font-bold text-stone-100">Group Name</label>
 						<input
+							class="w-full"
 							name="groupName"
 							id="groupName"
 							required
@@ -197,12 +200,29 @@
 			<div class="grid grid-flow-row gap-2">
 				<div class="mt-2 grid grid-cols-2 items-center">
 					<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
-					<input name="name" id="name" required bind:value={source.name} />
+					<input class="w-full" name="name" id="name" required bind:value={source.name} />
 				</div>
 			</div>
+			{#if source.gitlabApp.groupName}
+				<div class="grid grid-cols-2 items-center">
+					<label for="groupName" class="text-base font-bold text-stone-100"
+						>{$t('source.group_name')}</label
+					>
+					<input
+						class="w-full"
+						name="groupName"
+						id="groupName"
+						disabled={source.gitlabAppId}
+						readonly={source.gitlabAppId}
+						required
+						bind:value={source.gitlabApp.groupName}
+					/>
+				</div>
+			{/if}
 			<div class="grid grid-cols-2 items-center">
 				<label for="htmlUrl" class="text-base font-bold text-stone-100">HTML URL</label>
 				<input
+					class="w-full"
 					name="htmlUrl"
 					id="htmlUrl"
 					required
@@ -214,6 +234,7 @@
 			<div class="grid grid-cols-2 items-center">
 				<label for="apiUrl" class="text-base font-bold text-stone-100">API URL</label>
 				<input
+					class="w-full"
 					name="apiUrl"
 					id="apiUrl"
 					disabled={source.gitlabAppId}
@@ -230,6 +251,7 @@
 						/></label
 					>
 					<input
+						class="w-full"
 						name="customPort"
 						id="customPort"
 						disabled={!selfHosted}
@@ -249,6 +271,7 @@
 					>
 				</div>
 				<input
+					class="w-full"
 					disabled={source.gitlabAppId}
 					readonly={source.gitlabAppId}
 					on:change={checkOauthId}
@@ -266,6 +289,7 @@
 					>{$t('source.application_id')}</label
 				>
 				<input
+					class="w-full"
 					name="appId"
 					id="appId"
 					disabled={source.gitlabAppId}
--- a/apps/ui/src/routes/sources/_index.svelte
+++ b/apps/ui/src/routes/sources/_index.svelte
@@ -36,8 +36,8 @@
 	});
 </script>

-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">{$t('index.git_sources')}</div>
+<nav class="header">
+	<h1 class="mr-4 text-2xl font-bold">{$t('index.git_sources')}</h1>
 	{#if $appSession.isAdmin}
 		<a href="/sources/new" class="btn btn-square btn-sm bg-sources">
 			<svg
@@ -55,8 +55,9 @@
 			>
 		</a>
 	{/if}
-</div>
-<div class="flex-col justify-center mt-10 pb-12 sm:pb-16">
+</nav>
+<br />
+<div class="flex-col justify-center mt-10 pb-12 sm:pb-16 lg:pt-16">
 	{#if !sources || ownSources.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">{$t('source.no_git_sources_found')}</div>
--- a/apps/ui/src/tailwind.css
+++ b/apps/ui/src/tailwind.css
@@ -97,7 +97,7 @@ a {
 }

 .title {
-	@apply mr-4 text-base tracking-tight md:text-2xl font-bold;
+	@apply mr-4 tracking-tight text-2xl font-bold;
 }
 .nav-main {
 	@apply fixed top-0 left-0 min-h-screen w-16 min-w-[4rem] overflow-hidden border-r border-stone-800 bg-coolgray-200 scrollbar-w-1  scrollbar-thumb-coollabs scrollbar-track-coolgray-200 xl:overflow-visible;
@@ -200,3 +200,7 @@ a {
 input {
 	@apply w-48 lg:w-96;
 }
+
+.header {
+	@apply flex flex-row px-4 justify-between items-center bg-neutral-focus z-10 w-full mb-10;
+}