diff --git a/apps/ui/src/lib/components/CopyPasswordField.svelte b/apps/ui/src/lib/components/CopyPasswordField.svelte
index f26d1b411..14a3ca376 100644
--- a/apps/ui/src/lib/components/CopyPasswordField.svelte
+++ b/apps/ui/src/lib/components/CopyPasswordField.svelte
@@ -13,6 +13,7 @@
 	export let id: string;
 	export let name: string;
 	export let placeholder = '';
+	export let inputStyle = '';
 
 	let disabledClass = 'bg-coolback disabled:bg-coolblack w-full';
 	let isHttps = browser && window.location.protocol === 'https:';
@@ -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}
diff --git a/apps/ui/src/routes/applications/[id]/_Secret.svelte b/apps/ui/src/routes/applications/[id]/_Secret.svelte
index d44c2396e..60244426a 100644
--- 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">
diff --git a/apps/ui/src/routes/applications/[id]/configuration/_BuildPack.svelte b/apps/ui/src/routes/applications/[id]/configuration/_BuildPack.svelte
index c7d7ad464..89625336b 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/_BuildPack.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/_BuildPack.svelte
@@ -37,7 +37,7 @@
 	}
 </script>
 
-<form class="lg:pt-32" on:submit|preventDefault={() => handleSubmit(buildPack.name)}>
+<form on:submit|preventDefault={() => handleSubmit(buildPack.name)}>
 	<button
 		type="submit"
 		class="box-selection relative flex text-xl font-bold {buildPack.hoverColor} {foundConfig?.name ===
diff --git a/apps/ui/src/routes/applications/[id]/configuration/_GithubRepositories.svelte b/apps/ui/src/routes/applications/[id]/configuration/_GithubRepositories.svelte
index 1e232c787..922c2b174 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/_GithubRepositories.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/_GithubRepositories.svelte
@@ -145,14 +145,14 @@
 </script>
 
 {#if repositories.length === 0 && loading.repositories === false}
-	<div class="flex-col text-center lg:pt-32">
+	<div class="flex-col text-center">
 		<div class="pb-4">{$t('application.configuration.no_repositories_configured')}</div>
 		<a href={`/sources/${application.gitSource.id}`}
 			><button>{$t('application.configuration.configure_it_now')}</button></a
 		>
 	</div>
 {:else}
-	<form on:submit|preventDefault={handleSubmit} class="flex flex-col justify-center text-center lg:pt-32">
+	<form on:submit|preventDefault={handleSubmit} class="flex flex-col justify-center text-center">
 		<div class="flex-col space-y-3 md:space-y-0 space-x-1">
 			<div class="flex-row md:flex gap-4">
 				<div class="custom-select-wrapper">
diff --git a/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte b/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
index 616f2b793..3da8c6415 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
@@ -327,7 +327,7 @@
 	}
 </script>
 
-<form on:submit={handleSubmit} lg:pt-32>
+<form on:submit={handleSubmit}>
 	<div class="flex flex-col space-y-2 px-4 xl:flex-row xl:space-y-0 xl:space-x-2 ">
 		<div class="custom-select-wrapper">
 			<Select
diff --git a/apps/ui/src/routes/applications/[id]/configuration/_PublicRepository.svelte b/apps/ui/src/routes/applications/[id]/configuration/_PublicRepository.svelte
index 5824cfa19..024b656da 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/_PublicRepository.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/_PublicRepository.svelte
@@ -156,7 +156,7 @@
 	}
 </script>
 
-<div class="mx-auto max-w-5xl lg:pt-32">
+<div class="mx-auto max-w-5xl">
 	<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}
diff --git a/apps/ui/src/routes/applications/[id]/configuration/buildpack.svelte b/apps/ui/src/routes/applications/[id]/configuration/buildpack.svelte
index 75a7e42ff..fc83fe6a6 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/buildpack.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/buildpack.svelte
@@ -254,7 +254,7 @@
 	});
 </script>
 
-<div class="flex space-x-1 p-6 font-bold lg:pt-32">
+<div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">
 		{$t('application.configuration.configure_build_pack')}
 	</div>
diff --git a/apps/ui/src/routes/applications/[id]/configuration/database.svelte b/apps/ui/src/routes/applications/[id]/configuration/database.svelte
index 74fe899eb..919682b00 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/database.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/database.svelte
@@ -63,7 +63,7 @@
 	}
 </script>
 
