diff --git a/src/frontend/src/lib/components/orbiter/Orbiter.svelte b/src/frontend/src/lib/components/orbiter/Orbiter.svelte
index bfe31d521..3e8c44c0c 100644
--- a/src/frontend/src/lib/components/orbiter/Orbiter.svelte
+++ b/src/frontend/src/lib/components/orbiter/Orbiter.svelte
@@ -6,25 +6,29 @@
 	import { versionStore } from '$lib/stores/version.store';
 	import CanisterOverview from '$lib/components/canister/CanisterOverview.svelte';
 	import OrbiterActions from '$lib/components/orbiter/OrbiterActions.svelte';
+	import { missionControlStore } from '$lib/stores/mission-control.store';
+	import CanisterJunoStatuses from '$lib/components/canister/CanisterJunoStatuses.svelte';
 
 	export let orbiter: Orbiter;
 </script>
 
 <div class="card-container columns-3 fit-column-1">
-	<div>
-		<div class="id">
-			<Value>
-				<svelte:fragment slot="label">{$i18n.analytics.id}</svelte:fragment>
-				<Identifier identifier={orbiter.orbiter_id.toText()} shorten={false} small={false} />
-			</Value>
-		</div>
-
+	<div class="id">
 		<Value>
-			<svelte:fragment slot="label">{$i18n.core.version}</svelte:fragment>
-			<p>v{$versionStore?.orbiter?.current ?? '...'}</p>
+			<svelte:fragment slot="label">{$i18n.analytics.id}</svelte:fragment>
+			<Identifier identifier={orbiter.orbiter_id.toText()} shorten={false} small={false} />
 		</Value>
 	</div>
 
+	<Value>
+		<svelte:fragment slot="label">{$i18n.core.version}</svelte:fragment>
+		<p>v{$versionStore?.orbiter?.current ?? '...'}</p>
+	</Value>
+
+	<OrbiterActions {orbiter} />
+</div>
+
+<div class="card-container columns-3">
 	<div>
 		<CanisterOverview
 			canisterId={orbiter.orbiter_id}
@@ -33,11 +37,15 @@
 		/>
 	</div>
 
-	<OrbiterActions {orbiter} />
+	<CanisterJunoStatuses segment="orbiter" canisterId={orbiter.orbiter_id} />
 </div>
 
 <style lang="scss">
 	.id {
 		max-width: 80%;
 	}
+
+	.card-container:last-of-type {
+		margin: var(--padding-4x) 0 0;
+	}
 </style>
diff --git a/src/frontend/src/lib/components/satellites/SatelliteOverview.svelte b/src/frontend/src/lib/components/satellites/SatelliteOverview.svelte
index 5cd50be54..c2b8be734 100644
--- a/src/frontend/src/lib/components/satellites/SatelliteOverview.svelte
+++ b/src/frontend/src/lib/components/satellites/SatelliteOverview.svelte
@@ -8,7 +8,7 @@
 	import type { SatelliteIdText } from '$lib/types/satellite';
 	import SatelliteName from '$lib/components/satellites/SatelliteName.svelte';
 	import SatelliteOverviewVersion from '$lib/components/satellites/SatelliteOverviewVersion.svelte';
-	import SatelliteStatuses from '$lib/components/satellites/SatelliteStatuses.svelte';
+	import CanisterJunoStatuses from '$lib/components/canister/CanisterJunoStatuses.svelte';
 
 	export let satellite: Satellite;
 
@@ -42,7 +42,7 @@
 		/>
 	</div>
 
-	<SatelliteStatuses {satellite} />
+	<CanisterJunoStatuses segment="satellite" canisterId={satellite.satellite_id} />
 </div>
 
 <style lang="scss">
diff --git a/src/frontend/src/lib/components/satellites/SatelliteStatuses.svelte b/src/frontend/src/lib/components/satellites/SatelliteStatuses.svelte
deleted file mode 100644
index f359c1a44..000000000
--- a/src/frontend/src/lib/components/satellites/SatelliteStatuses.svelte
+++ /dev/null
@@ -1,8 +0,0 @@
-<script lang="ts">
-	import type { Satellite } from '$declarations/mission_control/mission_control.did';
-	import CanisterJunoStatuses from '$lib/components/canister/CanisterJunoStatuses.svelte';
-
-	export let satellite: Satellite;
-</script>
-
-<CanisterJunoStatuses segment="satellite" canisterId={satellite.satellite_id} />