diff --git a/apps/ui/src/routes/__layout.svelte b/apps/ui/src/routes/__layout.svelte
index 9ba0b1f8a..6a3b95300 100644
--- a/apps/ui/src/routes/__layout.svelte
+++ b/apps/ui/src/routes/__layout.svelte
@@ -307,9 +307,7 @@
 			</div>
 		</div>
 		<main>
-			<div class={$appSession.userId ? 'lg:pl-16' : null}>
-				<slot />
-			</div>
+			<slot />
 		</main>
 	</div>
 	<div class="drawer-side">
diff --git a/apps/ui/src/routes/applications/[id]/__layout.svelte b/apps/ui/src/routes/applications/[id]/__layout.svelte
index 1d14ecf2a..020be0b13 100644
--- a/apps/ui/src/routes/applications/[id]/__layout.svelte
+++ b/apps/ui/src/routes/applications/[id]/__layout.svelte
@@ -191,7 +191,7 @@
 </script>
 
 <nav
-	class="header"
+	class="header p-5 pl-0 lg:p-0 lg:pl-20"
 >
 	<div class="hidden items-center space-x-2 p-5 px-6 font-bold lg:flex">
 		<div class="flex flex-col">
diff --git a/apps/ui/src/routes/applications/_index.svelte b/apps/ui/src/routes/applications/_index.svelte
index 4d30ed835..c97a3a0d1 100644
--- a/apps/ui/src/routes/applications/_index.svelte
+++ b/apps/ui/src/routes/applications/_index.svelte
@@ -44,7 +44,7 @@
 	}
 </script>
 
-<nav class="header">
+<nav class="header p-5 pl-0 lg:p-0 lg:pl-20">
 	<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">
diff --git a/apps/ui/src/routes/databases/[id]/__layout.svelte b/apps/ui/src/routes/databases/[id]/__layout.svelte
index 426e0cd0c..453deb675 100644
--- a/apps/ui/src/routes/databases/[id]/__layout.svelte
+++ b/apps/ui/src/routes/databases/[id]/__layout.svelte
@@ -150,7 +150,7 @@
 </script>
 
 {#if id !== 'new'}
-	<nav class="header">
+	<nav class="header p-5 pl-0 lg:p-0 lg:pl-20 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">
diff --git a/apps/ui/src/routes/databases/_index.svelte b/apps/ui/src/routes/databases/_index.svelte
index 44d9d8b30..6902f8bb2 100644
--- a/apps/ui/src/routes/databases/_index.svelte
+++ b/apps/ui/src/routes/databases/_index.svelte
@@ -42,7 +42,7 @@
 	});
 </script>
 
-<nav class="header">
+<nav class="header p-5 pl-0 lg:p-0 lg:pl-20">
 	<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">
diff --git a/apps/ui/src/routes/destinations/_index.svelte b/apps/ui/src/routes/destinations/_index.svelte
index 8885787c8..8f826eec9 100644
--- a/apps/ui/src/routes/destinations/_index.svelte
+++ b/apps/ui/src/routes/destinations/_index.svelte
@@ -36,7 +36,7 @@
 	});
 </script>
 
-<nav class="header">
+<nav class="header p-5 pl-0 lg:p-0 lg:pl-20">
 	<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">
diff --git a/apps/ui/src/routes/iam/index.svelte b/apps/ui/src/routes/iam/index.svelte
index 3d9eb8d6a..1bd84d5a0 100644
--- a/apps/ui/src/routes/iam/index.svelte
+++ b/apps/ui/src/routes/iam/index.svelte
@@ -106,7 +106,7 @@
 	}
 </script>
 
-<nav class="header">
+<nav class="header p-5 pl-0 lg:p-0 lg:pl-20">
 	<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
diff --git a/apps/ui/src/routes/index.svelte b/apps/ui/src/routes/index.svelte
index 1d7210ed3..51f5f86c4 100644
--- a/apps/ui/src/routes/index.svelte
+++ b/apps/ui/src/routes/index.svelte
@@ -275,15 +275,13 @@
 	}
 </script>
 
-<nav
-	class="header p-5"
->
+<nav class="header">
 	<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}
 </nav>
-<div class="container lg:mx-auto lg:p-0 px-8 lg:pt-24">
+<div class="container lg:mx-auto lg:p-0 px-8 lg:pt-24 pt-5">
 	<!-- {#if $appSession.teamId === '0'}
 		<Usage />
 	{/if} -->
diff --git a/apps/ui/src/routes/servers/index.svelte b/apps/ui/src/routes/servers/index.svelte
index 15f18b4ed..326270ca0 100644
--- a/apps/ui/src/routes/servers/index.svelte
+++ b/apps/ui/src/routes/servers/index.svelte
@@ -29,7 +29,7 @@
 	}
 </script>
 
-<div class="header p-5">
+<div class="header p-5 pl-0 lg:p-0 lg:pl-20">
 	<h1 class="text-2xl font-bold">Servers</h1>
 </div>
 <div class="container lg:mx-auto lg:p-0 px-8 p-5 lg:pt-20">
diff --git a/apps/ui/src/routes/services/[id]/__layout.svelte b/apps/ui/src/routes/services/[id]/__layout.svelte
index 460412447..90681f54a 100644
--- a/apps/ui/src/routes/services/[id]/__layout.svelte
+++ b/apps/ui/src/routes/services/[id]/__layout.svelte
@@ -156,7 +156,7 @@
 	});
 </script>
 
-<nav class="header">
+<nav class="header p-5 pl-0 lg:p-0 lg:pl-20">
 	<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">
diff --git a/apps/ui/src/routes/services/_index.svelte b/apps/ui/src/routes/services/_index.svelte
index a788fde9a..96de36817 100644
--- a/apps/ui/src/routes/services/_index.svelte
+++ b/apps/ui/src/routes/services/_index.svelte
@@ -43,7 +43,7 @@
 	});
 </script>
 
-<nav class="header">
+<nav class="header p-5 pl-0 lg:p-0 lg:pl-20">
 	<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
diff --git a/apps/ui/src/routes/sources/_index.svelte b/apps/ui/src/routes/sources/_index.svelte
index 5a5897d60..fdd8fba54 100644
--- a/apps/ui/src/routes/sources/_index.svelte
+++ b/apps/ui/src/routes/sources/_index.svelte
@@ -36,7 +36,7 @@
 	});
 </script>
 
-<nav class="header">
+<nav class="header p-5 pl-0 lg:p-0 lg:pl-20">
 	<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">
diff --git a/apps/ui/src/tailwind.css b/apps/ui/src/tailwind.css
index 30c75fbe7..73100ab16 100644
--- a/apps/ui/src/tailwind.css
+++ b/apps/ui/src/tailwind.css
@@ -202,7 +202,8 @@ input {
 }
 
 .header {
-	@apply flex flex-row px-4 justify-between items-center lg:fixed w-full z-10;
+	@apply flex flex-row px-4 justify-between items-center lg:fixed p-5 pl-20 z-10;
 	background-color: rgba(31, 30, 30, 0.6);
 	backdrop-filter: blur(20px);
+	width: 100%;
 }
\ No newline at end of file