diff --git a/src/lib/components/DatabaseLinks.svelte b/src/lib/components/DatabaseLinks.svelte
new file mode 100644
index 000000000..9ef11a238
--- /dev/null
+++ b/src/lib/components/DatabaseLinks.svelte
@@ -0,0 +1,25 @@
+<script>
+	export let database;
+	import Clickhouse from './svg/databases/Clickhouse.svelte';
+	import CouchDb from './svg/databases/CouchDB.svelte';
+	import MongoDb from './svg/databases/MongoDB.svelte';
+	import MySql from './svg/databases/MySQL.svelte';
+	import PostgreSql from './svg/databases/PostgreSQL.svelte';
+	import Redis from './svg/databases/Redis.svelte';
+</script>
+
+<span class="relative">
+	{#if database.type === 'clickhouse'}
+		<Clickhouse />
+	{:else if database.type === 'couchdb'}
+		<CouchDb />
+	{:else if database.type === 'mongodb'}
+		<MongoDb />
+	{:else if database.type === 'mysql'}
+		<MySql />
+	{:else if database.type === 'postgresql'}
+		<PostgreSql />
+	{:else if database.type === 'redis'}
+		<Redis />
+	{/if}
+</span>
diff --git a/src/lib/components/ServiceLinks.svelte b/src/lib/components/ServiceLinks.svelte
new file mode 100644
index 000000000..a3b4ce2cd
--- /dev/null
+++ b/src/lib/components/ServiceLinks.svelte
@@ -0,0 +1,55 @@
+<script>
+	export let service;
+	import Ghost from './svg/services/Ghost.svelte';
+	import LanguageTool from './svg/services/LanguageTool.svelte';
+	import MinIo from './svg/services/MinIO.svelte';
+	import N8n from './svg/services/N8n.svelte';
+	import NocoDb from './svg/services/NocoDB.svelte';
+	import PlausibleAnalytics from './svg/services/PlausibleAnalytics.svelte';
+	import UptimeKuma from './svg/services/UptimeKuma.svelte';
+	import VaultWarden from './svg/services/VaultWarden.svelte';
+	import VsCodeServer from './svg/services/VSCodeServer.svelte';
+	import Wordpress from './svg/services/Wordpress.svelte';
+</script>
+
+{#if service.type === 'plausibleanalytics'}
+	<a href="https://plausible.io" target="_blank">
+		<PlausibleAnalytics />
+	</a>
+{:else if service.type === 'nocodb'}
+	<a href="https://nocodb.com" target="_blank">
+		<NocoDb />
+	</a>
+{:else if service.type === 'minio'}
+	<a href="https://min.io" target="_blank">
+		<MinIo />
+	</a>
+{:else if service.type === 'vscodeserver'}
+	<a href="https://coder.com" target="_blank">
+		<VsCodeServer />
+	</a>
+{:else if service.type === 'wordpress'}
+	<a href="https://wordpress.org" target="_blank">
+		<Wordpress />
+	</a>
+{:else if service.type === 'vaultwarden'}
+	<a href="https://github.com/dani-garcia/vaultwarden" target="_blank">
+		<VaultWarden />
+	</a>
+{:else if service.type === 'languagetool'}
+	<a href="https://languagetool.org/dev" target="_blank">
+		<LanguageTool />
+	</a>
+{:else if service.type === 'n8n'}
+	<a href="https://n8n.io" target="_blank">
+		<N8n />
+	</a>
+{:else if service.type === 'uptimekuma'}
+	<a href="https://github.com/louislam/uptime-kuma" target="_blank">
+		<UptimeKuma />
+	</a>
+{:else if service.type === 'ghost'}
+	<a href="https://ghost.org" target="_blank">
+		<Ghost />
+	</a>
+{/if}
diff --git a/src/routes/applications/[id]/__layout.svelte b/src/routes/applications/[id]/__layout.svelte
index 4a79bba44..7c6f528b7 100644
--- a/src/routes/applications/[id]/__layout.svelte
+++ b/src/routes/applications/[id]/__layout.svelte
@@ -255,9 +255,9 @@
 				class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/secrets`}
 			>
 				<button
-					title="Secrets"
+					title="Environment Variables"
 					class="icons bg-transparent tooltip-bottom text-sm disabled:text-red-500"
-					data-tooltip="Secrets"
+					data-tooltip="Environment Variables"
 				>
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
diff --git a/src/routes/applications/[id]/index.svelte b/src/routes/applications/[id]/index.svelte
index 8b94d4795..0f0c77fb0 100644
--- a/src/routes/applications/[id]/index.svelte
+++ b/src/routes/applications/[id]/index.svelte
@@ -143,9 +143,13 @@
 </script>
 
 <div class="flex items-center space-x-2 p-5 px-6 font-bold">
-	<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
-		{application.name}
+	<div class="-mb-6 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.fqdn}
 		<a
 			href={application.fqdn}
@@ -303,14 +307,14 @@
 		<div class="grid grid-flow-row gap-2 px-10">
 			<div class="grid grid-cols-2">
 				<div class="flex-col">
-					<label for="fqdn" class="pt-2 text-base font-bold text-stone-100">Domain (FQDN)</label>
+					<label for="fqdn" class="pt-2 text-base font-bold text-stone-100">URL (FQDN)</label>
 					{#if browser && window.location.hostname === 'demo.coolify.io'}
 						<Explainer
-							text="<span class='text-white font-bold'>You can use the predefined random domain name or enter your own domain name.</span>"
+							text="<span class='text-white font-bold'>You can use the predefined random url name or enter your own domain name.</span>"
 						/>
 					{/if}
 					<Explainer
-						text="If you specify <span class='text-green-500 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-green-500 font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the domain, you must first stop the application.<br><br><span class='text-white font-bold'>You must set your DNS to point to the server IP in advance.</span>"
+						text="If you specify <span class='text-green-500 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-green-500 font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the url, you must first stop the application.<br><br><span class='text-white font-bold'>You must set your DNS to point to the server IP in advance.</span>"
 					/>
 				</div>
 				<input
diff --git a/src/routes/applications/[id]/logs/build/index.svelte b/src/routes/applications/[id]/logs/build/index.svelte
index e4c5c4ec9..6af35e417 100644
--- a/src/routes/applications/[id]/logs/build/index.svelte
+++ b/src/routes/applications/[id]/logs/build/index.svelte
@@ -85,10 +85,75 @@
 	}
 </script>
 
-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">
-		Build logs of <a href={application.fqdn} target="_blank">{getDomain(application.fqdn)}</a>
+<div class="flex items-center space-x-2 p-5 px-6 font-bold">
+	<div class="-mb-6 flex-col">
+		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">Build Logs</div>
+		<span class="text-xs">{application.name} </span>
 	</div>
+
+	{#if application.fqdn}
+		<a
+			href={application.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}
+	<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>
 </div>
 <div class="block flex-row justify-start space-x-2 px-5 pt-6 sm:px-10 md:flex">
 	<div class="mb-4 min-w-[16rem] space-y-2 md:mb-0 ">
diff --git a/src/routes/applications/[id]/logs/index.svelte b/src/routes/applications/[id]/logs/index.svelte
index 036832f6c..5b466039f 100644
--- a/src/routes/applications/[id]/logs/index.svelte
+++ b/src/routes/applications/[id]/logs/index.svelte
@@ -68,10 +68,77 @@
 	}
 </script>
 
-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">
-		Application logs of <a href={application.fqdn} target="_blank">{getDomain(application.fqdn)}</a>
+<div class="flex items-center space-x-2 p-5 px-6 font-bold">
+	<div class="-mb-6 flex-col">
+		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
+			Application Logs
+		</div>
+		<span class="text-xs">{application.name} </span>
 	</div>
+
+	{#if application.fqdn}
+		<a
+			href={application.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}
+	<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>
 </div>
 <div class="flex flex-row justify-center space-x-2 px-10 pt-6">
 	{#if logs.length === 0}
diff --git a/src/routes/applications/[id]/previews/index.svelte b/src/routes/applications/[id]/previews/index.svelte
index e78e46efd..546d9c5d7 100644
--- a/src/routes/applications/[id]/previews/index.svelte
+++ b/src/routes/applications/[id]/previews/index.svelte
@@ -50,14 +50,88 @@
 	}
 </script>
 
-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">
-		Previews for <a href={application.fqdn} target="_blank">{getDomain(application.fqdn)}</a>
+<div class="flex items-center space-x-2 p-5 px-6 font-bold">
+	<div class="-mb-6 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>
-</div>
 
-{#if applicationSecrets.length !== 0}
-	<div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
+	{#if application.fqdn}
+		<a
+			href={application.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}
+	<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>
+</div>
+<div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
+	<div class="flex justify-center py-4 text-center">
+		<Explainer
+			customClass="w-full"
+			text={applicationSecrets.length === 0
+				? "You can add secrets to PR/MR deployments. Please add secrets to the application first. <br>Useful for creating <span class='text-green-500 font-bold'>staging</span> environments."
+				: "These values overwrite application secrets in PR/MR deployments. Useful for creating <span class='text-green-500 font-bold'>staging</span> environments."}
+		/>
+	</div>
+	{#if applicationSecrets.length !== 0}
 		<table class="mx-auto border-separate text-left">
 			<thead>
 				<tr class="h-12">
@@ -84,16 +158,9 @@
 				{/each}
 			</tbody>
 		</table>
-	</div>
-{/if}
-<div class="flex justify-center py-4 text-center">
-	<Explainer
-		customClass="w-full"
-		text={applicationSecrets.length === 0
-			? "You can add secrets to PR/MR deployments. Please add secrets to the application first. <br>Useful for creating <span class='text-green-500 font-bold'>staging</span> environments."
-			: "These values overwrite application secrets in PR/MR deployments. Useful for creating <span class='text-green-500 font-bold'>staging</span> environments."}
-	/>
+	{/if}
 </div>
+
 <div class="mx-auto max-w-4xl py-10">
 	<div class="flex flex-wrap justify-center space-x-2">
 		{#if containers.length > 0}
diff --git a/src/routes/applications/[id]/secrets/index.svelte b/src/routes/applications/[id]/secrets/index.svelte
index faeb22361..ce1a54b78 100644
--- a/src/routes/applications/[id]/secrets/index.svelte
+++ b/src/routes/applications/[id]/secrets/index.svelte
@@ -35,10 +35,75 @@
 	}
 </script>
 
-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">
-		Secrets for <a href={application.fqdn} target="_blank">{getDomain(application.fqdn)}</a>
+<div class="flex items-center space-x-2 p-5 px-6 font-bold">
+	<div class="-mb-6 flex-col">
+		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">Secrets</div>
+		<span class="text-xs">{application.name} </span>
 	</div>
+
+	{#if application.fqdn}
+		<a
+			href={application.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}
+	<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>
 </div>
 <div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
 	<table class="mx-auto border-separate text-left">
diff --git a/src/routes/applications/[id]/storage/index.svelte b/src/routes/applications/[id]/storage/index.svelte
index 75b129d68..aa566678e 100644
--- a/src/routes/applications/[id]/storage/index.svelte
+++ b/src/routes/applications/[id]/storage/index.svelte
@@ -36,12 +36,77 @@
 	}
 </script>
 
-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">
-		Persistent storage for <a href={application.fqdn} target="_blank"
-			>{getDomain(application.fqdn)}</a
-		>
+<div class="flex items-center space-x-2 p-5 px-6 font-bold">
+	<div class="-mb-6 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.fqdn}
+		<a
+			href={application.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}
+	<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>
 </div>
 
 <div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
diff --git a/src/routes/databases/[id]/index.svelte b/src/routes/databases/[id]/index.svelte
index d7d262699..c7c51032e 100644
--- a/src/routes/databases/[id]/index.svelte
+++ b/src/routes/databases/[id]/index.svelte
@@ -31,37 +31,20 @@
 </script>
 
 <script lang="ts">
-	import Clickhouse from '$lib/components/svg/databases/Clickhouse.svelte';
-	import CouchDb from '$lib/components/svg/databases/CouchDB.svelte';
-	import MongoDb from '$lib/components/svg/databases/MongoDB.svelte';
-	import MySql from '$lib/components/svg/databases/MySQL.svelte';
-	import PostgreSql from '$lib/components/svg/databases/PostgreSQL.svelte';
-	import Redis from '$lib/components/svg/databases/Redis.svelte';
-
+	import DatabaseLinks from '$lib/components/DatabaseLinks.svelte';
 	export let database;
 	export let settings;
 	export let privatePort;
 </script>
 
 <div class="flex items-center space-x-2 p-6 text-2xl font-bold">
-	<div class="md:max-w-64 truncate text-base tracking-tight md:block md:text-2xl">
-		{database.name}
+	<div class="-mb-6 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>
-	<span class="relative">
-		{#if database.type === 'clickhouse'}
-			<Clickhouse />
-		{:else if database.type === 'couchdb'}
-			<CouchDb />
-		{:else if database.type === 'mongodb'}
-			<MongoDb />
-		{:else if database.type === 'mysql'}
-			<MySql />
-		{:else if database.type === 'postgresql'}
-			<PostgreSql />
-		{:else if database.type === 'redis'}
-			<Redis />
-		{/if}
-	</span>
+	<DatabaseLinks {database} />
 </div>
 
 <Databases bind:database {privatePort} {settings} />
diff --git a/src/routes/services/[id]/_Services/_Services.svelte b/src/routes/services/[id]/_Services/_Services.svelte
index 6a54d9b98..f92741116 100644
--- a/src/routes/services/[id]/_Services/_Services.svelte
+++ b/src/routes/services/[id]/_Services/_Services.svelte
@@ -108,9 +108,9 @@
 			</div>
 			<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">Domain (FQDN)</label>
+					<label for="fqdn" class="pt-2 text-base font-bold text-stone-100">URL (FQDN)</label>
 					<Explainer
-						text="If you specify <span class='text-pink-600 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-pink-600 font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the domain, you must first stop the application."
+						text="If you specify <span class='text-pink-600 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-pink-600 font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the url, you must first stop the application."
 					/>
 				</div>
 
diff --git a/src/routes/services/[id]/index.svelte b/src/routes/services/[id]/index.svelte
index ada5c0d9e..d4d51d453 100644
--- a/src/routes/services/[id]/index.svelte
+++ b/src/routes/services/[id]/index.svelte
@@ -29,19 +29,10 @@
 </script>
 
 <script lang="ts">
-	import PlausibleAnalytics from '$lib/components/svg/services/PlausibleAnalytics.svelte';
-	import NocoDb from '$lib/components/svg/services/NocoDB.svelte';
-	import MinIo from '$lib/components/svg/services/MinIO.svelte';
-	import VsCodeServer from '$lib/components/svg/services/VSCodeServer.svelte';
-	import Wordpress from '$lib/components/svg/services/Wordpress.svelte';
-	import Services from './_Services/_Services.svelte';
-	import VaultWarden from '$lib/components/svg/services/VaultWarden.svelte';
 	import cuid from 'cuid';
 	import { browser } from '$app/env';
-	import LanguageTool from '$lib/components/svg/services/LanguageTool.svelte';
-	import N8n from '$lib/components/svg/services/N8n.svelte';
-	import UptimeKuma from '$lib/components/svg/services/UptimeKuma.svelte';
-	import Ghost from '$lib/components/svg/services/Ghost.svelte';
+	import ServiceLinks from '$lib/components/ServiceLinks.svelte';
+	import Services from './_Services/_Services.svelte';
 
 	export let service;
 	export let isRunning;
@@ -53,12 +44,15 @@
 </script>
 
 <div
-	class="flex items-center space-x-3 px-6 text-2xl font-bold"
+	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="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
-		{service.name}
+	<div class="-mb-6 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>
 	{#if service.fqdn}
 		<a
@@ -83,49 +77,7 @@
 		>
 	{/if}
 
-	<div>
-		{#if service.type === 'plausibleanalytics'}
-			<a href="https://plausible.io" target="_blank">
-				<PlausibleAnalytics />
-			</a>
-		{:else if service.type === 'nocodb'}
-			<a href="https://nocodb.com" target="_blank">
-				<NocoDb />
-			</a>
-		{:else if service.type === 'minio'}
-			<a href="https://min.io" target="_blank">
-				<MinIo />
-			</a>
-		{:else if service.type === 'vscodeserver'}
-			<a href="https://coder.com" target="_blank">
-				<VsCodeServer />
-			</a>
-		{:else if service.type === 'wordpress'}
-			<a href="https://wordpress.org" target="_blank">
-				<Wordpress />
-			</a>
-		{:else if service.type === 'vaultwarden'}
-			<a href="https://github.com/dani-garcia/vaultwarden" target="_blank">
-				<VaultWarden />
-			</a>
-		{:else if service.type === 'languagetool'}
-			<a href="https://languagetool.org/dev" target="_blank">
-				<LanguageTool />
-			</a>
-		{:else if service.type === 'n8n'}
-			<a href="https://n8n.io" target="_blank">
-				<N8n />
-			</a>
-		{:else if service.type === 'uptimekuma'}
-			<a href="https://github.com/louislam/uptime-kuma" target="_blank">
-				<UptimeKuma />
-			</a>
-		{:else if service.type === 'ghost'}
-			<a href="https://ghost.org" target="_blank">
-				<Ghost />
-			</a>
-		{/if}
-	</div>
+	<ServiceLinks {service} />
 </div>
 
 <Services bind:service {isRunning} {readOnly} />
diff --git a/src/routes/services/[id]/secrets/index.svelte b/src/routes/services/[id]/secrets/index.svelte
index d850fd37f..20c1a13e5 100644
--- a/src/routes/services/[id]/secrets/index.svelte
+++ b/src/routes/services/[id]/secrets/index.svelte
@@ -26,6 +26,7 @@
 	import { getDomain } from '$lib/components/common';
 	import { page } from '$app/stores';
 	import { get } from '$lib/api';
+	import ServiceLinks from '$lib/components/ServiceLinks.svelte';
 
 	const { id } = $page.params;
 
@@ -35,12 +36,39 @@
 	}
 </script>
 
-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">
-		Secrets {#if service.fqdn}
-			<a href={service.fqdn} target="_blank">{getDomain(service.fqdn)}</a>
-		{/if}
+<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-6 flex-col">
+		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">Secrets</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">
diff --git a/src/routes/settings/index.svelte b/src/routes/settings/index.svelte
index d4b561ebf..e6148a26f 100644
--- a/src/routes/settings/index.svelte
+++ b/src/routes/settings/index.svelte
@@ -121,7 +121,7 @@
 			<div class="grid grid-flow-row gap-2 px-10">
 				<div class="grid grid-cols-2 items-start">
 					<div class="flex-col">
-						<div class="pt-2 text-base font-bold text-stone-100">Domain (FQDN)</div>
+						<div class="pt-2 text-base font-bold text-stone-100">URL (FQDN)</div>
 						<Explainer
 							text="If you specify <span class='text-yellow-500 font-bold'>https</span>, Coolify will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-yellow-500 font-bold'>www</span>, Coolify will be redirected (302) from non-www and vice versa."
 						/>