-<div class="flex space-x-1 p-6 font-bold lg:pt-32">
+<div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">Select a Database</div>
 </div>
 
diff --git a/apps/ui/src/routes/applications/[id]/configuration/destination.svelte b/apps/ui/src/routes/applications/[id]/configuration/destination.svelte
index 6c8c50eb1..2f0efe2d3 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/destination.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/destination.svelte
@@ -63,7 +63,7 @@
 	});
 </script>
 
-<div class="flex space-x-1 p-6 font-bold lg:pt-32">
+<div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">
 		{$t('application.configuration.configure_destination')}
 	</div>
diff --git a/apps/ui/src/routes/applications/[id]/configuration/repository.svelte b/apps/ui/src/routes/applications/[id]/configuration/repository.svelte
index e44d04537..002e1f74c 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/repository.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/repository.svelte
@@ -36,7 +36,7 @@
 	import GitlabRepositories from './_GitlabRepositories.svelte';
 </script>
 
-<div class="flex space-x-1 p-6 font-bold lg:pt-32">
+<div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">
 		{$t('application.configuration.select_a_repository_project')}
 	</div>
diff --git a/apps/ui/src/routes/applications/[id]/configuration/source.svelte b/apps/ui/src/routes/applications/[id]/configuration/source.svelte
index 35b263834..c0d01c5f2 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/source.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/source.svelte
@@ -68,7 +68,7 @@
 	}
 </script>
 
-<div class="flex space-x-1 p-6 font-bold lg:pt-32">
+<div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">
 		{$t('application.configuration.select_a_git_source')}
 	</div>
diff --git a/apps/ui/src/routes/applications/[id]/index.svelte b/apps/ui/src/routes/applications/[id]/index.svelte
index 345600284..097998d52 100644
--- a/apps/ui/src/routes/applications/[id]/index.svelte
+++ b/apps/ui/src/routes/applications/[id]/index.svelte
@@ -348,7 +348,7 @@
 	{/if}
 </div>
 
-<div class="mx-auto max-w-4xl px-6 pt-4 lg:pt-32">
+<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">
diff --git a/apps/ui/src/routes/applications/[id]/previews.svelte b/apps/ui/src/routes/applications/[id]/previews.svelte
index 2942b2954..a79967ba0 100644
--- 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
diff --git a/apps/ui/src/routes/applications/[id]/secrets.svelte b/apps/ui/src/routes/applications/[id]/secrets.svelte
index 8570d0546..7ad5e617e 100644
--- a/apps/ui/src/routes/applications/[id]/secrets.svelte
+++ b/apps/ui/src/routes/applications/[id]/secrets.svelte
@@ -67,87 +67,41 @@
 	}
 </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">
