diff --git a/app/cards/Objectives/Objective.tsx b/app/cards/Objectives/Objective.tsx
new file mode 100644
index 00000000..c34da34a
--- /dev/null
+++ b/app/cards/Objectives/Objective.tsx
@@ -0,0 +1,65 @@
+import { q } from "@thorium/context/AppContext";
+import { cn } from "@thorium/utils/cn";
+
+export function Objective({
+	id,
+	state,
+	crewComplete,
+	title,
+	description,
+	size,
+}: {
+	id: number;
+	state: "cancelled" | "complete" | "active";
+	crewComplete: boolean;
+	title: string;
+	description?: string;
+	size?: "sm";
+}) {
+	return (
+		<div
+			key={id}
+			className={cn("flex items-start gap-2", {
+				"text-white/70": state === "cancelled" || state === "complete",
+			})}
+		>
+			<button
+				type="button"
+				className={cn(
+					"mt-1 cursor-default flex items-center justify-center aspect-square @[14rem]:w-4 @[14rem]:h-4  @2xl:w-10 @2xl:h-10 rounded-full border border-white",
+					{
+						"border-red-500 border-2": state === "cancelled",
+						"relative after:block after:absolute after:inset-1 after:bg-white/40 after:hover:bg-white/60 cursor-pointer after:rounded-full":
+							crewComplete,
+						"border-green-500 border-2 after:hidden": state === "complete",
+					},
+				)}
+				onClick={
+					crewComplete && state !== "cancelled"
+						? () =>
+								q.objectives.setState.netSend({
+									objectiveId: id,
+									state: state === "active" ? "complete" : "active",
+								})
+						: () => null
+				}
+			>
+				{state === "complete" ? (
+					<div className="w-6 @2xl:w-8 aspect-square rounded-full bg-green-500" />
+				) : null}
+			</button>
+			<div className="flex-1">
+				<h3
+					className={cn("text-base font-medium @2xl:text-lg @2xl:font-bold", {
+						"line-through": state === "cancelled",
+					})}
+				>
+					{title}
+				</h3>
+				{size === "sm" ? null : (
+					<p className="text-sm @2xl:text-base">{description}</p>
+				)}
+			</div>
+		</div>
+	);
+}
diff --git a/app/cards/Objectives/index.tsx b/app/cards/Objectives/index.tsx
index cef5f96b..7240e61a 100644
--- a/app/cards/Objectives/index.tsx
+++ b/app/cards/Objectives/index.tsx
@@ -1,6 +1,6 @@
+import { Objective } from "@thorium/cards/Objectives/Objective";
 import { q } from "@thorium/context/AppContext";
 import { useStation } from "@thorium/routes/station/useStation";
-import { cn } from "@thorium/utils/cn";
 
 export function Objectives() {
 	const { shipId } = useStation();
@@ -31,66 +31,3 @@ export function Objectives() {
 		</div>
 	);
 }
-
-export function Objective({
-	id,
-	state,
-	crewComplete,
-	title,
-	description,
-	size,
-}: {
-	id: number;
-	state: "cancelled" | "complete" | "active";
-	crewComplete: boolean;
-	title: string;
-	description?: string;
-	size?: "sm";
-}) {
-	return (
-		<div
-			key={id}
-			className={cn("flex items-start gap-2", {
-				"text-white/70": state === "cancelled" || state === "complete",
-			})}
-		>
-			<button
-				type="button"
-				className={cn(
-					"mt-1 cursor-default flex items-center justify-center aspect-square @[14rem]:w-4 @[14rem]:h-4  @2xl:w-10 @2xl:h-10 rounded-full border border-white",
-					{
-						"border-red-500 border-2": state === "cancelled",
-						"relative after:block after:absolute after:inset-1 after:bg-white/40 after:hover:bg-white/60 cursor-pointer after:rounded-full":
-							crewComplete,
-						"border-green-500 border-2 after:hidden": state === "complete",
-					},
-				)}
-				onClick={
-					crewComplete && state !== "cancelled"
-						? () =>
-								q.objectives.setState.netSend({
-									objectiveId: id,
-									state: state === "active" ? "complete" : "active",
-								})
-						: () => null
-				}
-			>
-				{state === "complete" ? (
-					<div className="w-6 @2xl:w-8 aspect-square rounded-full bg-green-500" />
-				) : null}
-			</button>
-			<div className="flex-1">
-				<h3
-					className={cn("text-base font-medium @2xl:text-lg @2xl:font-bold", {
-						"line-through": state === "cancelled",
-					})}
-				>
-					{title}
-				</h3>
-				{size === "sm" ? null : (
-					<p className="text-sm @2xl:text-base">{description}</p>
-				)}
-			</div>
-		</div>
-	);
-}
diff --git a/app/cards/Viewscreen/gizmos/Objectives.tsx b/app/cards/Viewscreen/gizmos/Objectives.tsx
index 35c9d4ba..d0015475 100644
--- a/app/cards/Viewscreen/gizmos/Objectives.tsx
+++ b/app/cards/Viewscreen/gizmos/Objectives.tsx
@@ -1,4 +1,4 @@
-import { Objective } from "@thorium/cards/Objectives";
+import { Objective } from "@thorium/cards/Objectives/Objective";
 import { q } from "@thorium/context/AppContext";
 import { useStation } from "@thorium/routes/station/useStation";
 import { cn } from "@thorium/utils/cn";
diff --git a/app/routes/quickStart/ship.tsx b/app/routes/quickStart/ship.tsx
index d2d045b0..55d45f6b 100644
--- a/app/routes/quickStart/ship.tsx
+++ b/app/routes/quickStart/ship.tsx
@@ -211,7 +211,7 @@ function ShipConfig({
 					}
 				/>
 				<div>
-					<p className="text-nowrap">Crew Count</p>
+					<p className="text-nowrap">Station Count</p>
 					<div className="flex justify-around items-center select-none">
 						<button
 							className="text-2xl cursor-pointer hover:text-white/80 active:text-white/50 focus:outline-none focus:ring rounded-full appearance-none"