diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index e13b3f240..801aba8c5 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -47,8 +47,8 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0' && ownApplications.length > 0}
-				<div class="text-xl font-bold pb-5 px-1">Your Team's Applications</div>
+			{#if $session.teamId === '0' && ownApplications.length > 0 && otherApplications.length > 0}
+				<div class="text-xl font-bold pb-5 px-1">Current Team</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownApplications as application}
@@ -56,7 +56,7 @@
 				{/each}
 			</div>
 			{#if otherApplications.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 px-1 pt-10 px-6">Other Team's Applications</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</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 bb19b0ab8..554954e2f 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -52,8 +52,8 @@
 		</div>
 	{:else}
 		<div class="flex flex-col px-8">
-			{#if $session.teamId === '0' && ownDatabases.length > 0}
-				<div class="text-xl font-bold pb-5 px-1">Your Team's Databases</div>
+			{#if $session.teamId === '0' && ownDatabases.length > 0 && otherDatabases.length > 0}
+				<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 ownDatabases as database}
@@ -90,7 +90,7 @@
 				{/each}
 			</div>
 			{#if otherDatabases.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 px-1 pt-10 px-6">Other Team's Databases</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</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">
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index 6c5d105f2..782958aa5 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -63,8 +63,8 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0' && ownDestinations.length > 0}
-				<div class="text-xl font-bold pb-5 px-1">Your Team's Destinations</div>
+			{#if $session.teamId === '0' && ownDestinations.length > 0 && otherDestinations.length > 0}
+				<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 ownDestinations as destination}
@@ -81,7 +81,7 @@
 			</div>
 
 			{#if otherDestinations.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 px-1 pt-10 px-6">Other Team's Destinations</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</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">
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index b97feec03..702187d07 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -57,8 +57,8 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0' && ownServices.length > 0}
-				<div class="text-xl font-bold pb-5 px-1">Your Team's Applications</div>
+			{#if $session.teamId === '0' && ownServices.length > 0 && otherServices.length > 0}
+				<div class="text-xl font-bold pb-5 px-1">Current Team</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownServices as service}
@@ -105,7 +105,7 @@
 				{/each}
 			</div>
 			{#if otherServices.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 px-1 pt-10  ">Other Team's Applications</div>
+				<div class="text-xl font-bold pb-5 px-1 pt-10  ">Other Team's</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">
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index b784db072..570a3c3cc 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -61,8 +61,8 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0' && ownSources.length > 0}
-				<div class="text-xl font-bold pb-5 px-1">Your Team's Applications</div>
+			{#if $session.teamId === '0' && ownSources.length > 0 && otherSources.length > 0}
+				<div class="text-xl font-bold pb-5 px-1">Current Team</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownSources as source}
@@ -90,7 +90,7 @@
 			</div>
 
 			{#if otherSources.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 px-1 pt-10  ">Other Team's Applications</div>
+				<div class="text-xl font-bold pb-5 px-1 pt-10  ">Other Team's</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">
diff --git a/src/routes/teams/index.svelte b/src/routes/teams/index.svelte
index 88d1a3b4e..87e491d20 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 Teams</div>
+		<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Team's</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">