-	<table class="mx-auto border-separate text-left">
-		<thead>
-			<tr class="h-12">
-				<th scope="col">{$t('forms.name')}</th>
-				<th scope="col">{$t('forms.value')}</th>
-				<th scope="col" class="w-64 text-center"
-					>{$t('application.preview.need_during_buildtime')}</th
-				>
-				<th scope="col" class="w-96 text-center">{$t('forms.action')}</th>
-			</tr>
-		</thead>
-		<tbody>
-			{#each secrets as secret}
-				{#key secret.id}
-					<tr>
-						<Secret
-							name={secret.name}
-							value={secret.value}
-							isBuildSecret={secret.isBuildSecret}
-							on:refresh={refreshSecrets}
-						/>
-					</tr>
-				{/key}
-			{/each}
-			<tr>
-				<Secret isNewSecret on:refresh={refreshSecrets} />
-			</tr>
-		</tbody>
-	</table>
+	<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">
+					<th scope="col">{$t('forms.name')}</th>
+					<th scope="col">{$t('forms.value')}</th>
+					<th scope="col" class="w-64 text-center"
+						>{$t('application.preview.need_during_buildtime')}</th
+					>
+					<th scope="col" class="w-96 text-center">{$t('forms.action')}</th>
+				</tr>
+			</thead>
+			<tbody>
+				{#each secrets as secret}
+					{#key secret.id}
+						<tr>
+							<Secret
+								name={secret.name}
+								value={secret.value}
+								isBuildSecret={secret.isBuildSecret}
+								on:refresh={refreshSecrets}
+							/>
+						</tr>
+					{/key}
+				{/each}
+				<tr>
+					<Secret isNewSecret on:refresh={refreshSecrets} />
+				</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" />
diff --git a/apps/ui/src/routes/applications/[id]/storages.svelte b/apps/ui/src/routes/applications/[id]/storages.svelte
index c8847582d..5db4eefff 100644
--- 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">
diff --git a/apps/ui/src/routes/databases/[id]/index.svelte b/apps/ui/src/routes/databases/[id]/index.svelte
index 9717b6241..d9d579311 100644
--- a/apps/ui/src/routes/databases/[id]/index.svelte
+++ b/apps/ui/src/routes/databases/[id]/index.svelte
@@ -58,7 +58,7 @@
 	<DatabaseLinks {database} />
 </div>
 
-<div class="mx-auto max-w-4xl  p-5 lg:pt-32">
+<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">
diff --git a/apps/ui/src/routes/index.svelte b/apps/ui/src/routes/index.svelte
index b7bfa23b6..a12b5a1a4 100644
--- a/apps/ui/src/routes/index.svelte
+++ b/apps/ui/src/routes/index.svelte
@@ -281,7 +281,7 @@
 		<NewResource />
 	{/if}
 </nav>
-<div class="container lg:mx-auto lg:p-0 px-8 lg:pt-24 pt-5">
+<div class="container lg:mx-auto lg:p-0 px-8 pt-5">
 	<!-- {#if $appSession.teamId === '0'}
 		<Usage />
 	{/if} -->
diff --git a/apps/ui/src/routes/services/[id]/_Secret.svelte b/apps/ui/src/routes/services/[id]/_Secret.svelte
index 8c92d9143..be9d41ce0 100644
--- 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>
 
diff --git a/apps/ui/src/routes/services/[id]/index.svelte b/apps/ui/src/routes/services/[id]/index.svelte
index d40a6e901..0b27bb325 100644
--- a/apps/ui/src/routes/services/[id]/index.svelte
+++ b/apps/ui/src/routes/services/[id]/index.svelte
@@ -59,7 +59,7 @@
 	</div>
 	<ServiceLinks {service} />
 </div>
-<div class="mx-auto max-w-4xl px-6 py-4 lg:pt-32">
+<div class="mx-auto max-w-4xl px-6 py-4">
 	<div class="text-2xl font-bold">Service Usage</div>
 	<div class="text-center">
 		<div class="stat w-64">
diff --git a/apps/ui/src/routes/services/[id]/secrets.svelte b/apps/ui/src/routes/services/[id]/secrets.svelte
index 924b33946..3211804cc 100644
--- a/apps/ui/src/routes/services/[id]/secrets.svelte
+++ b/apps/ui/src/routes/services/[id]/secrets.svelte
@@ -68,64 +68,33 @@
 	}
 </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">
-		<thead>
-			<tr class="h-12">
-				<th scope="col">{$t('forms.name')}</th>
-				<th scope="col">{$t('forms.value')}</th>
-				<th scope="col" class="w-96 text-center">{$t('forms.action')}</th>
-			</tr>
-		</thead>
-		<tbody>
-			{#each secrets as secret}
-				{#key secret.id}
-					<tr>
-						<Secret name={secret.name} value={secret.value} on:refresh={refreshSecrets} />
-					</tr>
-				{/key}
-			{/each}
-			<tr>
-				<Secret isNewSecret on:refresh={refreshSecrets} />
-			</tr>
-		</tbody>
-	</table>
+	<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>
+					<th scope="col">{$t('forms.value')}</th>
+					<th scope="col" class="w-96 text-center">{$t('forms.action')}</th>
+				</tr>
+			</thead>
+			<tbody>
+				{#each secrets as secret}
+					{#key secret.id}
+						<tr>
+							<Secret name={secret.name} value={secret.value} on:refresh={refreshSecrets} />
+						</tr>
+					{/key}
+				{/each}
+				<tr>
+					<Secret isNewSecret on:refresh={refreshSecrets} />
+				</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" />
diff --git a/apps/ui/src/tailwind.css b/apps/ui/src/tailwind.css
index 3954d8568..899052cb9 100644
--- a/apps/ui/src/tailwind.css
+++ b/apps/ui/src/tailwind.css
@@ -202,5 +202,5 @@ input {
 }
 
 .header {
-	@apply flex flex-row px-4 justify-between items-center bg-neutral-focus z-10 w-full;
+	@apply flex flex-row px-4 justify-between items-center bg-neutral-focus z-10 w-full mb-10;
 }
\ No newline at end of file