diff --git a/app/src/components/contribute/ContributionFlow.tsx b/app/src/components/contribute/ContributionFlow.tsx
index 4fbff290..af959258 100644
--- a/app/src/components/contribute/ContributionFlow.tsx
+++ b/app/src/components/contribute/ContributionFlow.tsx
@@ -59,6 +59,7 @@ const createVariantContData = (): VariantContribution => ({
 const createObjectiveContData = (): ObjectiveContribution => ({
   title: "",
   summary: "",
+  subjects: [],
   targets: [],
   featured: "",
   subObjectives: [],
@@ -73,6 +74,32 @@ export default function ContributionFlow({ type, setType }: PropTypes) {
   const [objectiveContData, setObjectiveContData] =
     useState<ObjectiveContribution>(createObjectiveContData);
 
+  useEffect(() => {
+    const savedGuide = sessionStorage.getItem("guide_cont_data");
+    if (savedGuide) {
+      try {
+        setGuideContData(JSON.parse(savedGuide));
+      } catch (e) {}
+    }
+    const savedObj = sessionStorage.getItem("objective_cont_data");
+    if (savedObj) {
+      try {
+        setObjectiveContData(JSON.parse(savedObj));
+      } catch (e) {}
+    }
+  }, []);
+
+  useEffect(() => {
+    sessionStorage.setItem("guide_cont_data", JSON.stringify(guideContData));
+  }, [guideContData]);
+
+  useEffect(() => {
+    sessionStorage.setItem(
+      "objective_cont_data",
+      JSON.stringify(objectiveContData)
+    );
+  }, [objectiveContData]);
+
   const StepperInstance = useMemo(() => {
     if (!type) {
       return defineStepper(typeStep);
@@ -128,6 +155,28 @@ function Inner({
   objectiveContData: ObjectiveContribution;
   setObjectiveContData: Dispatch<SetStateAction<ObjectiveContribution>>;
 }) {
+  const hasHydratedStep = useRef(false);
+
+  useEffect(() => {
+    if (stepper.current?.id) {
+      sessionStorage.setItem("cont_step", stepper.current.id);
+    }
+  }, [stepper.current?.id]);
+
+  useEffect(() => {
+    if (hasHydratedStep.current) return;
+    if (type !== null) {
+      const savedStep = sessionStorage.getItem("cont_step");
+      if (savedStep) {
+        requestAnimationFrame(() => {
+          try {
+            stepper.goTo(savedStep);
+          } catch (e) {}
+        });
+      }
+      hasHydratedStep.current = true;
+    }
+  }, [type, stepper]);
   const pickType = (value: ContributionType) => {
     if (type !== value) {
       setGuideContData(createGuideContData());
@@ -388,6 +437,7 @@ function Inner({
         />
         <PreviewObjective
           Stepper={Stepper}
+          objectiveContData={objectiveContData}
           onPublish={publish}
           submitting={submitting}
         />
diff --git a/app/src/components/contribute/StepperActionHeader.tsx b/app/src/components/contribute/StepperActionHeader.tsx
index ff7fd118..91f4fa58 100644
--- a/app/src/components/contribute/StepperActionHeader.tsx
+++ b/app/src/components/contribute/StepperActionHeader.tsx
@@ -6,20 +6,26 @@ type PropTypes = {
   title: string;
   Stepper: any;
   nextDisabled?: boolean;
+  hideNext?: boolean;
+  onNextClick?: (e: React.MouseEvent) => void;
   hideBackBtn?: boolean;
   submitting?: boolean;
   onSaveDraft?: () => void;
   onPublish?: () => void;
+  publishText?: string;
 };
 
 export const StepperActionHeader = ({
   title,
   Stepper,
   nextDisabled,
+  hideNext,
+  onNextClick,
   submitting,
   hideBackBtn,
   onSaveDraft,
   onPublish,
+  publishText = "Submit for Review",
 }: PropTypes) => {
   return (
     <>
@@ -52,13 +58,17 @@ export const StepperActionHeader = ({
               disabled={submitting}
               onClick={onPublish}
             >
-              Submit for Review
+              {publishText}
             </button>
-          ) : (
-            <Stepper.Next className="btn-pri" disabled={nextDisabled}>
+          ) : !hideNext ? (
+            <Stepper.Next
+              className="btn-pri"
+              disabled={nextDisabled}
+              onClick={onNextClick}
+            >
               Next
             </Stepper.Next>
-          )}
+          ) : null}
         </div>
       </div>
 
diff --git a/app/src/components/contribute/steps/ObjectiveDetails.tsx b/app/src/components/contribute/steps/ObjectiveDetails.tsx
index 946a55c0..07ec8d4b 100644
--- a/app/src/components/contribute/steps/ObjectiveDetails.tsx
+++ b/app/src/components/contribute/steps/ObjectiveDetails.tsx
@@ -1,4 +1,5 @@
-import { useMemo } from "react";
+import { useMemo, useState } from "react";
+import { toast } from "sonner";
 import type { Dispatch, SetStateAction } from "react";
 import type { ObjectiveContribution } from "@/types/contributions";
 
@@ -14,6 +15,7 @@ import { Textarea } from "@/components/ui/textarea";
 import { Combobox } from "@/components/ui/combobox";
 
 import guidesData from "@/data/guides.json";
+import subjectsData from "@/data/subjects.json";
 
 type PropTypes = {
   Stepper: any;
@@ -26,6 +28,7 @@ export const ObjectiveDetails = ({
   objectiveContData,
   setObjectiveContData,
 }: PropTypes) => {
+  const [showErrors, setShowErrors] = useState(false);
   const guides = guidesData.map((g) => {
     return {
       value: g.slug,
@@ -44,22 +47,32 @@ export const ObjectiveDetails = ({
     return (
       objectiveContData.title.trim() === "" ||
       objectiveContData.summary.trim() === "" ||
+      objectiveContData.subjects.length === 0 ||
       objectiveContData.targets.length === 0 ||
       !objectiveContData.featured
     );
   }, [
     objectiveContData.title,
     objectiveContData.summary,
+    objectiveContData.subjects,
     objectiveContData.targets,
     objectiveContData.featured,
   ]);
 
+  const handleNextClick = (e: React.MouseEvent) => {
+    if (isNextDisabled) {
+      e.preventDefault();
+      setShowErrors(true);
+      toast.error("Please fill out all required fields.");
+    }
+  };
+
   return (
     <Stepper.Content step="objective-details">
       <StepperActionHeader
         title={"Objective Details"}
         Stepper={Stepper}
-        nextDisabled={isNextDisabled}
+        onNextClick={handleNextClick}
       />
 
       <FieldGroup>
@@ -79,7 +92,11 @@ export const ObjectiveDetails = ({
             autoComplete="Title"
             maxLength={50}
             placeholder="Choose a title. (Maximum 50 characters)."
-            className="h-10 rounded-md"
+            className={`h-10 rounded-md ${
+              showErrors && !objectiveContData.title.trim()
+                ? "border-destructive focus-visible:ring-destructive/20"
+                : ""
+            }`}
             required
             value={objectiveContData.title}
             onChange={(e) =>
@@ -103,7 +120,11 @@ export const ObjectiveDetails = ({
           </div>
 
           <Textarea
-            className="h-32 w-full min-w-0 resize-none"
+            className={`h-32 w-full min-w-0 resize-none ${
+              showErrors && !objectiveContData.summary.trim()
+                ? "border-destructive focus-visible:ring-destructive/20"
+                : ""
+            }`}
             rows={4}
             maxLength={250}
             placeholder="Write a summary for the objective."
@@ -118,6 +139,38 @@ export const ObjectiveDetails = ({
           />
         </Field>
 
+        <Field className="space-y-2">
+          <div className="space-y-1">
+            <FieldLabel required className="mono-micro">
+              Subjects
+            </FieldLabel>
+            <FieldDescription className="text-xs">
+              Select at least one subject this objective falls under.
+            </FieldDescription>
+          </div>
+
+          <Combobox
+            multiple
+            className={
+              showErrors && objectiveContData.subjects.length === 0
+                ? "border-destructive focus-visible:ring-destructive/20"
+                : ""
+            }
+            items={subjectsData.map((s) => ({
+              value: s.slug,
+              label: s.name,
+              description: s.summary,
+            }))}
+            value={objectiveContData.subjects}
+            onValueChange={(subjects) =>
+              setObjectiveContData((prev) => ({
+                ...prev,
+                subjects,
+              }))
+            }
+          />
+        </Field>
+
         <Field className="space-y-2">
           <div className="space-y-1">
             <FieldLabel required className="mono-micro">
@@ -131,6 +184,11 @@ export const ObjectiveDetails = ({
 
           <Combobox
             multiple
+            className={
+              showErrors && objectiveContData.targets.length === 0
+                ? "border-destructive focus-visible:ring-destructive/20"
+                : ""
+            }
             items={guides}
             value={objectiveContData.targets}
             onValueChange={(targets) => {
@@ -166,6 +224,11 @@ export const ObjectiveDetails = ({
 
           <Combobox
             disabled={targs.length === 0}
+            className={
+              showErrors && !objectiveContData.featured
+                ? "border-destructive focus-visible:ring-destructive/20"
+                : ""
+            }
             items={targs}
             value={objectiveContData.featured}
             onValueChange={(featured) =>
diff --git a/app/src/components/contribute/steps/OrderObjectiveGuides.tsx b/app/src/components/contribute/steps/OrderObjectiveGuides.tsx
index 25575d03..85e08fa1 100644
--- a/app/src/components/contribute/steps/OrderObjectiveGuides.tsx
+++ b/app/src/components/contribute/steps/OrderObjectiveGuides.tsx
@@ -10,6 +10,7 @@ import {
   User,
   Workflow,
 } from "lucide-react";
+import { toast } from "sonner";
 import { GuideGraph } from "../graph-view/GuideGraph";
 import type { Dispatch, SetStateAction } from "react";
 import type { ObjectiveContribution } from "@/types/contributions";
@@ -106,6 +107,7 @@ export const OrderObjectiveGuides = ({
   objectiveContData,
   setObjectiveContData,
 }: PropTypes) => {
+  const [showErrors, setShowErrors] = useState(false);
   const [targetSlug, setTargetSlug] = useState<string>(
     objectiveContData.targets[0] || ""
   );
@@ -262,12 +264,29 @@ export const OrderObjectiveGuides = ({
     updateSubObjective(targetSlug, newSeq);
   };
 
+  const isNextDisabled =
+    objectiveContData.subObjectives.length < objectiveContData.targets.length;
+
+  const handleNextClick = (e: React.MouseEvent) => {
+    if (isNextDisabled) {
+      e.preventDefault();
+      setShowErrors(true);
+      toast.error(
+        "Please visit and order every target guide before proceeding."
+      );
+    }
+  };
+
   return (
     <Stepper.Content
       step="objective-ordering"
       className="flex min-h-0 w-full flex-1 flex-col"
     >
-      <StepperActionHeader title={"Order Guides"} Stepper={Stepper} />
+      <StepperActionHeader
+        title={"Order Guides"}
+        Stepper={Stepper}
+        onNextClick={handleNextClick}
+      />
 
       <FieldGroup className="mt-0 flex min-h-0 flex-1 flex-col">
         {/* Target Guide Sequence */}
@@ -287,6 +306,9 @@ export const OrderObjectiveGuides = ({
               if (!guide) return null;
 
               const isActive = slug === targetSlug;
+              const hasVisited = objectiveContData.subObjectives.some(
+                (s) => s.targetSlug === slug
+              );
 
               return (
                 <div key={slug} className="flex shrink-0 items-center gap-2">
@@ -297,14 +319,18 @@ export const OrderObjectiveGuides = ({
                     className={`flex items-center gap-2 rounded-full border px-3 py-1.5 text-sm font-medium transition-colors ${
                       isActive
                         ? "border-primary bg-primary/10 text-primary ring-1 ring-primary/20"
-                        : "border-border bg-background text-muted-foreground hover:border-primary/50 hover:bg-muted"
+                        : showErrors && !hasVisited
+                          ? "border-destructive bg-destructive/5 text-destructive hover:bg-destructive/10"
+                          : "border-border bg-background text-muted-foreground hover:border-primary/50 hover:bg-muted"
                     }`}
                   >
                     <span
                       className={`flex h-5 w-5 items-center justify-center rounded-full text-xs ${
                         isActive
                           ? "bg-primary text-primary-foreground"
-                          : "bg-muted-foreground/20 text-muted-foreground"
+                          : showErrors && !hasVisited
+                            ? "bg-destructive/20 text-destructive"
+                            : "bg-muted-foreground/20 text-muted-foreground"
                       }`}
                     >
                       {index + 1}
diff --git a/app/src/components/contribute/steps/PreviewObjective.tsx b/app/src/components/contribute/steps/PreviewObjective.tsx
index a98b6b6a..43499641 100644
--- a/app/src/components/contribute/steps/PreviewObjective.tsx
+++ b/app/src/components/contribute/steps/PreviewObjective.tsx
@@ -1,29 +1,345 @@
+import React from "react";
+import { ArrowRight } from "lucide-react";
+import type { ObjectiveContribution } from "@/types/contributions";
 import { Separator } from "@/components/ui/separator";
 import { StepperActionHeader } from "@/components/contribute/StepperActionHeader";
+import guidesData from "@/data/guides.json";
+import subjectsData from "@/data/subjects.json";
+
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Badge } from "@/components/ui/badge";
+import { Footer } from "@/components/cards/Footer";
 
 type PropTypes = {
   Stepper: any;
-  // objective: any;// TODO: uncomment and fix this type
+  objectiveContData: ObjectiveContribution;
   onPublish: () => void;
   submitting: boolean;
 };
 
+type FeaturedNode = {
+  position: number;
+  slug: string | null;
+  title: string | null;
+};
+
+function FeaturedSubObjective({ nodes }: { nodes: Array<FeaturedNode> }) {
+  const shown = nodes.slice(-3);
+  const hidden = nodes.length - shown.length;
+
+  return (
+    <CardContent className="border-t p-4">
+      <div className="flex items-center justify-center gap-4 sm:gap-8 md:gap-12">
+        {hidden > 0 && (
+          <React.Fragment>
+            <div className="flex w-full flex-col items-center justify-center text-center sm:w-18 md:w-22">
+              <span className="flex h-8 shrink-0 items-center justify-center text-sm font-medium">
+                {hidden}
+              </span>
+              <span className="line-clamp-3 text-sm leading-snug text-muted-foreground">
+                guides
+              </span>
+            </div>
+            <div className="flex items-center justify-center">
+              <ArrowRight className="mt-1.5 h-4 w-4 shrink-0 rotate-90 text-muted-foreground sm:rotate-0" />
+            </div>
+          </React.Fragment>
+        )}
+        {shown.map((step, index) => (
+          <React.Fragment key={step.position}>
+            <div className="flex w-full flex-col items-center justify-center text-center sm:w-24 md:w-28">
+              <span className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-badge text-sm font-medium">
+                {step.position}
+              </span>
+              <span className="line-clamp-3 text-sm leading-snug text-muted-foreground">
+                {step.title}
+              </span>
+            </div>
+            {index < shown.length - 1 && (
+              <div className="flex items-center justify-center">
+                <ArrowRight className="h-5 w-5 shrink-0 rotate-90 text-muted-foreground sm:rotate-0" />
+              </div>
+            )}
+          </React.Fragment>
+        ))}
+      </div>
+    </CardContent>
+  );
+}
+
+function PreviewObjectiveCard({ objective }: { objective: any }) {
+  return (
+    <Card className="group flex flex-col justify-between rounded-md bg-background shadow-none transition-colors hover:bg-muted">
+      <CardHeader className="relative p-4">
+        <div className="flex items-center justify-between">
+          <p className="font-mono text-xs tracking-wide text-muted-foreground uppercase">
+            Objective
+          </p>
+        </div>
+
+        <h3 className="line-clamp-2 text-xl font-semibold tracking-tight">
+          {objective.title}
+        </h3>
+
+        <p className="max-w-2xl text-sm text-muted-foreground">
+          {objective.summary}
+        </p>
+
+        <div className="flex items-center justify-between">
+          <p className="mono-micro text-muted-foreground">
+            @{objective.curator} | {objective.created_at}
+          </p>
+        </div>
+
+        {objective.tags && objective.tags.length > 0 && (
+          <div className="flex flex-wrap gap-2 pt-4">
+            {objective.tags.map((tag: any) => {
+              const slug = typeof tag === "string" ? tag : tag.slug;
+              const name = typeof tag === "string" ? tag : tag.name;
+              return (
+                <Badge
+                  key={slug}
+                  variant="outline"
+                  className="mono-micro rounded-full border border-badge-border bg-badge tracking-[0.08em] text-badge-foreground"
+                >
+                  {name}
+                </Badge>
+              );
+            })}
+          </div>
+        )}
+      </CardHeader>
+
+      {objective.featuredSubObjective &&
+        objective.featuredSubObjective.length > 0 && (
+          <FeaturedSubObjective nodes={objective.featuredSubObjective} />
+        )}
+
+      {(objective.stats || objective.actionBtns) && (
+        <Footer
+          data={{ stats: objective.stats, actionBtns: objective.actionBtns }}
+        />
+      )}
+    </Card>
+  );
+}
+
 export const PreviewObjective = ({
   Stepper,
-  // objective,// TODO: uncomment and pass in the data
+  objectiveContData,
   onPublish,
   submitting,
 }: PropTypes) => {
+  // Helpers to resolve slugs
+  const getGuideTitle = (slug: string) => {
+    const guide = guidesData.find((g) => g.slug === slug);
+    return guide ? guide.title : slug;
+  };
+
+  const getSubjectName = (slug: string) => {
+    const subject = subjectsData.find((s) => s.slug === slug);
+    return subject ? subject.name : slug;
+  };
+
+  const getGuideDuration = (slug: string) => {
+    const guide = guidesData.find((g) => g.slug === slug);
+    return guide?.duration || 0;
+  };
+
+  const getGuideSummary = (slug: string) => {
+    const guide = guidesData.find((g) => g.slug === slug);
+    return guide?.summary || null;
+  };
+
+  const getGuideTags = (slug: string) => {
+    const guide = guidesData.find((g) => g.slug === slug);
+    return guide?.tags || [];
+  };
+
+  const getTargetDuration = (targetSlug: string) => {
+    const sub = objectiveContData.subObjectives.find(
+      (s) => s.targetSlug === targetSlug
+    );
+    if (sub?.curatedSequence && sub.curatedSequence.length > 0) {
+      return sub.curatedSequence.reduce(
+        (acc, slug) => acc + getGuideDuration(slug),
+        0
+      );
+    }
+    return getGuideDuration(targetSlug);
+  };
+
+  const totalDuration = objectiveContData.targets.reduce(
+    (acc, targetSlug) => acc + getTargetDuration(targetSlug),
+    0
+  );
+
+  const totalGuides = objectiveContData.targets.reduce((acc, targetSlug) => {
+    const sub = objectiveContData.subObjectives.find(
+      (s) => s.targetSlug === targetSlug
+    );
+    if (sub?.curatedSequence && sub.curatedSequence.length > 0) {
+      return acc + sub.curatedSequence.length;
+    }
+    return acc + 1;
+  }, 0);
+
+  const featuredTargetSlug =
+    objectiveContData.featured || objectiveContData.targets[0];
+  const featuredSub = featuredTargetSlug
+    ? objectiveContData.subObjectives.find(
+        (s) => s.targetSlug === featuredTargetSlug
+      )
+    : null;
+
+  let featuredSubObjectiveNodes = undefined;
+  if (featuredTargetSlug) {
+    const sequence =
+      featuredSub?.curatedSequence && featuredSub.curatedSequence.length > 0
+        ? featuredSub.curatedSequence
+        : [featuredTargetSlug];
+    featuredSubObjectiveNodes = sequence.map((slug, idx) => ({
+      position: idx + 1,
+      slug,
+      title: getGuideTitle(slug),
+    }));
+  }
+
+  const previewData = {
+    slug: "",
+    title: objectiveContData.title || "Untitled Objective",
+    summary: objectiveContData.summary || "No summary provided.",
+    curator: "preview",
+    created_at: "Today",
+    featuredSubObjective: featuredSubObjectiveNodes,
+    stats: [
+      {
+        label: "Duration",
+        data: `${totalDuration} min`,
+      },
+      {
+        label: "Sub-objectives",
+        data: objectiveContData.targets.length,
+      },
+      {
+        label: "Guides",
+        data: totalGuides,
+      },
+    ],
+    tags: objectiveContData.subjects.map((slug) => ({
+      slug,
+      name: getSubjectName(slug),
+    })),
+  };
+
   return (
     <Stepper.Content step="preview-objective">
       <StepperActionHeader
-        title={"Preview Guide"}
+        title={"Preview Objective"}
         Stepper={Stepper}
         onPublish={onPublish}
         submitting={submitting}
       />
 
       <Separator className="mb-8 bg-border" />
+
+      <div className="mt-8 flex w-full flex-col gap-12">
+        <PreviewObjectiveCard objective={previewData} />
+
+        <div className="space-y-6">
+          <h3 className="px-1 text-lg font-semibold tracking-tight">
+            Sub-Objectives
+          </h3>
+          {objectiveContData.targets.length === 0 ? (
+            <p className="px-1 text-sm text-muted-foreground">
+              No subobjectives configured.
+            </p>
+          ) : (
+            <ol className="m-0 flex w-full list-none flex-col gap-10 p-0">
+              {objectiveContData.targets.map((targetSlug, idx) => {
+                const sub = objectiveContData.subObjectives.find(
+                  (s) => s.targetSlug === targetSlug
+                );
+
+                return (
+                  <li
+                    key={idx}
+                    className="flex flex-col gap-2 md:flex-row md:items-center md:gap-4"
+                  >
+                    <div className="flex h-12 w-12 shrink-0 items-center justify-center rounded-full border border-badge-border bg-badge font-mono text-base font-semibold text-badge-foreground sm:m-8 md:m-16 lg:m-28">
+                      {idx + 1}
+                    </div>
+
+                    <Card className="flex-1 rounded-md bg-background shadow-none transition-colors hover:bg-muted">
+                      <CardHeader className="p-4">
+                        <div className="flex items-center justify-between gap-4">
+                          <CardTitle className="text-base font-medium">
+                            {getGuideTitle(targetSlug)}
+                          </CardTitle>
+                          {getTargetDuration(targetSlug) > 0 && (
+                            <span className="shrink-0 font-mono text-[10px] text-muted-foreground uppercase">
+                              {getTargetDuration(targetSlug)} min
+                            </span>
+                          )}
+                        </div>
+                        {getGuideSummary(targetSlug) && (
+                          <p className="mt-2 text-sm text-muted-foreground">
+                            {getGuideSummary(targetSlug)}
+                          </p>
+                        )}
+                        {getGuideTags(targetSlug).length > 0 && (
+                          <div className="mt-3 flex flex-wrap gap-2">
+                            {getGuideTags(targetSlug).map((tagSlug) => (
+                              <Badge
+                                key={tagSlug}
+                                variant="outline"
+                                className="mono-micro rounded-full border border-badge-border bg-badge tracking-[0.08em] text-badge-foreground"
+                              >
+                                {getSubjectName(tagSlug)}
+                              </Badge>
+                            ))}
+                          </div>
+                        )}
+                      </CardHeader>
+                      <CardContent className="border-t p-4">
+                        {sub?.curatedSequence &&
+                        sub.curatedSequence.length > 0 ? (
+                          <ol className="relative ml-3 space-y-6 border-l border-muted-foreground/20">
+                            {sub.curatedSequence.map((stepSlug, stepIdx) => (
+                              <li
+                                key={stepIdx}
+                                className="ml-6 flex flex-col gap-1"
+                              >
+                                <span className="absolute -left-3 flex h-6 w-6 items-center justify-center rounded-full border border-muted-foreground/30 bg-background font-mono text-xs text-muted-foreground ring-4 ring-background">
+                                  {stepIdx + 1}
+                                </span>
+                                <div className="mt-1 flex items-center justify-between gap-4">
+                                  <span className="text-sm leading-none font-medium">
+                                    {getGuideTitle(stepSlug)}
+                                  </span>
+                                  {getGuideDuration(stepSlug) > 0 && (
+                                    <span className="shrink-0 font-mono text-[10px] text-muted-foreground uppercase">
+                                      {getGuideDuration(stepSlug)} min
+                                    </span>
+                                  )}
+                                </div>
+                              </li>
+                            ))}
+                          </ol>
+                        ) : (
+                          <p className="text-sm text-muted-foreground">
+                            Default sequence will be used.
+                          </p>
+                        )}
+                      </CardContent>
+                    </Card>
+                  </li>
+                );
+              })}
+            </ol>
+          )}
+        </div>
+      </div>
     </Stepper.Content>
   );
 };
diff --git a/app/src/components/ui/combobox.tsx b/app/src/components/ui/combobox.tsx
index b84b48c2..6f5e1163 100644
--- a/app/src/components/ui/combobox.tsx
+++ b/app/src/components/ui/combobox.tsx
@@ -27,6 +27,7 @@ export type ComboboxItem = {
 type ComboboxBaseProps = {
   items: Array<ComboboxItem>;
   placeholder?: string;
+  className?: string;
   disabled?: boolean;
 };
 
@@ -34,12 +35,14 @@ type SingleProps = ComboboxBaseProps & {
   multiple?: false;
   value: string;
   onValueChange: (value: string) => void;
+  disabled?: boolean;
 };
 
 type MultiProps = ComboboxBaseProps & {
   multiple: true;
   value: Array<string>;
   onValueChange: (value: Array<string>) => void;
+  disabled?: boolean;
 };
 
 type ComboboxProps = SingleProps | MultiProps;
@@ -49,6 +52,7 @@ export function Combobox({
   items,
   value,
   onValueChange,
+  className,
   disabled,
 }: ComboboxProps) {
   const [open, setOpen] = React.useState(false);
@@ -78,7 +82,7 @@ export function Combobox({
       <PopoverTrigger asChild>
         <Button
           variant="outline"
-          className="w-[300px] justify-between"
+          className={cn("w-75 justify-between", className)}
           disabled={disabled}
         >
           <div className="flex flex-wrap gap-1">
@@ -104,7 +108,7 @@ export function Combobox({
         </Button>
       </PopoverTrigger>
 
-      <PopoverContent className="w-[500px] p-0">
+      <PopoverContent className="w-125 p-0">
         <Command>
           <CommandInput placeholder="Search..." />
           <CommandList>
diff --git a/app/src/routes/contribute.tsx b/app/src/routes/contribute.tsx
index 8d869441..dae48e1b 100644
--- a/app/src/routes/contribute.tsx
+++ b/app/src/routes/contribute.tsx
@@ -1,6 +1,6 @@
 import { createFileRoute } from "@tanstack/react-router";
 
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import type { ContributionType } from "@/types/contributions";
 import ContributionFlow from "@/components/contribute/ContributionFlow";
 
@@ -11,6 +11,16 @@ export const Route = createFileRoute("/contribute")({
 function RouteComponent() {
   const [type, setType] = useState<ContributionType | null>(null);
 
+  useEffect(() => {
+    const savedType = sessionStorage.getItem("cont_type");
+    if (savedType) setType(savedType as ContributionType);
+  }, []);
+
+  useEffect(() => {
+    if (type) sessionStorage.setItem("cont_type", type);
+    else sessionStorage.removeItem("cont_type");
+  }, [type]);
+
   return (
     <div className="mx-auto flex min-h-[max(calc(100vh-65px),750px)] w-full max-w-[1280px] flex-col border-x bg-background">
       <section className="flex min-h-0 flex-1 flex-col border-b px-8 py-8 lg:px-16">
diff --git a/app/src/types/contributions.ts b/app/src/types/contributions.ts
index a19a5b35..5ad1bb14 100644
--- a/app/src/types/contributions.ts
+++ b/app/src/types/contributions.ts
@@ -32,6 +32,7 @@ export type SubObjective = {
 export type ObjectiveContribution = {
   title: string;
   summary: string;
+  subjects: Array<string>;
   targets: Array<string>;
   featured: string;
   subObjectives: Array<SubObjective>;