diff --git a/apps/ui/src/routes/applications/index.svelte b/apps/ui/src/routes/applications/index.svelte
index 1ed73ba6c..447bbcc0a 100644
--- a/apps/ui/src/routes/applications/index.svelte
+++ b/apps/ui/src/routes/applications/index.svelte
@@ -140,7 +140,7 @@
 							{#if application.fqdn}
 								<div class="truncate text-center">{getDomain(application.fqdn) || ''}</div>
 							{/if}
-							{#if application.destinationDocker.name}
+							{#if application.destinationDocker?.name}
 								<div class="truncate text-center">{application.destinationDocker.name}</div>
 							{/if}
 							{#if !application.gitSourceId || !application.repository || !application.branch}
@@ -164,7 +164,7 @@
 				<div class="px-6 pb-5 pt-10 text-xl font-bold">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="w-96 p-2 no-underline">
+						<a href="/applications/{application.id}" class="p-2 no-underline">
 							<div class="box-selection group relative hover:bg-green-600">
 								{#if application.buildPack}
 									{#if application.buildPack.toLowerCase() === 'rust'}
diff --git a/apps/ui/src/routes/databases/index.svelte b/apps/ui/src/routes/databases/index.svelte
index 4cb81188c..28ced5584 100644
--- a/apps/ui/src/routes/databases/index.svelte
+++ b/apps/ui/src/routes/databases/index.svelte
@@ -100,7 +100,7 @@
 							{#if $appSession.teamId === '0' && otherDatabases.length > 0}
 								<div class="truncate text-center">{database.teams[0].name}</div>
 							{/if}
-							{#if database.destinationDocker.name}
+							{#if database.destinationDocker?.name}
 								<div class="truncate text-center">{database.destinationDocker.name}</div>
 							{/if}
 							{#if !database.type}
@@ -116,7 +116,7 @@
 				<div class="px-6 pb-5 pt-10 text-xl font-bold">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="w-96 p-2 no-underline">
+						<a href="/databases/{database.id}" class="p-2 no-underline">
 							<div class="box-selection group relative hover:bg-purple-600">
 								{#if database.type === 'clickhouse'}
 									<Clickhouse isAbsolute />
diff --git a/apps/ui/src/routes/destinations/index.svelte b/apps/ui/src/routes/destinations/index.svelte
index cc6e59cdc..c9d0d545e 100644
--- a/apps/ui/src/routes/destinations/index.svelte
+++ b/apps/ui/src/routes/destinations/index.svelte
@@ -126,7 +126,7 @@
 				<div class="px-6 pb-5 pt-10 text-xl font-bold">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="w-96 p-2 no-underline relative">
+						<a href="/destinations/{destination.id}" class="p-2 no-underline relative">
 							<div class="box-selection hover:bg-sky-600">
 								<svg
 									xmlns="http://www.w3.org/2000/svg"
diff --git a/apps/ui/src/routes/iam/index.svelte b/apps/ui/src/routes/iam/index.svelte
index 4e75d98ae..48e4cbffa 100644
--- a/apps/ui/src/routes/iam/index.svelte
+++ b/apps/ui/src/routes/iam/index.svelte
@@ -193,7 +193,7 @@
 		<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}
-					<a href="/iam/team/{team.id}" class="w-96 p-2 no-underline">
+					<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">
@@ -221,7 +221,7 @@
 				<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="w-96 p-2 no-underline">
+						<a href="/iam/team/{team.id}" class="p-2 no-underline">
 							<div
 								class="box-selection relative"
 								class:hover:bg-fuchsia-600={team.id !== '0'}
diff --git a/apps/ui/src/routes/services/index.svelte b/apps/ui/src/routes/services/index.svelte
index 85d520f4e..0e1f3eafe 100644
--- a/apps/ui/src/routes/services/index.svelte
+++ b/apps/ui/src/routes/services/index.svelte
@@ -85,7 +85,7 @@
 							{#if service.fqdn}
 								<div class="truncate text-center">{getDomain(service.fqdn) || ''}</div>
 							{/if}
-							{#if service.destinationDocker.name}
+							{#if service.destinationDocker?.name}
 								<div class="truncate text-center">{service.destinationDocker.name}</div>
 							{/if}
 							{#if !service.type || !service.fqdn}
@@ -101,7 +101,7 @@
 				<div class="px-6 pb-5 pt-10 text-xl font-bold">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="w-96 p-2 no-underline">
+						<a href="/services/{service.id}" class="p-2 no-underline">
 							<div class="box-selection group relative hover:bg-pink-600">
 								<Services type={service.type} />
 								<div class="truncate text-center text-xl font-bold">
diff --git a/apps/ui/src/routes/sources/index.svelte b/apps/ui/src/routes/sources/index.svelte
index f56f3d411..425f1840b 100644
--- a/apps/ui/src/routes/sources/index.svelte
+++ b/apps/ui/src/routes/sources/index.svelte
@@ -131,7 +131,7 @@
 				<div class="px-6 pb-5 pt-10 text-xl font-bold">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="w-96 p-2 no-underline">
+						<a href="/sources/{source.id}" class="p-2 no-underline">
 							<div
 								class="box-selection group hover:bg-orange-600"
 								class:border-red-500={source.gitlabApp && !source.gitlabAppId}