diff --git a/apps/ui/src/routes/applications/index.svelte b/apps/ui/src/routes/applications/index.svelte
index 447bbcc0a..58644059e 100644
--- a/apps/ui/src/routes/applications/index.svelte
+++ b/apps/ui/src/routes/applications/index.svelte
@@ -161,7 +161,7 @@
 				{/each}
 			</div>
 			{#if otherApplications.length > 0 && $appSession.teamId === '0'}
-				<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Applications</div>
+				<div class="px-6 pb-5 pt-10 text-2xl font-bold text-center">Other Applications</div>
 				<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 					{#each otherApplications as application}
 						<a href="/applications/{application.id}" class="p-2 no-underline">
diff --git a/apps/ui/src/routes/databases/index.svelte b/apps/ui/src/routes/databases/index.svelte
index 28ced5584..8207c4f99 100644
--- a/apps/ui/src/routes/databases/index.svelte
+++ b/apps/ui/src/routes/databases/index.svelte
@@ -113,7 +113,7 @@
 				{/each}
 			</div>
 			{#if otherDatabases.length > 0 && $appSession.teamId === '0'}
-				<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Databases</div>
+				<div class="px-6 pb-5 pt-10 text-2xl font-bold text-center">Other Databases</div>
 				<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 					{#each otherDatabases as database}
 						<a href="/databases/{database.id}" class="p-2 no-underline">
diff --git a/apps/ui/src/routes/destinations/index.svelte b/apps/ui/src/routes/destinations/index.svelte
index c9d0d545e..64fb8d37d 100644
--- a/apps/ui/src/routes/destinations/index.svelte
+++ b/apps/ui/src/routes/destinations/index.svelte
@@ -123,7 +123,7 @@
 			</div>
 
 			{#if otherDestinations.length > 0 && $appSession.teamId === '0'}
-				<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Destinations</div>
+				<div class="px-6 pb-5 pt-10 text-2xl font-bold text-center">Other Destinations</div>
 				<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 					{#each otherDestinations as destination}
 						<a href="/destinations/{destination.id}" class="p-2 no-underline relative">
diff --git a/apps/ui/src/routes/iam/index.svelte b/apps/ui/src/routes/iam/index.svelte
index 48e4cbffa..2a1c22805 100644
--- a/apps/ui/src/routes/iam/index.svelte
+++ b/apps/ui/src/routes/iam/index.svelte
@@ -189,54 +189,52 @@
 
 <div class="mx-auto max-w-4xl px-6">
 	<div class="title font-bold">Teams</div>
-	<div class="flex items-center justify-center pt-10">
-		<div class="flex flex-col">
-			<div class="flex flex-row flex-wrap justify-center px-2 pb-10 md:flex-row">
-				{#each ownTeams as team}
+	<div class="flex-col items-center justify-center pt-10">
+		<div class="flex flex-row flex-wrap justify-center px-2 pb-10 md:flex-row">
+			{#each ownTeams as team}
+				<a href="/iam/team/{team.id}" class="p-2 no-underline">
+					<div class="box-selection relative">
+						<div>
+							<div class="truncate text-center text-xl font-bold">
+								{team.name}
+							</div>
+							<div class="mt-1 text-center text-xs">
+								{team.permissions?.length} member(s)
+							</div>
+						</div>
+						<div class="flex items-center justify-center pt-3">
+							<button
+								on:click|preventDefault={() => switchTeam(team.id)}
+								class:bg-fuchsia-600={$appSession.teamId !== team.id}
+								class:hover:bg-fuchsia-500={$appSession.teamId !== team.id}
+								class:bg-transparent={$appSession.teamId === team.id}
+								disabled={$appSession.teamId === team.id}
+								>{$appSession.teamId === team.id ? 'Current Team' : 'Switch Team'}</button
+							>
+						</div>
+					</div>
+				</a>
+			{/each}
+		</div>
+		{#if $appSession.teamId === '0' && allTeams.length > 0}
+			<div class="pb-5 pt-10 text-xl font-bold">Other Teams</div>
+			<div class="flex flex-row flex-wrap justify-center px-2 md:flex-row">
+				{#each allTeams as team}
 					<a href="/iam/team/{team.id}" class="p-2 no-underline">
-						<div class="box-selection relative">
-							<div>
-								<div class="truncate text-center text-xl font-bold">
-									{team.name}
-								</div>
-								<div class="mt-1 text-center text-xs">
-									{team.permissions?.length} member(s)
-								</div>
-							</div>
-							<div class="flex items-center justify-center pt-3">
-								<button
-									on:click|preventDefault={() => switchTeam(team.id)}
-									class:bg-fuchsia-600={$appSession.teamId !== team.id}
-									class:hover:bg-fuchsia-500={$appSession.teamId !== team.id}
-									class:bg-transparent={$appSession.teamId === team.id}
-									disabled={$appSession.teamId === team.id}
-									>{$appSession.teamId === team.id ? 'Current Team' : 'Switch Team'}</button
-								>
+						<div
+							class="box-selection relative"
+							class:hover:bg-fuchsia-600={team.id !== '0'}
+							class:hover:bg-red-500={team.id === '0'}
+						>
+							<div class="truncate text-center text-xl font-bold">
+								{team.name}
 							</div>
+
+							<div class="mt-1 text-center">{team.permissions?.length} member(s)</div>
 						</div>
 					</a>
 				{/each}
 			</div>
-			{#if $appSession.teamId === '0' && allTeams.length > 0}
-				<div class="pb-5 pt-10 text-xl font-bold">Other Teams</div>
-				<div class="flex flex-row flex-wrap justify-center px-2 md:flex-row">
-					{#each allTeams as team}
-						<a href="/iam/team/{team.id}" class="p-2 no-underline">
-							<div
-								class="box-selection relative"
-								class:hover:bg-fuchsia-600={team.id !== '0'}
-								class:hover:bg-red-500={team.id === '0'}
-							>
-								<div class="truncate text-center text-xl font-bold">
-									{team.name}
-								</div>
-
-								<div class="mt-1 text-center">{team.permissions?.length} member(s)</div>
-							</div>
-						</a>
-					{/each}
-				</div>
-			{/if}
-		</div>
+		{/if}
 	</div>
 </div>
diff --git a/apps/ui/src/routes/register.svelte b/apps/ui/src/routes/register.svelte
index 606973bc9..a80d21af5 100644
--- a/apps/ui/src/routes/register.svelte
+++ b/apps/ui/src/routes/register.svelte
@@ -121,10 +121,10 @@
 				<div class="flex space-x-2 h-8 items-center justify-center pt-8">
 					<button
 						type="submit"
-						class="hover:bg-coollabs-100 text-white"
+						class="text-white"
 						disabled={loading}
+						class:hover:bg-coollabs-100={!loading}
 						class:bg-transparent={loading}
-						class:text-stone-600={loading}
 						class:bg-coollabs={!loading}
 						>{loading ? $t('register.registering') : $t('register.register')}</button
 					>
diff --git a/apps/ui/src/routes/services/index.svelte b/apps/ui/src/routes/services/index.svelte
index 0e1f3eafe..a269c35b2 100644
--- a/apps/ui/src/routes/services/index.svelte
+++ b/apps/ui/src/routes/services/index.svelte
@@ -98,7 +98,7 @@
 				{/each}
 			</div>
 			{#if otherServices.length > 0 && $appSession.teamId === '0'}
-				<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Services</div>
+				<div class="px-6 pb-5 pt-10 text-2xl font-bold text-center">Other Services</div>
 				<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 					{#each otherServices as service}
 						<a href="/services/{service.id}" class="p-2 no-underline">
diff --git a/apps/ui/src/routes/sources/index.svelte b/apps/ui/src/routes/sources/index.svelte
index 425f1840b..8bafb22e9 100644
--- a/apps/ui/src/routes/sources/index.svelte
+++ b/apps/ui/src/routes/sources/index.svelte
@@ -128,7 +128,7 @@
 			</div>
 
 			{#if otherSources.length > 0 && $appSession.teamId === '0'}
-				<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Sources</div>
+				<div class="px-6 pb-5 pt-10 text-2xl font-bold text-center">Other Sources</div>
 				<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 					{#each otherSources as source}
 						<a href="/sources/{source.id}" class="p-2 no-underline">