diff --git a/apps/ui/src/routes/applications/index.svelte b/apps/ui/src/routes/applications/index.svelte
index 6dbb09ee4..60644e16d 100644
--- a/apps/ui/src/routes/applications/index.svelte
+++ b/apps/ui/src/routes/applications/index.svelte
@@ -64,7 +64,7 @@
 		</button>
 	{/if}
 </div>
-<div class="flex-col justify-center">
+<div class="flex-col justify-center mt-10 pb-12 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>
diff --git a/apps/ui/src/routes/databases/index.svelte b/apps/ui/src/routes/databases/index.svelte
index c14c9c3f3..04dbeb768 100644
--- a/apps/ui/src/routes/databases/index.svelte
+++ b/apps/ui/src/routes/databases/index.svelte
@@ -61,7 +61,7 @@
 	</button>
 </div>
 
-<div class="flex-col justify-center">
+<div class="flex-col justify-center mt-10 pb-12 sm:pb-16">
 	{#if !databases || ownDatabases.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">{$t('database.no_databases_found')}</div>
diff --git a/apps/ui/src/routes/destinations/index.svelte b/apps/ui/src/routes/destinations/index.svelte
index 4c8696780..27656cdb7 100644
--- a/apps/ui/src/routes/destinations/index.svelte
+++ b/apps/ui/src/routes/destinations/index.svelte
@@ -56,7 +56,7 @@
 		</a>
 	{/if}
 </div>
-<div class="flex-col justify-center">
+<div class="flex-col justify-center mt-10 pb-12 sm:pb-16">
 	{#if !destinations || ownDestinations.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">{$t('destination.no_destination_found')}</div>
diff --git a/apps/ui/src/routes/iam/index.svelte b/apps/ui/src/routes/iam/index.svelte
index 30e2e0260..e50c2fbdd 100644
--- a/apps/ui/src/routes/iam/index.svelte
+++ b/apps/ui/src/routes/iam/index.svelte
@@ -212,6 +212,7 @@
 						<div class="flex items-center justify-center pt-3">
 							<button
 								on:click|preventDefault={() => switchTeam(team.id)}
+								class="btn btn-sm"
 								class:bg-fuchsia-600={$appSession.teamId !== team.id}
 								class:hover:bg-fuchsia-500={$appSession.teamId !== team.id}
 								class:bg-transparent={$appSession.teamId === team.id}
diff --git a/apps/ui/src/routes/index.svelte b/apps/ui/src/routes/index.svelte
index 63ae5fa47..22d07c3ea 100644
--- a/apps/ui/src/routes/index.svelte
+++ b/apps/ui/src/routes/index.svelte
@@ -93,11 +93,13 @@
 
 <div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">{$t('index.dashboard')}</div>
-	<button on:click={manuallyCleanupStorage} class:loading={loading.cleanup} class="btn btn-sm"
-		>Cleanup Storage</button
-	>
+	{#if $appSession.teamId === '0'}
+		<button on:click={manuallyCleanupStorage} class:loading={loading.cleanup} class="btn btn-sm"
+			>Cleanup Storage</button
+		>
+	{/if}
 </div>
-<div class="mt-10 pb-12 tracking-tight sm:pb-16">
+<div class="mt-10 pb-12 sm:pb-16">
 	<div class="mx-auto px-10">
 		<div class="flex flex-col justify-center xl:flex-row">
 			{#if applications.length > 0}
@@ -341,6 +343,8 @@
 						</table>
 					</div>
 				</div>
+			{:else}
+				<div class="text-center text-xl font-bold">Nothing is configured yet.</div>
 			{/if}
 			{#if $appSession.teamId === '0'}
 				<Usage />
diff --git a/apps/ui/src/routes/services/index.svelte b/apps/ui/src/routes/services/index.svelte
index 44b8e6381..fe3bed644 100644
--- a/apps/ui/src/routes/services/index.svelte
+++ b/apps/ui/src/routes/services/index.svelte
@@ -62,7 +62,7 @@
 	</button>
 </div>
 
-<div class="flex-col justify-center">
+<div class="flex-col justify-center mt-10 pb-12 sm:pb-16">
 	{#if !services || ownServices.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">{$t('service.no_service')}</div>
diff --git a/apps/ui/src/routes/sources/index.svelte b/apps/ui/src/routes/sources/index.svelte
index f0e3741da..a5a5f98ff 100644
--- a/apps/ui/src/routes/sources/index.svelte
+++ b/apps/ui/src/routes/sources/index.svelte
@@ -56,7 +56,7 @@
 		</a>
 	{/if}
 </div>
-<div class="flex-col justify-center">
+<div class="flex-col justify-center mt-10 pb-12 sm:pb-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>