diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index 801aba8c5..ad8e43c69 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -56,7 +56,7 @@
 				{/each}
 			</div>
 			{#if otherApplications.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Others</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherApplications as application}
 						<Application {application} />
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index 488dd5bba..5e271bcfe 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -76,7 +76,7 @@
 								{database.name}
 							</div>
 							{#if $session.teamId === '0'}
-								<div class="text-center truncate">Team {database.teams[0].name}</div>
+								<div class="text-center truncate">{database.teams[0].name}</div>
 							{/if}
 							{#if !database.type}
 								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
@@ -90,7 +90,7 @@
 				{/each}
 			</div>
 			{#if otherDatabases.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Others</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherDatabases as database}
 						<a href="/databases/{database.id}" class="no-underline p-2 w-96">
@@ -112,7 +112,7 @@
 									{database.name}
 								</div>
 								{#if $session.teamId === '0'}
-									<div class="text-center truncate">Team {database.teams[0].name}</div>
+									<div class="text-center truncate">{database.teams[0].name}</div>
 								{/if}
 								{#if !database.type}
 									<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index 782958aa5..34a9faefb 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -72,7 +72,7 @@
 						<div class="box-selection hover:bg-sky-600">
 							<div class="font-bold text-xl text-center truncate">{destination.name}</div>
 							{#if $session.teamId === '0'}
-								<div class="text-center truncate">Team {destination.teams[0].name}</div>
+								<div class="text-center truncate">{destination.teams[0].name}</div>
 							{/if}
 							<div class="text-center truncate">{destination.network}</div>
 						</div>
@@ -81,14 +81,14 @@
 			</div>
 
 			{#if otherDestinations.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Others</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherDestinations as destination}
 						<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
 							<div class="box-selection hover:bg-sky-600">
 								<div class="font-bold text-xl text-center truncate">{destination.name}</div>
 								{#if $session.teamId === '0'}
-									<div class="text-center truncate">Team {destination.teams[0].name}</div>
+									<div class="text-center truncate">{destination.teams[0].name}</div>
 								{/if}
 								<div class="text-center truncate">{destination.network}</div>
 							</div>
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index bee9b08f1..293c51087 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -58,7 +58,7 @@
 	{:else}
 		<div class="flex flex-col">
 			{#if $session.teamId === '0' && ownServices.length > 0 && otherServices.length > 0}
-				<div class="text-xl font-bold pb-5 px-1">Current Team</div>
+				<div class="text-xl font-bold pb-5 px-6">Current Team</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownServices as service}
@@ -91,7 +91,7 @@
 								{service.name}
 							</div>
 							{#if $session.teamId === '0'}
-								<div class="text-center truncate">Team {service.teams[0].name}</div>
+								<div class="text-center truncate">{service.teams[0].name}</div>
 							{/if}
 							{#if !service.type || !service.fqdn}
 								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
@@ -105,7 +105,7 @@
 				{/each}
 			</div>
 			{#if otherServices.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Others</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherServices as service}
 						<a href="/services/{service.id}" class="no-underline p-2 w-96">
@@ -137,7 +137,7 @@
 									{service.name}
 								</div>
 								{#if $session.teamId === '0'}
-									<div class="text-center truncate">Team {service.teams[0].name}</div>
+									<div class="text-center truncate">{service.teams[0].name}</div>
 								{/if}
 								{#if !service.type || !service.fqdn}
 									<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index 3f1953a39..224916fb8 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -62,7 +62,7 @@
 	{:else}
 		<div class="flex flex-col">
 			{#if $session.teamId === '0' && ownSources.length > 0 && otherSources.length > 0}
-				<div class="text-xl font-bold pb-5 px-1">Current Team</div>
+				<div class="text-xl font-bold pb-5 px-6">Current Team</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownSources as source}
@@ -75,7 +75,7 @@
 						>
 							<div class="font-bold text-xl text-center truncate">{source.name}</div>
 							{#if $session.teamId === '0'}
-								<div class="text-center truncate">Team {source.teams[0].name}</div>
+								<div class="text-center truncate">{source.teams[0].name}</div>
 							{/if}
 							{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && !source.githubAppId && !source.githubApp?.installationId)}
 								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
@@ -90,7 +90,7 @@
 			</div>
 
 			{#if otherSources.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Others</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherSources as source}
 						<a href="/sources/{source.id}" class="no-underline p-2 w-96">
@@ -102,7 +102,7 @@
 							>
 								<div class="font-bold text-xl text-center truncate">{source.name}</div>
 								{#if $session.teamId === '0'}
-									<div class="text-center truncate">Team {source.teams[0].name}</div>
+									<div class="text-center truncate">{source.teams[0].name}</div>
 								{/if}
 								{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && !source.githubAppId && !source.githubApp?.installationId)}
 									<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
diff --git a/src/routes/teams/index.svelte b/src/routes/teams/index.svelte
index 87e491d20..79e600ca6 100644
--- a/src/routes/teams/index.svelte
+++ b/src/routes/teams/index.svelte
@@ -123,7 +123,7 @@
 			{/each}
 		</div>
 
-		<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Team's</div>
+		<div class="px-6 pb-5 pt-10 text-xl font-bold">Others</div>
 		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 			{#each otherTeams as team}
 				<a href="/teams/{team.teamId}" class="w-96 p-2 no-underline">