diff --git a/apps/next-app/pages/modules/[questionBank]/flashcards/[collectionId]/[seed].page.tsx b/apps/next-app/pages/modules/[questionBank]/flashcards/[collectionId]/[seed].page.tsx
index 3e3883411..fc765c884 100644
--- a/apps/next-app/pages/modules/[questionBank]/flashcards/[collectionId]/[seed].page.tsx
+++ b/apps/next-app/pages/modules/[questionBank]/flashcards/[collectionId]/[seed].page.tsx
@@ -3,6 +3,7 @@ import { AppHead } from "@chair-flight/react/components";
 import { FlashcardTest, LayoutModule } from "@chair-flight/react/containers";
 import { ssrHandler } from "@chair-flight/trpc/server";
 import type { QuestionBankName } from "@chair-flight/base/types";
+import type { Breadcrumbs } from "@chair-flight/react/containers";
 import type { NextPage } from "next";
 
 type PageProps = {
@@ -17,16 +18,24 @@ type PageParams = {
   seed: string;
 };
 
-const Page: NextPage<PageProps> = ({ questionBank, collectionId, seed }) => (
-  <LayoutModule questionBank={questionBank} fixedHeight>
-    <AppHead />
-    <FlashcardTest
-      questionBank={questionBank}
-      collectionId={collectionId}
-      seed={seed}
-    />
-  </LayoutModule>
-);
+const Page: NextPage<PageProps> = ({ questionBank, collectionId, seed }) => {
+  const crumbs = [
+    [questionBank.toUpperCase(), `/modules/${questionBank}`],
+    ["Flashcards", `/modules/${questionBank}/flashcards`],
+    collectionId,
+  ] as Breadcrumbs;
+
+  return (
+    <LayoutModule questionBank={questionBank} breadcrumbs={crumbs} fixedHeight>
+      <AppHead />
+      <FlashcardTest
+        questionBank={questionBank}
+        collectionId={collectionId}
+        seed={seed}
+      />
+    </LayoutModule>
+  );
+};
 
 export const getServerSideProps = ssrHandler<PageProps, PageParams>(
   async ({ helper, params }) => {
diff --git a/apps/next-app/pages/modules/[questionBank]/flashcards/[collectionId]/index.page.tsx b/apps/next-app/pages/modules/[questionBank]/flashcards/[collectionId]/index.page.tsx
index afaa449e2..cc35fbd76 100644
--- a/apps/next-app/pages/modules/[questionBank]/flashcards/[collectionId]/index.page.tsx
+++ b/apps/next-app/pages/modules/[questionBank]/flashcards/[collectionId]/index.page.tsx
@@ -4,6 +4,7 @@ import { AppHead } from "@chair-flight/react/components";
 import { FlashcardList, LayoutModule } from "@chair-flight/react/containers";
 import { staticHandler } from "@chair-flight/trpc/server";
 import type { QuestionBankName } from "@chair-flight/base/types";
+import type { Breadcrumbs } from "@chair-flight/react/containers";
 import type { GetStaticPaths, NextPage } from "next";
 
 type PageProps = {
@@ -16,12 +17,20 @@ type PageParams = {
   collectionId: string;
 };
 
-const FlashcardsThemePage: NextPage<PageProps> = (props) => (
-  <LayoutModule noPadding {...props}>
-    <AppHead />
-    <FlashcardList {...props} />
-  </LayoutModule>
-);
+const Page: NextPage<PageProps> = ({ questionBank, collectionId }) => {
+  const crumbs = [
+    [questionBank.toUpperCase(), `/modules/${questionBank}`],
+    ["Flashcards", `/modules/${questionBank}/flashcards`],
+    collectionId,
+  ] as Breadcrumbs;
+
+  return (
+    <LayoutModule noPadding questionBank={questionBank} breadcrumbs={crumbs}>
+      <AppHead />
+      <FlashcardList questionBank={questionBank} collectionId={collectionId} />
+    </LayoutModule>
+  );
+};
 
 export const getStaticProps = staticHandler<PageProps, PageParams>(
   async ({ params, helper }) => {
@@ -51,4 +60,4 @@ export const getStaticPaths: GetStaticPaths<PageParams> = async () => {
   return { fallback: false, paths };
 };
 
-export default FlashcardsThemePage;
+export default Page;
diff --git a/apps/next-app/pages/modules/[questionBank]/flashcards/index.page.tsx b/apps/next-app/pages/modules/[questionBank]/flashcards/index.page.tsx
index 03ec61217..e4af0f097 100644
--- a/apps/next-app/pages/modules/[questionBank]/flashcards/index.page.tsx
+++ b/apps/next-app/pages/modules/[questionBank]/flashcards/index.page.tsx
@@ -7,6 +7,7 @@ import {
 } from "@chair-flight/react/containers";
 import { staticHandler } from "@chair-flight/trpc/server";
 import type { QuestionBankName } from "@chair-flight/base/types";
+import type { Breadcrumbs } from "@chair-flight/react/containers";
 import type { GetStaticPaths, NextPage } from "next";
 
 type PageParams = {
@@ -17,41 +18,48 @@ type PageProps = {
   questionBank: QuestionBankName;
 };
 
-const Page: NextPage<PageProps> = ({ questionBank }) => (
-  <LayoutModule noPadding questionBank="prep">
-    <AppHead
-      title="Chair Flight - Flash Cards"
-      linkTitle="Chair Flight - Flash Cards"
-      linkDescription={[
-        "Use these flash cards to practice for your interview. You can review",
-        "all flash cards at once, or get 10 random cards to review. Try to",
-        "answer the question outloud as you would in an interview. Consider",
-        "recording your answer and playing it back to see how you sound.",
-        "\n\n",
-        "Once you are satisfied with the answer, Flip the card to see if you",
-        "are close enough.",
-      ].join(" ")}
-    />
-    <Box component="section" maxWidth="lg" margin="auto" p={2}>
-      <Typography level="h1">Flash Cards</Typography>
-      <Typography>
-        Practice for open-ended interview questions.
-        <br />
-        Use these flash cards to practice for your interview. You can review all
-        flash cards at once, or get 10 random cards to review. Try to answer the
-        question outloud as you would in an interview. Consider recording your
-        answer and playing it back to see how you sound.
-        <br />
-        Once you are satisfied with the answer, Flip the card to see if you are
-        close enough.
-      </Typography>
-      <Typography level="h3" sx={{ mt: 3, color: "primary.500" }}>
-        Have fun!
-      </Typography>
-    </Box>
-    <FlashcardCollectionList questionBank={questionBank} />
-  </LayoutModule>
-);
+const Page: NextPage<PageProps> = ({ questionBank }) => {
+  const crumbs = [
+    [questionBank.toUpperCase(), `/modules/${questionBank}`],
+    "Flashcards",
+  ] as Breadcrumbs;
+
+  return (
+    <LayoutModule noPadding questionBank={questionBank} breadcrumbs={crumbs}>
+      <AppHead
+        title="Chair Flight - Flash Cards"
+        linkTitle="Chair Flight - Flash Cards"
+        linkDescription={[
+          "Use these flash cards to practice for your interview. You can review",
+          "all flash cards at once, or get 10 random cards to review. Try to",
+          "answer the question outloud as you would in an interview. Consider",
+          "recording your answer and playing it back to see how you sound.",
+          "\n\n",
+          "Once you are satisfied with the answer, Flip the card to see if you",
+          "are close enough.",
+        ].join(" ")}
+      />
+      <Box component="section" maxWidth="lg" margin="auto" p={2}>
+        <Typography level="h1">Flash Cards</Typography>
+        <Typography>
+          Practice for open-ended interview questions.
+          <br />
+          Use these flash cards to practice for your interview. You can review
+          all flash cards at once, or get 10 random cards to review. Try to
+          answer the question outloud as you would in an interview. Consider
+          recording your answer and playing it back to see how you sound.
+          <br />
+          Once you are satisfied with the answer, Flip the card to see if you
+          are close enough.
+        </Typography>
+        <Typography level="h3" sx={{ mt: 3, color: "primary.500" }}>
+          Have fun!
+        </Typography>
+      </Box>
+      <FlashcardCollectionList questionBank={questionBank} />
+    </LayoutModule>
+  );
+};
 
 export const getStaticProps = staticHandler<PageProps, PageParams>(
   async ({ params, helper }) => {
diff --git a/apps/next-app/pages/modules/[questionBank]/index.page.tsx b/apps/next-app/pages/modules/[questionBank]/index.page.tsx
index 3a2674aef..276b56f2b 100644
--- a/apps/next-app/pages/modules/[questionBank]/index.page.tsx
+++ b/apps/next-app/pages/modules/[questionBank]/index.page.tsx
@@ -1,9 +1,13 @@
 import * as fs from "node:fs/promises";
-import { Divider, Link, Typography } from "@mui/joy";
 import { AppHead } from "@chair-flight/react/components";
-import { LayoutModule, OverviewModules } from "@chair-flight/react/containers";
+import {
+  LayoutModule,
+  OverviewModule,
+  OverviewModules,
+} from "@chair-flight/react/containers";
 import { staticHandler } from "@chair-flight/trpc/server";
 import type { QuestionBankName } from "@chair-flight/base/types";
+import type { Breadcrumbs } from "@chair-flight/react/containers";
 import type { GetStaticPaths, NextPage } from "next";
 
 type PageProps = {
@@ -14,22 +18,22 @@ type PageParams = {
   questionBank: QuestionBankName;
 };
 
-const Page: NextPage<PageProps> = ({ questionBank }) => (
-  <LayoutModule questionBank={questionBank}>
-    <AppHead />
-    <Typography level="h2">Question Bank</Typography>
-    <Divider />
-    <OverviewModules questionBank={questionBank} sx={{ my: 2 }} />
-    <Typography level="h2">Tests</Typography>
-    <Divider sx={{ mb: 2 }} />
-    <Link href={`/modules/${questionBank}/tests/create`}>Create New Test</Link>
-  </LayoutModule>
-);
+const Page: NextPage<PageProps> = ({ questionBank }) => {
+  const crumbs = [questionBank.toUpperCase()] as Breadcrumbs;
+
+  return (
+    <LayoutModule questionBank={questionBank} breadcrumbs={crumbs}>
+      <AppHead />
+      <OverviewModules questionBank={questionBank} sx={{ mb: 2 }} />
+    </LayoutModule>
+  );
+};
 
 export const getStaticProps = staticHandler<PageProps, PageParams>(
   async ({ params, helper }) => {
     await OverviewModules.getData({ helper, params });
     await LayoutModule.getData({ helper, params });
+    await OverviewModule.getData({ helper, params });
     return { props: params };
   },
   fs,
diff --git a/apps/next-app/pages/modules/[questionBank]/learning-objectives/[learningObjectiveId].page.tsx b/apps/next-app/pages/modules/[questionBank]/learning-objectives/[learningObjectiveId].page.tsx
index 7278bb380..5b90172fd 100644
--- a/apps/next-app/pages/modules/[questionBank]/learning-objectives/[learningObjectiveId].page.tsx
+++ b/apps/next-app/pages/modules/[questionBank]/learning-objectives/[learningObjectiveId].page.tsx
@@ -5,6 +5,7 @@ import {
 } from "@chair-flight/react/containers";
 import { ssrHandler } from "@chair-flight/trpc/server";
 import type { QuestionBankName } from "@chair-flight/base/types";
+import type { Breadcrumbs } from "@chair-flight/react/containers";
 import type { NextPage } from "next";
 
 type PageParams = {
@@ -17,12 +18,27 @@ type PageProps = {
   learningObjectiveId: string;
 };
 
-export const Page: NextPage<PageProps> = (props) => (
-  <LayoutModule {...props}>
-    <AppHead />
-    <LearningObjectiveOverview sx={{ p: 2 }} {...props} />
-  </LayoutModule>
-);
+export const Page: NextPage<PageProps> = ({
+  questionBank,
+  learningObjectiveId,
+}) => {
+  const crumbs = [
+    [questionBank.toUpperCase(), `/modules/${questionBank}`],
+    ["Learning Objectives", `/modules/${questionBank}/learning-objectives`],
+    learningObjectiveId,
+  ] as Breadcrumbs;
+
+  return (
+    <LayoutModule questionBank={questionBank} breadcrumbs={crumbs}>
+      <AppHead />
+      <LearningObjectiveOverview
+        sx={{ p: 2 }}
+        questionBank={questionBank}
+        learningObjectiveId={learningObjectiveId}
+      />
+    </LayoutModule>
+  );
+};
 
 export const getServerSideProps = ssrHandler<PageProps, PageParams>(
   async ({ helper, params }) => {
diff --git a/apps/next-app/pages/modules/[questionBank]/learning-objectives/index.page.tsx b/apps/next-app/pages/modules/[questionBank]/learning-objectives/index.page.tsx
index e72b90b50..a8c595e5d 100644
--- a/apps/next-app/pages/modules/[questionBank]/learning-objectives/index.page.tsx
+++ b/apps/next-app/pages/modules/[questionBank]/learning-objectives/index.page.tsx
@@ -6,6 +6,7 @@ import {
 } from "@chair-flight/react/containers";
 import { staticHandler } from "@chair-flight/trpc/server";
 import type { QuestionBankName } from "@chair-flight/base/types";
+import type { Breadcrumbs } from "@chair-flight/react/containers";
 import type { GetStaticPaths, NextPage } from "next";
 
 type PageProps = {
@@ -16,12 +17,19 @@ type PageParams = {
   questionBank: QuestionBankName;
 };
 
-export const Page: NextPage<PageProps, PageParams> = (props) => (
-  <LayoutModule fixedHeight {...props}>
-    <AppHead />
-    <LearningObjectivesSearch {...props} />
-  </LayoutModule>
-);
+export const Page: NextPage<PageProps, PageParams> = ({ questionBank }) => {
+  const crumbs = [
+    [questionBank.toUpperCase(), `/modules/${questionBank}`],
+    "Learning Objectives",
+  ] as Breadcrumbs;
+
+  return (
+    <LayoutModule fixedHeight questionBank={questionBank} breadcrumbs={crumbs}>
+      <AppHead />
+      <LearningObjectivesSearch questionBank={questionBank} />
+    </LayoutModule>
+  );
+};
 
 export const getStaticProps = staticHandler<PageProps, PageParams>(
   async ({ params, helper }) => {
diff --git a/apps/next-app/pages/modules/[questionBank]/questions/[questionId]/edit.page.tsx b/apps/next-app/pages/modules/[questionBank]/questions/[questionId]/edit.page.tsx
index 94632ab47..a44019792 100644
--- a/apps/next-app/pages/modules/[questionBank]/questions/[questionId]/edit.page.tsx
+++ b/apps/next-app/pages/modules/[questionBank]/questions/[questionId]/edit.page.tsx
@@ -2,6 +2,7 @@ import { AppHead } from "@chair-flight/react/components";
 import { LayoutModule, QuestionEditor } from "@chair-flight/react/containers";
 import { ssrHandler } from "@chair-flight/trpc/server";
 import type { QuestionBankName } from "@chair-flight/base/types";
+import type { Breadcrumbs } from "@chair-flight/react/containers";
 import type { NextPage } from "next";
 
 type PageProps = {
@@ -17,12 +18,26 @@ type PageParams = {
 export const EditQuestionPage: NextPage<PageProps, PageParams> = ({
   questionBank,
   questionId,
-}) => (
-  <LayoutModule questionBank={questionBank} fixedHeight noPadding>
-    <AppHead title={questionId} />
-    <QuestionEditor questionBank={questionBank} questionId={questionId} />
-  </LayoutModule>
-);
+}) => {
+  const crumbs = [
+    [questionBank.toUpperCase(), `/modules/${questionBank}`],
+    ["Questions", `/modules/${questionBank}/questions`],
+    [questionId, `/modules/${questionBank}/questions/${questionId}`],
+    "edit",
+  ] as Breadcrumbs;
+
+  return (
+    <LayoutModule
+      questionBank={questionBank}
+      breadcrumbs={crumbs}
+      fixedHeight
+      noPadding
+    >
+      <AppHead title={questionId} />
+      <QuestionEditor questionBank={questionBank} questionId={questionId} />
+    </LayoutModule>
+  );
+};
 
 export const getServerSideProps = ssrHandler<PageProps, PageParams>(
   async ({ params, helper }) => {
diff --git a/apps/next-app/pages/modules/[questionBank]/questions/[questionId]/index.page.tsx b/apps/next-app/pages/modules/[questionBank]/questions/[questionId]/index.page.tsx
index 246dd18ca..26befab3a 100644
--- a/apps/next-app/pages/modules/[questionBank]/questions/[questionId]/index.page.tsx
+++ b/apps/next-app/pages/modules/[questionBank]/questions/[questionId]/index.page.tsx
@@ -4,6 +4,7 @@ import { AppHead } from "@chair-flight/react/components";
 import { LayoutModule, QuestionOverview } from "@chair-flight/react/containers";
 import { ssrHandler } from "@chair-flight/trpc/server";
 import type { QuestionBankName } from "@chair-flight/base/types";
+import type { Breadcrumbs } from "@chair-flight/react/containers";
 import type { NextPage } from "next";
 
 type PageParams = {
@@ -14,8 +15,8 @@ type PageParams = {
 };
 
 type PageProps = {
-  seed?: string;
-  variantId?: string;
+  seed: string;
+  variantId: string | null;
   questionBank: QuestionBankName;
   questionId: string;
 };
@@ -29,7 +30,7 @@ const Page: NextPage<PageProps> = ({
   const router = useRouter();
   const query = router.query as PageParams;
   const seed = query.seed ?? initialSeed;
-  const variantId = query.variantId ?? initialVariantId;
+  const variantId = query.variantId ?? initialVariantId ?? undefined;
 
   const updateVariantAndSeed = (query: { variantId: string; seed: string }) => {
     router.push({ pathname: router.pathname, query }, undefined, {
@@ -37,13 +38,19 @@ const Page: NextPage<PageProps> = ({
     });
   };
 
+  const crumbs = [
+    [questionBank.toUpperCase(), `/modules/${questionBank}`],
+    ["Questions", `/modules/${questionBank}/questions`],
+    questionId,
+  ] as Breadcrumbs;
+
   // const linkDescription = getQuestionPreview(
   //   questionTemplate,
   //   initialVariantId,
   // );
 
   return (
-    <LayoutModule questionBank={questionBank} noPadding>
+    <LayoutModule questionBank={questionBank} breadcrumbs={crumbs} noPadding>
       <AppHead linkTitle={`Chair Flight: ${variantId}`} linkDescription={""} />
       <QuestionOverview
         questionBank={questionBank}
@@ -59,7 +66,7 @@ const Page: NextPage<PageProps> = ({
 export const getServerSideProps = ssrHandler<PageProps, PageParams>(
   async ({ params, helper, context }) => {
     const seed = (context.query?.["seed"] ?? getRandomId()) as string;
-    const variantId = context.query?.["variantId"] as string | undefined;
+    const variantId = (context.query?.["variantId"] as string) ?? null;
     const allParams = { ...params, seed, variantId };
 
     await Promise.all([
diff --git a/apps/next-app/pages/modules/[questionBank]/questions/index.page.tsx b/apps/next-app/pages/modules/[questionBank]/questions/index.page.tsx
index 3329065b9..10e9374a2 100644
--- a/apps/next-app/pages/modules/[questionBank]/questions/index.page.tsx
+++ b/apps/next-app/pages/modules/[questionBank]/questions/index.page.tsx
@@ -3,6 +3,7 @@ import { AppHead } from "@chair-flight/react/components";
 import { LayoutModule, QuestionSearch } from "@chair-flight/react/containers";
 import { staticHandler } from "@chair-flight/trpc/server";
 import type { QuestionBankName } from "@chair-flight/base/types";
+import type { Breadcrumbs } from "@chair-flight/react/containers";
 import type { GetStaticPaths, NextPage } from "next";
 
 type PageProps = {
@@ -13,12 +14,19 @@ type PageParams = {
   questionBank: QuestionBankName;
 };
 
-const Page: NextPage<PageProps> = ({ questionBank }) => (
-  <LayoutModule questionBank={questionBank}>
-    <AppHead />
-    <QuestionSearch component="section" questionBank={questionBank} />
-  </LayoutModule>
-);
+const Page: NextPage<PageProps> = ({ questionBank }) => {
+  const crumbs = [
+    [questionBank.toUpperCase(), `/modules/${questionBank}`],
+    "Questions",
+  ] as Breadcrumbs;
+
+  return (
+    <LayoutModule questionBank={questionBank} breadcrumbs={crumbs}>
+      <AppHead />
+      <QuestionSearch component="section" questionBank={questionBank} />
+    </LayoutModule>
+  );
+};
 
 export const getStaticProps = staticHandler<PageProps, PageParams>(
   async ({ params, helper }) => {
diff --git a/apps/next-app/pages/modules/[questionBank]/settings/index.page.tsx b/apps/next-app/pages/modules/[questionBank]/settings/index.page.tsx
index 06e04b026..b0c7483eb 100644
--- a/apps/next-app/pages/modules/[questionBank]/settings/index.page.tsx
+++ b/apps/next-app/pages/modules/[questionBank]/settings/index.page.tsx
@@ -4,6 +4,7 @@ import { AppHead } from "@chair-flight/react/components";
 import { LayoutModule, UserSettings } from "@chair-flight/react/containers";
 import { staticHandler } from "@chair-flight/trpc/server";
 import type { QuestionBankName } from "@chair-flight/base/types";
+import type { Breadcrumbs } from "@chair-flight/react/containers";
 import type { GetStaticPaths, NextPage } from "next";
 
 type PageProps = {
@@ -14,12 +15,19 @@ type PageParams = {
   questionBank: QuestionBankName;
 };
 
-const Page: NextPage<PageProps> = ({ questionBank }) => (
-  <LayoutModule questionBank={questionBank} fixedHeight>
-    <AppHead />
-    <UserSettings />
-  </LayoutModule>
-);
+const Page: NextPage<PageProps> = ({ questionBank }) => {
+  const crumbs = [
+    [questionBank.toUpperCase(), `/modules/${questionBank}`],
+    "Settings",
+  ] as Breadcrumbs;
+
+  return (
+    <LayoutModule questionBank={questionBank} breadcrumbs={crumbs} fixedHeight>
+      <AppHead />
+      <UserSettings />
+    </LayoutModule>
+  );
+};
 
 export const getStaticProps = staticHandler<PageProps, PageParams>(
   async ({ params, helper }) => {
diff --git a/apps/next-app/pages/modules/[questionBank]/tests/[testId]/exam.page.tsx b/apps/next-app/pages/modules/[questionBank]/tests/[testId]/exam.page.tsx
index 7892bb0c3..bbb179540 100644
--- a/apps/next-app/pages/modules/[questionBank]/tests/[testId]/exam.page.tsx
+++ b/apps/next-app/pages/modules/[questionBank]/tests/[testId]/exam.page.tsx
@@ -1,3 +1,4 @@
+import { useRouter } from "next/router";
 import {
   AppHead,
   ThemeOverrideColorScheme,
@@ -17,13 +18,23 @@ type Params = {
   questionBank: QuestionBankName;
 };
 
-export const Page: NextPage<Props> = ({ testId, questionBank }) => (
-  <>
-    <AppHead />
-    <ThemeOverrideColorScheme questionBank={questionBank} />
-    <TestExam testId={testId} noSsr />
-  </>
-);
+export const Page: NextPage<Props> = ({ testId, questionBank }) => {
+  const router = useRouter();
+
+  return (
+    <>
+      <AppHead />
+      <ThemeOverrideColorScheme questionBank={questionBank} />
+      <TestExam
+        noSsr
+        testId={testId}
+        onTestFinished={() => {
+          router.push(`/modules/${questionBank}/tests/${testId}/review`);
+        }}
+      />
+    </>
+  );
+};
 
 export const getServerSideProps = ssrHandler<Props, Params>(
   async ({ helper, params }) => {
diff --git a/apps/next-app/pages/modules/[questionBank]/tests/[testId]/review.page.tsx b/apps/next-app/pages/modules/[questionBank]/tests/[testId]/review.page.tsx
index e7f351950..bbfec2b9f 100644
--- a/apps/next-app/pages/modules/[questionBank]/tests/[testId]/review.page.tsx
+++ b/apps/next-app/pages/modules/[questionBank]/tests/[testId]/review.page.tsx
@@ -3,6 +3,7 @@ import { AppHead } from "@chair-flight/react/components";
 import { LayoutModule, TestReview } from "@chair-flight/react/containers";
 import { ssrHandler } from "@chair-flight/trpc/server";
 import type { QuestionBankName } from "@chair-flight/base/types";
+import type { Breadcrumbs } from "@chair-flight/react/containers";
 import type { NextPage } from "next";
 
 type Props = {
@@ -15,11 +16,17 @@ type Params = {
   questionBank: QuestionBankName;
 };
 
-const ReviewPage: NextPage<Props> = ({ testId, questionBank }) => {
+const Page: NextPage<Props> = ({ testId, questionBank }) => {
+  const crumbs = [
+    [questionBank.toUpperCase(), `/modules/${questionBank}`],
+    ["Tests", `/modules/${questionBank}/tests`],
+    testId,
+  ] as Breadcrumbs;
+
   return (
-    <LayoutModule questionBank={questionBank} noPadding>
+    <LayoutModule questionBank={questionBank} breadcrumbs={crumbs} noPadding>
       <AppHead />
-      <TestReview testId={testId} />
+      <TestReview testId={testId} noSsr />
     </LayoutModule>
   );
 };
@@ -34,4 +41,4 @@ export const getServerSideProps = ssrHandler<Props, Params>(
   },
 );
 
-export default ReviewPage;
+export default Page;
diff --git a/apps/next-app/pages/modules/[questionBank]/tests/[testId]/study.page.tsx b/apps/next-app/pages/modules/[questionBank]/tests/[testId]/study.page.tsx
index a60076e49..13c74724f 100644
--- a/apps/next-app/pages/modules/[questionBank]/tests/[testId]/study.page.tsx
+++ b/apps/next-app/pages/modules/[questionBank]/tests/[testId]/study.page.tsx
@@ -1,5 +1,9 @@
+import { useRouter } from "next/router";
 import { MissingPathParameter } from "@chair-flight/base/errors";
-import { AppHead } from "@chair-flight/react/components";
+import {
+  AppHead,
+  ThemeOverrideColorScheme,
+} from "@chair-flight/react/components";
 import { LayoutModule, TestStudy } from "@chair-flight/react/containers";
 import { ssrHandler } from "@chair-flight/trpc/server";
 import type { QuestionBankName } from "@chair-flight/base/types";
@@ -15,12 +19,26 @@ type Params = {
   questionBank: QuestionBankName;
 };
 
-export const Page: NextPage<Props> = ({ testId, questionBank }) => (
-  <LayoutModule questionBank={questionBank} noPadding fixedHeight>
-    <AppHead />
-    <TestStudy testId={testId} />
-  </LayoutModule>
-);
+export const Page: NextPage<Props> = ({ testId, questionBank }) => {
+  const router = useRouter();
+
+  return (
+    <>
+      <AppHead />
+      <ThemeOverrideColorScheme questionBank={questionBank} />
+      <TestStudy
+        noSsr
+        testId={testId}
+        onTestFinished={() => {
+          router.push(`/modules/${questionBank}/tests/${testId}/review`);
+        }}
+        onTestDismissed={() => {
+          router.push(`/modules/${questionBank}/tests`);
+        }}
+      />
+    </>
+  );
+};
 
 export const getServerSideProps = ssrHandler<Props, Params>(
   async ({ helper, params }) => {
diff --git a/apps/next-app/pages/modules/[questionBank]/tests/create.page.tsx b/apps/next-app/pages/modules/[questionBank]/tests/create.page.tsx
index 690270bfd..89906c395 100644
--- a/apps/next-app/pages/modules/[questionBank]/tests/create.page.tsx
+++ b/apps/next-app/pages/modules/[questionBank]/tests/create.page.tsx
@@ -4,6 +4,7 @@ import { AppHead } from "@chair-flight/react/components";
 import { LayoutModule, TestMaker } from "@chair-flight/react/containers";
 import { staticHandler } from "@chair-flight/trpc/server";
 import type { QuestionBankName } from "@chair-flight/base/types";
+import type { Breadcrumbs } from "@chair-flight/react/containers";
 import type { GetStaticPaths, NextPage } from "next";
 
 type PageProps = {
@@ -17,16 +18,21 @@ type PageParams = {
 const Page: NextPage<PageProps> = ({ questionBank }) => {
   const router = useRouter();
 
+  const crumbs = [
+    [questionBank.toUpperCase(), `/modules/${questionBank}`],
+    ["Tests", `/modules/${questionBank}/tests`],
+    "Create",
+  ] as Breadcrumbs;
+
   return (
-    <LayoutModule questionBank={questionBank} fixedHeight>
+    <LayoutModule questionBank={questionBank} breadcrumbs={crumbs} fixedHeight>
       <AppHead />
       <TestMaker
-        component="section"
         questionBank={questionBank}
         sx={{ height: "100%" }}
-        onSuccessfulTestCreation={(test) =>
-          router.push(`/modules/${questionBank}/tests/${test.id}/${test.mode}`)
-        }
+        onSuccessfulTestCreation={(test) => {
+          router.push(`/modules/${questionBank}/tests/${test.id}/${test.mode}`);
+        }}
       />
     </LayoutModule>
   );
diff --git a/apps/next-app/pages/modules/[questionBank]/tests/index.page.tsx b/apps/next-app/pages/modules/[questionBank]/tests/index.page.tsx
index bd7bbaa04..045bd22dc 100644
--- a/apps/next-app/pages/modules/[questionBank]/tests/index.page.tsx
+++ b/apps/next-app/pages/modules/[questionBank]/tests/index.page.tsx
@@ -3,6 +3,7 @@ import { AppHead } from "@chair-flight/react/components";
 import { LayoutModule, TestsOverview } from "@chair-flight/react/containers";
 import { staticHandler } from "@chair-flight/trpc/server";
 import type { QuestionBankName } from "@chair-flight/base/types";
+import type { Breadcrumbs } from "@chair-flight/react/containers";
 import type { GetStaticPaths, NextPage } from "next";
 
 type PageProps = {
@@ -13,16 +14,23 @@ type PageParams = {
   questionBank: QuestionBankName;
 };
 
-const Page: NextPage<PageProps> = ({ questionBank }) => (
-  <LayoutModule questionBank={questionBank}>
-    <AppHead />
-    <TestsOverview
-      component={"section"}
-      sx={{ mx: "auto", maxWidth: "lg", width: "100%" }}
-      questionBank={questionBank}
-    />
-  </LayoutModule>
-);
+const Page: NextPage<PageProps> = ({ questionBank }) => {
+  const crumbs = [
+    [questionBank.toUpperCase(), `/modules/${questionBank}`],
+    "Tests",
+  ] as Breadcrumbs;
+
+  return (
+    <LayoutModule questionBank={questionBank} breadcrumbs={crumbs}>
+      <AppHead />
+      <TestsOverview
+        component={"section"}
+        sx={{ mx: "auto", maxWidth: "lg", width: "100%" }}
+        questionBank={questionBank}
+      />
+    </LayoutModule>
+  );
+};
 
 export const getStaticProps = staticHandler<PageProps, PageParams>(
   async ({ params, helper }) => {
diff --git a/libs/content/question-bank-atpl/questions/010/010.05.json b/libs/content/question-bank-atpl/questions/010/010.05.json
index 10643d8b3..fe97b078e 100644
--- a/libs/content/question-bank-atpl/questions/010/010.05.json
+++ b/libs/content/question-bank-atpl/questions/010/010.05.json
@@ -916,47 +916,6 @@
       }
     }
   },
-  {
-    "id": "Q5223XCAQR",
-    "explanation": "",
-    "learningObjectives": ["010.05.03.01.18"],
-    "variants": {
-      "oeTL3pS0": {
-        "id": "oeTL3pS0",
-        "type": "simple",
-        "question": "An IFR-rated pilot wants to fly between two European aerodromes 100 NM apart. Weather conditions are VMC during the flight. According to SERA (Standardized European Rules of the Air), under which rules can the flight be performed?",
-        "options": [
-          {
-            "id": "APZ7MYA2K2",
-            "text": "000°(M), FL130",
-            "correct": true,
-            "why": ""
-          },
-          {
-            "id": "A2N90DIEYC",
-            "text": " 000°(M), FL135",
-            "correct": false,
-            "why": ""
-          },
-          {
-            "id": "ADFWVXLTH9",
-            "text": "359°(M), FL135",
-            "correct": false,
-            "why": ""
-          },
-          {
-            "id": "A7ED5046U8",
-            "text": "359°(M), FL130",
-            "correct": false,
-            "why": ""
-          }
-        ],
-        "annexes": [],
-        "externalIds": ["AVEXAM-19428"],
-        "explanation": ""
-      }
-    }
-  },
   {
     "id": "Q54XWJHS0Y",
     "explanation": "",
@@ -1882,47 +1841,6 @@
       }
     }
   },
-  {
-    "id": "Q9FXL8O0D4",
-    "explanation": "",
-    "learningObjectives": ["010.05.03.01.18"],
-    "variants": {
-      "bcHVMrFt": {
-        "id": "bcHVMrFt",
-        "type": "simple",
-        "question": "On a VMC day, can the pilot-in-command, who is holding a current instrument rating, elect to fly in accordance with the instrument flight rules, despite being in visual conditions?",
-        "options": [
-          {
-            "id": "AANP05LQE0",
-            "text": "4 000 ft",
-            "correct": true,
-            "why": ""
-          },
-          {
-            "id": "AMTQD2N63X",
-            "text": "3 000 ft",
-            "correct": false,
-            "why": ""
-          },
-          {
-            "id": "AQZD1LO34F",
-            "text": "1 500 ft",
-            "correct": false,
-            "why": ""
-          },
-          {
-            "id": "AWGRYIEV2K",
-            "text": "2 000 ft",
-            "correct": false,
-            "why": ""
-          }
-        ],
-        "annexes": [],
-        "externalIds": ["AVEXAM-58211"],
-        "explanation": ""
-      }
-    }
-  },
   {
     "id": "Q9RR7AV8HO",
     "explanation": "",
diff --git a/libs/content/question-bank-atpl/questions/022/022.05.json b/libs/content/question-bank-atpl/questions/022/022.05.json
index 651342b82..a5b396730 100644
--- a/libs/content/question-bank-atpl/questions/022/022.05.json
+++ b/libs/content/question-bank-atpl/questions/022/022.05.json
@@ -9100,25 +9100,25 @@
         "options": [
           {
             "id": "ACOOAIXMSW",
-            "text": "<span style=\"font-size: 11.0pt; font-family: 'Calibri',sans-serif; mso-ascii-theme-font: minor-latin; mso-fareast-font-family: Calibri; mso-fareast-theme-font: minor-latin; mso-hansi-theme-font: minor-latin; mso-bidi-font-family: 'Times New Roman'; mso-bidi-theme-font: minor-bidi; mso-ansi-language: EN-GB; mso-fareast-language: EN-US; mso-bidi-language: AR-SA;\">the AP, FD and A/T",
+            "text": "the AP, FD and A/T",
             "correct": true,
             "why": ""
           },
           {
             "id": "ATUPCI880G",
-            "text": "<span style=\"font-size: 11.0pt; font-family: 'Calibri',sans-serif; mso-ascii-theme-font: minor-latin; mso-fareast-font-family: Calibri; mso-fareast-theme-font: minor-latin; mso-hansi-theme-font: minor-latin; mso-bidi-font-family: 'Times New Roman'; mso-bidi-theme-font: minor-bidi; mso-ansi-language: EN-GB; mso-fareast-language: EN-US; mso-bidi-language: AR-SA;\">the Captain's AP",
+            "text": "the Captain's AP",
             "correct": false,
             "why": ""
           },
           {
             "id": "AJH6QX41WW",
-            "text": "<span style=\"font-size: 11.0pt; font-family: 'Calibri',sans-serif; mso-ascii-theme-font: minor-latin; mso-fareast-font-family: Calibri; mso-fareast-theme-font: minor-latin; mso-hansi-theme-font: minor-latin; mso-bidi-font-family: 'Times New Roman'; mso-bidi-theme-font: minor-bidi; mso-ansi-language: EN-GB; mso-fareast-language: EN-US; mso-bidi-language: AR-SA;\">the FO's instruments",
+            "text": "the FO's instruments",
             "correct": false,
             "why": ""
           },
           {
             "id": "A9JATLDXH4",
-            "text": "<span style=\"font-size: 11.0pt; font-family: 'Calibri',sans-serif; mso-ascii-theme-font: minor-latin; mso-fareast-font-family: Calibri; mso-fareast-theme-font: minor-latin; mso-hansi-theme-font: minor-latin; mso-bidi-font-family: 'Times New Roman'; mso-bidi-theme-font: minor-bidi; mso-ansi-language: EN-GB; mso-fareast-language: EN-US; mso-bidi-language: AR-SA;\">the Captain's instruments",
+            "text": "the Captain's instruments",
             "correct": false,
             "why": ""
           }
diff --git a/libs/content/question-bank-atpl/questions/050/050.01.json b/libs/content/question-bank-atpl/questions/050/050.01.json
index 60e3de4bc..5add8ab89 100644
--- a/libs/content/question-bank-atpl/questions/050/050.01.json
+++ b/libs/content/question-bank-atpl/questions/050/050.01.json
@@ -28559,7 +28559,7 @@
       "tyGJMGSq": {
         "id": "tyGJMGSq",
         "type": "simple",
-        "question": "2.Over PALMA (39° N 003° E) the lowest FL listed which is unaffected by CAT is",
+        "question": "Over PALMA (39° N 003° E) the lowest FL listed which is unaffected by CAT is",
         "options": [
           {
             "id": "A40RF5RDF6",
diff --git a/libs/content/question-bank-atpl/questions/062/062.02.json b/libs/content/question-bank-atpl/questions/062/062.02.json
index dffaed54a..34c79f0c9 100644
--- a/libs/content/question-bank-atpl/questions/062/062.02.json
+++ b/libs/content/question-bank-atpl/questions/062/062.02.json
@@ -403,7 +403,7 @@
       "pFzZabn0": {
         "id": "pFzZabn0",
         "type": "simple",
-        "question": "A radio signal is used to establish voice communications between the ground and an aircraft. ÿThis signal is transmitted in A3E. The number 3 means that the:",
+        "question": "A radio signal is used to establish voice communications between the ground and an aircraft. This signal is transmitted in A3E. The number 3 means that the:",
         "options": [
           {
             "id": "APLJKNM2UF",
@@ -2023,7 +2023,7 @@
       "nuRV62Ue": {
         "id": "nuRV62Ue",
         "type": "simple",
-        "question": "A VOR and DME are co-located. ÿYou want to identify the DME by listening to the callsign. ÿHaving heard the same callsign 4 times in 40 seconds the:",
+        "question": "A VOR and DME are co-located. You want to identify the DME by listening to the callsign. Having heard the same callsign 4 times in 40 seconds the:",
         "options": [
           {
             "id": "AQVQL72H4E",
@@ -3266,7 +3266,7 @@
       "tyjYPaoP": {
         "id": "tyjYPaoP",
         "type": "simple",
-        "question": "Your QUJ is 335°  by VDF. ÿThe variation of a VOR at the same location is 12° W. ÿWhat is the phase difference between the reference and variable phase signals being received at the aircraft from that VOR?",
+        "question": "Your QUJ is 335°  by VDF. The variation of a VOR at the same location is 12° W. What is the phase difference between the reference and variable phase signals being received at the aircraft from that VOR?",
         "options": [
           {
             "id": "A7MIFDUEMX",
@@ -3942,7 +3942,7 @@
       "AnQM19cC": {
         "id": "AnQM19cC",
         "type": "simple",
-        "question": "A VOR is situated at the far end of a runway on which an aircraft is making an ILS approach. Nav 1 is switched to the localiser frequency and Nav 2 to the VOR frequency. At the moment that the needle of # 1 indicator reaches the outer dot the deflection of the needle of # 2 indicator will be at:  ÿ",
+        "question": "A VOR is situated at the far end of a runway on which an aircraft is making an ILS approach. Nav 1 is switched to the localiser frequency and Nav 2 to the VOR frequency. At the moment that the needle of # 1 indicator reaches the outer dot the deflection of the needle of # 2 indicator will be at:  ",
         "options": [
           {
             "id": "AVZDVOH0F2",
diff --git a/libs/content/question-bank-b737/questions/737.01.json b/libs/content/question-bank-b737/questions/737.01.json
index cd711329a..847c7fe12 100644
--- a/libs/content/question-bank-b737/questions/737.01.json
+++ b/libs/content/question-bank-b737/questions/737.01.json
@@ -734,7 +734,7 @@
       "zpn3s": {
         "id": "zpn3s",
         "type": "simple",
-        "question": "hen operating the forward airstairs, with the external control, what position must the forward entry door be in?",
+        "question": "When operating the forward airstairs, with the external control, what position must the forward entry door be in?",
         "options": [
           {
             "id": "qp37z",
diff --git a/libs/content/question-bank-b737/questions/737.11.json b/libs/content/question-bank-b737/questions/737.11.json
index aa4416495..cfb0ef485 100644
--- a/libs/content/question-bank-b737/questions/737.11.json
+++ b/libs/content/question-bank-b737/questions/737.11.json
@@ -686,7 +686,7 @@
       "82t4i": {
         "id": "82t4i",
         "type": "simple",
-        "question": "The IntuVue weather radar fitted in aircraft YF662-YF695 and YW001-YW164, gives clutter-free viewing of significant weather out to what range?",
+        "question": "The IntuVue weather radar fitted in aircraft gives clutter-free viewing of significant weather out to what range?",
         "options": [
           {
             "id": "srq8t",
diff --git a/libs/content/question-bank-b737/questions/737.13.json b/libs/content/question-bank-b737/questions/737.13.json
index bf474dc6b..d3d3538e4 100644
--- a/libs/content/question-bank-b737/questions/737.13.json
+++ b/libs/content/question-bank-b737/questions/737.13.json
@@ -418,7 +418,7 @@
   },
   {
     "id": "hrap",
-    "explanation": "",
+    "explanation": "**STBY RUD** - activates standby hydraulic system pump and opens standby rudder\nshutoff valve to pressurize standby rudder power control unit.\n\n- **OFF** - closes flight control shutoff valve isolating ailerons, elevators and rudder\nfrom associated hydraulic system pressure.\n- **ON** (guarded position) - normal operating position.",
     "learningObjectives": ["737.13"],
     "variants": {
       "in83r": {
@@ -426,6 +426,15 @@
         "type": "true-or-false",
         "question": "Moving the STBY RUD switch to ON activates the standby pump and opens the standby rudder shutoff valve to pressurise the standby power control unit.",
         "answer": false,
+        "explanation": "Switching to **OFF** triggers the changes described!",
+        "annexes": [],
+        "externalIds": []
+      },
+      "in83q": {
+        "id": "in83q",
+        "type": "true-or-false",
+        "question": "Moving the STBY RUD switch to OFF activates the standby pump and opens the standby rudder shutoff valve to pressurise the standby power control unit.",
+        "answer": true,
         "explanation": "",
         "annexes": [],
         "externalIds": []
diff --git a/libs/content/question-bank-b737/questions/737.15.json b/libs/content/question-bank-b737/questions/737.15.json
index f320e7806..572caa3b4 100644
--- a/libs/content/question-bank-b737/questions/737.15.json
+++ b/libs/content/question-bank-b737/questions/737.15.json
@@ -426,7 +426,7 @@
         "type": "true-or-false",
         "question": "The stall warning test can only be carried out on the ground, the No1 and No2 systems must be carried out separately to ensure the clacker sounds when each system is tested.",
         "answer": false,
-        "explanation": "",
+        "explanation": "The Stall warning system consists of a stick shaker. The Clacker is the overspeed warning system.",
         "annexes": [],
         "externalIds": []
       }
diff --git a/libs/content/question-bank-b737/questions/737.json b/libs/content/question-bank-b737/questions/737.json
index b77fc1f76..2280ed4bf 100644
--- a/libs/content/question-bank-b737/questions/737.json
+++ b/libs/content/question-bank-b737/questions/737.json
@@ -7017,7 +7017,7 @@
             "why": ""
           }
         ],
-        "explanation": "",
+        "explanation": "## Passenger Oxygen system\n\nActivating the system causes the masks to drop from the stowage compartments.\nThe oxygen source is activated when any mask in the unit is pulled down. Pulling\none mask down causes all masks in that unit to come down and 100% oxygen\nflows to all masks.\n\nFCOM 1.40.24",
         "annexes": [],
         "externalIds": []
       }
diff --git a/libs/content/question-bank-prep/flashcards/atpl-technical-interview.json b/libs/content/question-bank-prep/flashcards/atpl-technical-interview.json
index 875205f71..0a3253d3a 100644
--- a/libs/content/question-bank-prep/flashcards/atpl-technical-interview.json
+++ b/libs/content/question-bank-prep/flashcards/atpl-technical-interview.json
@@ -252,7 +252,7 @@
   },
   {
     "question": "What navigational instruments does the Boeing 737-800 have?",
-    "answer": "Approximately 6.5 years",
+    "answer": "IRS / GPS / VOR / DME",
     "id": "bbfa49bb-2789-4a2b-9d33-e268c8ab24f1"
   },
   {
@@ -702,7 +702,7 @@
   },
   {
     "question": "What is an MCP and what is an FMA?",
-    "answer": "IRS / GPS / VOR / DME",
+    "answer": "The mode control panel is used to select the autothrottle, autopilot, and flight director operating modes. The flight mode annunciator displays current flight modes.",
     "id": "cad39ac2-9040-4753-8643-9b0a224224a7"
   },
   {
diff --git a/libs/react/components/src/app-buttons/app-buttons.tsx b/libs/react/components/src/app-buttons/app-buttons.tsx
index 80c66f3de..4406a0ed6 100644
--- a/libs/react/components/src/app-buttons/app-buttons.tsx
+++ b/libs/react/components/src/app-buttons/app-buttons.tsx
@@ -1,4 +1,6 @@
 import { useEffect, useState } from "react";
+import { useRouter } from "next/router";
+import { default as ChevronLeftIcon } from "@mui/icons-material/ChevronLeft";
 import { default as DarkModeIcon } from "@mui/icons-material/DarkMode";
 import { default as GithubIcon } from "@mui/icons-material/GitHub";
 import { default as LightModeIcon } from "@mui/icons-material/LightMode";
@@ -69,6 +71,21 @@ export const ThemeButton: FunctionComponent<IconButtonProps> = (props) => {
   );
 };
 
+export const BackButton: FunctionComponent<IconButtonProps> = (props) => {
+  const { back } = useRouter();
+
+  const onClick: IconButtonProps["onClick"] = (e) => {
+    props.onClick?.(e);
+    back();
+  };
+
+  return (
+    <StyledButton {...props} onClick={onClick}>
+      <ChevronLeftIcon />
+    </StyledButton>
+  );
+};
+
 export const AppButtonsContainer = styled(Box)`
   position: fixed;
   top: 0;
diff --git a/libs/react/components/src/app-buttons/index.ts b/libs/react/components/src/app-buttons/index.ts
index 8d5bbdcfc..8b0701a4c 100644
--- a/libs/react/components/src/app-buttons/index.ts
+++ b/libs/react/components/src/app-buttons/index.ts
@@ -3,4 +3,5 @@ export {
   HamburgerButton,
   ThemeButton,
   AppButtonsContainer,
+  BackButton,
 } from "./app-buttons";
diff --git a/libs/react/components/src/cta-search/cta-search.tsx b/libs/react/components/src/cta-search/cta-search.tsx
index b9b2d8f81..14d82d1f2 100644
--- a/libs/react/components/src/cta-search/cta-search.tsx
+++ b/libs/react/components/src/cta-search/cta-search.tsx
@@ -15,6 +15,7 @@ export type CtaSearchProps = {
   onChange: (value: string) => void;
   loading?: boolean;
   numberOfResults?: number;
+  disableLabel?: boolean;
 } & Omit<
   InputProps,
   | "value"
@@ -32,7 +33,10 @@ export type CtaSearchProps = {
  * a fake loading spinner as soon as the user starts typing.
  */
 export const CtaSearch = forwardRef<HTMLInputElement, CtaSearchProps>(
-  ({ value, onChange, loading, sx, numberOfResults, ...props }, ref) => {
+  (
+    { value, onChange, loading, sx, numberOfResults, disableLabel, ...props },
+    ref,
+  ) => {
     const inputRef = useRef<HTMLDivElement>(null);
     const mergedRef = mergeRefs([ref, inputRef]);
     const [search, setSearch] = useState<string>(value);
@@ -91,15 +95,17 @@ export const CtaSearch = forwardRef<HTMLInputElement, CtaSearchProps>(
             isLoading ? <CircularProgress size="sm" /> : <SearchIcon />
           }
         />
-        <FormLabel sx={{ ml: "auto", pr: 1 }}>
-          {!isLoading ? (
-            <Typography level="body-xs">
-              Number of Results: {numberOfResults}
-            </Typography>
-          ) : (
-            <Typography level="body-xs">Loading results...</Typography>
-          )}
-        </FormLabel>
+        {!disableLabel && (
+          <FormLabel sx={{ ml: "auto", pr: 1 }}>
+            {!isLoading ? (
+              <Typography level="body-xs">
+                Number of Results: {numberOfResults}
+              </Typography>
+            ) : (
+              <Typography level="body-xs">Loading results...</Typography>
+            )}
+          </FormLabel>
+        )}
       </FormControl>
     );
   },
diff --git a/libs/react/components/src/markdown-client/index.ts b/libs/react/components/src/markdown-client/index.ts
index 096ce38b0..fa2f4ed79 100644
--- a/libs/react/components/src/markdown-client/index.ts
+++ b/libs/react/components/src/markdown-client/index.ts
@@ -1,2 +1,7 @@
-export * from "./markdown-client";
-export * from "./markdown-client-demo";
+export { MarkdownClient } from "./markdown-client";
+export { MarkdownClientDemo } from "./markdown-client-demo";
+export { MarkdownClientCompressed } from "./markdown-client-compressed";
+
+export type { MarkdownClientProps } from "./markdown-client";
+export type { MarkdownClientDemoProps } from "./markdown-client-demo";
+export type { MarkdownClientCompressedProps } from "./markdown-client-compressed";
diff --git a/libs/react/components/src/markdown-client/markdown-client-compressed.tsx b/libs/react/components/src/markdown-client/markdown-client-compressed.tsx
new file mode 100644
index 000000000..3aefe6914
--- /dev/null
+++ b/libs/react/components/src/markdown-client/markdown-client-compressed.tsx
@@ -0,0 +1,18 @@
+import { styled } from "@mui/joy";
+import { MarkdownClient } from "./markdown-client";
+import type { MarkdownClientProps } from "./markdown-client";
+
+/** MarkdownClient styled to remove excessive padding. */
+export const MarkdownClientCompressed = styled(MarkdownClient)`
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6,
+  p {
+    margin: 0;
+  }
+`;
+
+export type MarkdownClientCompressedProps = MarkdownClientProps;
diff --git a/libs/react/components/src/markdown-client/markdown-client.stories.tsx b/libs/react/components/src/markdown-client/markdown-client.stories.tsx
index dbaa3a8a3..dd30637c0 100644
--- a/libs/react/components/src/markdown-client/markdown-client.stories.tsx
+++ b/libs/react/components/src/markdown-client/markdown-client.stories.tsx
@@ -1,5 +1,6 @@
 import { dedent } from "ts-dedent";
 import { MarkdownClient } from "./markdown-client";
+import { MarkdownClientCompressed } from "./markdown-client-compressed";
 import { MarkdownClientDemo } from "./markdown-client-demo";
 import type { Meta, StoryObj } from "@storybook/react";
 
@@ -10,6 +11,8 @@ const demoMarkdown = dedent`
 
   This component allows you to add markdown to pretty much anything you want.
   It supports GFM features like Emoji :bowtie: :kissing_smiling_eyes: :zzz: :notes:
+
+  A second paragraph just for good measure
 `;
 
 export const Playground: Story = {
@@ -28,6 +31,12 @@ export const MarkdownClientDemoStory: Story = {
   render: () => <MarkdownClientDemo initialMarkdown={demoMarkdown} />,
 };
 
+export const MarkdownClientCompressedStory: Story = {
+  ...Playground,
+  name: "MarkdownClientCompressed",
+  render: (props) => <MarkdownClientCompressed {...props} />,
+};
+
 const meta: Meta<typeof MarkdownClient> = {
   title: "Components/MarkdownClient",
   component: MarkdownClient,
diff --git a/libs/react/components/src/markdown-client/markdown-client.tsx b/libs/react/components/src/markdown-client/markdown-client.tsx
index 678aced1f..e8131a252 100644
--- a/libs/react/components/src/markdown-client/markdown-client.tsx
+++ b/libs/react/components/src/markdown-client/markdown-client.tsx
@@ -3,21 +3,22 @@ import { default as ReactMarkdown } from "react-markdown";
 import { default as remarkGemoji } from "remark-gemoji";
 import { default as remarkGfm } from "remark-gfm";
 import { default as remarkSupersub } from "remark-supersub";
+import type { Options } from "react-markdown";
 
 export type MarkdownClientProps = {
   children: string;
+  className?: Options["className"];
 };
 
-export const MarkdownClient = memo<MarkdownClientProps>(({ children }) => (
+export const MarkdownClient = memo<MarkdownClientProps>((props) => (
   <ReactMarkdown
+    {...props}
     remarkPlugins={[
       [remarkGfm, { singleTilde: false }],
       remarkGemoji,
       remarkSupersub,
     ]}
-  >
-    {children}
-  </ReactMarkdown>
+  />
 ));
 
 MarkdownClient.displayName = "MarkdownClient";
diff --git a/libs/react/components/src/sidebar/sidebar.tsx b/libs/react/components/src/sidebar/sidebar.tsx
index 0bb1eb980..abf426686 100644
--- a/libs/react/components/src/sidebar/sidebar.tsx
+++ b/libs/react/components/src/sidebar/sidebar.tsx
@@ -38,7 +38,7 @@ const VAR_SIDEBAR_WIDTH = "--joy-sidebar-width";
 const VAR_SIDEBAR_REMAINING_WIDTH = "--joy-sidebar-remaining-width";
 const SIDEBAR_EXPANDED_WIDTH = 210;
 const SIDEBAR_COLLAPSED_WIDTH = 42;
-const SIDEBAR_MOBILE_COLLAPSED_WIDTH = 24;
+const SIDEBAR_MOBILE_COLLAPSED_WIDTH = 0;
 
 const useSidebarStore = create<{
   isMobileOpen: boolean;
@@ -120,10 +120,10 @@ export const Sidebar = forwardRef<HTMLDivElement, SidebarProps>(
             },
 
             [`& .${listItemButtonClasses.root}`]: {
-              p: { xs: 0.125, sm: 1 },
+              p: 1,
               borderRight: 0,
               borderBottom: 0,
-              borderLeftWidth: { xs: 0, sm: 4 },
+              borderLeftWidth: 4,
               borderLeftColor: "transparent",
 
               "&:first-of-type": {
@@ -187,7 +187,7 @@ export const Sidebar = forwardRef<HTMLDivElement, SidebarProps>(
             bottom: 0,
             left: 0,
             right: 0,
-            backgroundColor: "var(--joy-palette-background-backdrop)",
+            backgroundColor: "background.backdrop",
             backdropFilter: "blur(8px)",
             zIndex: (t) => t.zIndex.modal - 1,
             opacity: 1,
diff --git a/libs/react/components/src/test-question-result/test-question-result.stories.tsx b/libs/react/components/src/test-question-result/test-question-result.stories.tsx
index 978c7b9e1..8feb31b46 100644
--- a/libs/react/components/src/test-question-result/test-question-result.stories.tsx
+++ b/libs/react/components/src/test-question-result/test-question-result.stories.tsx
@@ -6,12 +6,23 @@ type Story = StoryObj<typeof TestQuestionResult>;
 export const Playground: Story = {
   args: {
     correct: false,
+    questionTemplateId: "123124",
+    questionVariantId: "abcbacabc",
     title: "Question 5",
     question: "what is the capital of France?",
     correctOption: "Paris",
     selectedOption: "Berlin",
     learningObjectives: ["010.03.01.01"],
   },
+};
+
+export const WithMarkdown: Story = {
+  args: {
+    ...Playground.args,
+    question: "Which option is correct?\n\n- Option a)\n- Option b)",
+    correctOption: "**Option B**",
+    selectedOption: "Berlin",
+  },
   argTypes: {},
 };
 
diff --git a/libs/react/components/src/test-question-result/test-question-result.tsx b/libs/react/components/src/test-question-result/test-question-result.tsx
index 2aa818dd5..ae35d29b9 100644
--- a/libs/react/components/src/test-question-result/test-question-result.tsx
+++ b/libs/react/components/src/test-question-result/test-question-result.tsx
@@ -1,8 +1,8 @@
 import { forwardRef } from "react";
 import { default as CheckIcon } from "@mui/icons-material/Check";
 import { default as CrossIcon } from "@mui/icons-material/Close";
-import { Box, Sheet, Typography } from "@mui/joy";
-import { MarkdownClient } from "../markdown-client";
+import { Box, Sheet, Stack, Typography } from "@mui/joy";
+import { MarkdownClient, MarkdownClientCompressed } from "../markdown-client";
 import type { SheetProps } from "@mui/joy";
 
 export type TestQuestionResultProps = {
@@ -50,28 +50,34 @@ export const TestQuestionResult = forwardRef<
         <Typography level="body-sm" fontWeight={900}>
           {`${questionTemplateId} (${questionVariantId})`}
         </Typography>
-        <Typography level="body-sm">
+        <Box sx={{ fontSize: "sm" }}>
           <MarkdownClient>{question ?? ""}</MarkdownClient>
-        </Typography>
-        <Box sx={{ display: "flex", pt: 1 }}>
+        </Box>
+        <Stack direction="row" sx={{ pt: 1, gap: 1, alignItems: "center" }}>
           <Box sx={{ height: 18, width: 18, bgcolor: "success.solidBg" }}>
             {correct && (
               <CheckIcon fontSize={"lg"} sx={{ color: "success.solidColor" }} />
             )}
           </Box>
-          <Typography level="body-sm" sx={{ ml: 1 }}>
-            {correctOption}
-          </Typography>
-        </Box>
+          <Box sx={{ fontSize: "sm" }}>
+            <MarkdownClientCompressed>
+              {correctOption ?? ""}
+            </MarkdownClientCompressed>
+          </Box>
+        </Stack>
         {!correct && (
-          <Box sx={{ display: "flex" }}>
+          <Stack direction="row" sx={{ gap: 1, alignItems: "center" }}>
             <Box sx={{ height: 18, width: 18, bgcolor: "danger.solidBg" }}>
               <CrossIcon fontSize={"lg"} sx={{ color: "danger.solidColor" }} />
             </Box>
-            <Typography level="body-sm" sx={{ ml: 1 }}>
-              {selectedOption ?? "No option selected"}
-            </Typography>
-          </Box>
+            <Box sx={{ fontSize: "sm" }}>
+              {selectedOption ? (
+                <MarkdownClientCompressed children={selectedOption} />
+              ) : (
+                <Typography children="No option selected" />
+              )}
+            </Box>
+          </Stack>
         )}
       </Sheet>
     );
diff --git a/libs/react/containers/src/index.ts b/libs/react/containers/src/index.ts
index dcbd91195..243023c86 100644
--- a/libs/react/containers/src/index.ts
+++ b/libs/react/containers/src/index.ts
@@ -15,4 +15,5 @@ export * from "./learning-objectives/learning-objectives-search";
 export * from "./learning-objectives/learning-objective-overview";
 export * from "./overviews/overview-welcome";
 export * from "./overviews/overview-modules";
+export * from "./overviews/overview-module";
 export * from "./user/user-settings";
diff --git a/libs/react/containers/src/layouts/layout-module/index.ts b/libs/react/containers/src/layouts/layout-module/index.ts
index d9b20e9fc..776a035c8 100644
--- a/libs/react/containers/src/layouts/layout-module/index.ts
+++ b/libs/react/containers/src/layouts/layout-module/index.ts
@@ -1 +1,2 @@
 export { LayoutModule } from "./layout-module";
+export type { Breadcrumbs } from "./layout-module";
diff --git a/libs/react/containers/src/layouts/layout-module/layout-module.tsx b/libs/react/containers/src/layouts/layout-module/layout-module.tsx
index 897e285ef..bd7c04afb 100644
--- a/libs/react/containers/src/layouts/layout-module/layout-module.tsx
+++ b/libs/react/containers/src/layouts/layout-module/layout-module.tsx
@@ -5,23 +5,44 @@ import { default as LearningObjectivesIcon } from "@mui/icons-material/ListOutli
 import { default as QuestionsIcon } from "@mui/icons-material/QuizOutlined";
 import { default as SettingsIcon } from "@mui/icons-material/SettingsOutlined";
 import { default as CardIcon } from "@mui/icons-material/StyleOutlined";
-import { Box, LinearProgress, listItemContentClasses } from "@mui/joy";
+import {
+  Box,
+  Breadcrumbs,
+  LinearProgress,
+  Link,
+  Stack,
+  Typography,
+  listItemContentClasses,
+} from "@mui/joy";
 import {
   AppLogo,
+  BackButton,
+  GithubButton,
+  HamburgerButton,
   Sidebar,
   SidebarListItem,
+  ThemeButton,
   ThemeOverrideColorScheme,
+  useSidebar,
 } from "@chair-flight/react/components";
 import { trpc } from "@chair-flight/trpc/client";
 import { container, getRequiredParam } from "../../wraper/container";
 import { usePageTransition } from "../hooks/use-page-transition";
 import type { QuestionBankName } from "@chair-flight/base/types";
 
+const HEADER_HEIGHT = 48;
+
+export type Breadcrumbs = [
+  ...Array<[displayName: string, url: string]>,
+  string,
+];
+
 type Props = {
   children: React.ReactNode;
+  questionBank: QuestionBankName;
   fixedHeight?: boolean;
   noPadding?: boolean;
-  questionBank: QuestionBankName;
+  breadcrumbs?: Breadcrumbs;
 };
 
 type Params = {
@@ -35,118 +56,162 @@ type Data = {
   hasMedia: boolean;
 };
 
-export const LayoutModule = container<Props, Params, Data>((props) => {
-  const { children, fixedHeight, noPadding, questionBank } = props;
-  const { isTransitioning } = usePageTransition();
-  const router = useRouter();
-  const config = LayoutModule.useData(props);
+export const LayoutModule = container<Props, Params, Data>(
+  ({ children, fixedHeight, noPadding, questionBank, breadcrumbs }) => {
+    const { isTransitioning } = usePageTransition();
+    const { openSidebar } = useSidebar();
+    const router = useRouter();
+    const config = LayoutModule.useData({ questionBank });
 
-  const isQuestions = router.asPath.includes("questions");
-  const isTests = router.asPath.includes("tests");
-  const isSettings = router.asPath.includes("settings");
-  const isLearningObjectives = router.asPath.includes("learning-objectives");
-  const isFlashcards = router.asPath.includes("flashcards");
-  const isHome = !isQuestions && !isTests && !isSettings && !isFlashcards;
+    const isQuestions = router.asPath.includes("questions");
+    const isTests = router.asPath.includes("tests");
+    const isSettings = router.asPath.includes("settings");
+    const isLearningObjectives = router.asPath.includes("learning-objectives");
+    const isFlashcards = router.asPath.includes("flashcards");
+    const isHome = !isQuestions && !isTests && !isSettings && !isFlashcards;
 
-  return (
-    <>
-      <ThemeOverrideColorScheme questionBank={questionBank} />
-      <Sidebar sx={{ height: "100vh" }}>
-        <SidebarListItem
-          href={"/"}
-          icon={AppLogo}
-          title={"Chair Flight"}
-          sx={{
-            height: (t) => t.spacing(6),
-            pl: 0.5,
-            svg: {
-              fill: (t) => t.vars.palette.primary.plainColor,
-              fontSize: { xs: 18, sm: 24 },
-              marginLeft: { xs: "2px", sm: "-2px" },
-            },
-            [`& .${listItemContentClasses.root}`]: {
-              fontWeight: 700,
-              letterSpacing: "0.05rem",
-              color: (t) => t.vars.palette.text.primary,
-            },
-          }}
-        />
-        <SidebarListItem
-          href={`/modules/${questionBank}`}
-          selected={isHome}
-          icon={HomeIcon}
-          title={"Home"}
-        />
-        {config.hasQuestions && (
+    return (
+      <>
+        <ThemeOverrideColorScheme questionBank={questionBank} />
+        <Sidebar sx={{ height: "100vh" }}>
           <SidebarListItem
-            href={`/modules/${questionBank}/tests`}
-            selected={isTests}
-            icon={TestIcon}
-            title={"Tests"}
+            href={"/"}
+            icon={AppLogo}
+            title={"Chair Flight"}
+            sx={{
+              height: (t) => t.spacing(6),
+              pl: 0.5,
+              svg: {
+                fill: (t) => t.vars.palette.primary.plainColor,
+                fontSize: 24,
+                marginLeft: "-2px",
+              },
+              [`& .${listItemContentClasses.root}`]: {
+                fontWeight: 700,
+                letterSpacing: "0.05rem",
+                color: (t) => t.vars.palette.text.primary,
+              },
+            }}
           />
-        )}
-        {config.hasQuestions && (
           <SidebarListItem
-            href={`/modules/${questionBank}/questions`}
-            selected={isQuestions}
-            icon={QuestionsIcon}
-            title={"Questions"}
+            href={`/modules/${questionBank}`}
+            selected={isHome}
+            icon={HomeIcon}
+            title={"Home"}
           />
-        )}
-        {config.hasLearningObjectives && (
+          {config.hasQuestions && (
+            <SidebarListItem
+              href={`/modules/${questionBank}/tests`}
+              selected={isTests}
+              icon={TestIcon}
+              title={"Tests"}
+            />
+          )}
+          {config.hasQuestions && (
+            <SidebarListItem
+              href={`/modules/${questionBank}/questions`}
+              selected={isQuestions}
+              icon={QuestionsIcon}
+              title={"Questions"}
+            />
+          )}
+          {config.hasLearningObjectives && (
+            <SidebarListItem
+              href={"/modules/atpl/learning-objectives"}
+              selected={isLearningObjectives}
+              icon={LearningObjectivesIcon}
+              title={"Learning Objectives"}
+            />
+          )}
+          {config.hasFlashcards && (
+            <SidebarListItem
+              href={"/modules/prep/flashcards"}
+              selected={isFlashcards}
+              icon={CardIcon}
+              title={"Flash Cards"}
+              sx={{
+                "& svg": {
+                  transform: "rotate(180deg)",
+                },
+              }}
+            />
+          )}
           <SidebarListItem
-            href={"/modules/atpl/learning-objectives"}
-            selected={isLearningObjectives}
-            icon={LearningObjectivesIcon}
-            title={"Learning Objectives"}
+            bottom
+            href={`/modules/${questionBank}/settings`}
+            selected={isSettings}
+            icon={SettingsIcon}
+            title={"Settings"}
           />
-        )}
-        {config.hasFlashcards && (
-          <SidebarListItem
-            href={"/modules/prep/flashcards"}
-            selected={isFlashcards}
-            icon={CardIcon}
-            title={"Flash Cards"}
-            sx={{
-              "& svg": {
-                transform: "rotate(180deg)",
-              },
-            }}
+        </Sidebar>
+        <Stack
+          component="header"
+          sx={{
+            flexDirection: "row",
+            color: "text.primary",
+
+            position: "fixed",
+            alignItems: "center",
+            justifyContent: "space-between",
+            height: `${HEADER_HEIGHT}px`,
+            padding: (t) => t.spacing(0, 1),
+            backgroundColor: "background.surface",
+            borderBottomStyle: "solid",
+            borderBottomWidth: 1,
+            borderBottomColor: "divider",
+            boxSizing: "content-box",
+            zIndex: 1000,
+            width: Sidebar.css.remainingWidth,
+            transition: Sidebar.css.widthTransition,
+            right: 0,
+            boxShadow: (t) => t.shadow.md,
+          }}
+        >
+          <Breadcrumbs separator="›" sx={{ ml: 2, display: ["none", "flex"] }}>
+            {breadcrumbs?.slice(0, -1).map(([name, url]) => (
+              <Link key={url} color="neutral" href={url}>
+                {name}
+              </Link>
+            ))}
+            {breadcrumbs && <Typography>{breadcrumbs?.at(-1)}</Typography>}
+          </Breadcrumbs>
+          <BackButton sx={{ ml: 2, display: { md: "medium" } }} />
+          <GithubButton sx={{ ml: "auto" }} />
+          <ThemeButton />
+          <HamburgerButton
+            sx={{ display: { md: "medium" } }}
+            onClick={openSidebar}
           />
-        )}
-        <SidebarListItem
-          bottom
-          href={`/modules/${questionBank}/settings`}
-          selected={isSettings}
-          icon={SettingsIcon}
-          title={"Settings"}
+        </Stack>
+        <Box sx={{ height: HEADER_HEIGHT, width: "100%", content: '""' }} />
+        <Box
+          component={"main"}
+          children={children}
+          sx={{
+            width: Sidebar.css.remainingWidth,
+            transition: Sidebar.css.widthTransition,
+            marginLeft: "auto",
+            ...(noPadding ? { p: 0 } : { p: { xs: 1, sm: 2 } }),
+            ...(fixedHeight
+              ? { height: `calc(100vh - ${HEADER_HEIGHT}px)` }
+              : {}),
+          }}
+        />
+        <LinearProgress
+          sx={{
+            "--LinearProgress-radius": 0,
+            transition: `bottom ${isTransitioning ? "0.2s" : "0.7s"} ease`,
+            position: "fixed",
+            bottom: isTransitioning ? 0 : -6,
+            right: "-5%",
+            width: `calc(${Sidebar.css.remainingWidth} + 10%)`,
+            zIndex: 1000,
+          }}
         />
-      </Sidebar>
-      <Box
-        component={"main"}
-        children={children}
-        sx={{
-          width: Sidebar.css.remainingWidth,
-          transition: Sidebar.css.widthTransition,
-          marginLeft: "auto",
-          ...(noPadding ? { p: 0 } : { p: { xs: 1, sm: 2 } }),
-          ...(fixedHeight ? { height: "100vh" } : {}),
-        }}
-      />
-      <LinearProgress
-        sx={{
-          "--LinearProgress-radius": 0,
-          transition: `bottom ${isTransitioning ? "0.2s" : "0.7s"} ease`,
-          position: "fixed",
-          bottom: isTransitioning ? 0 : -6,
-          right: "-5%",
-          width: `calc(${Sidebar.css.remainingWidth} + 10%)`,
-          zIndex: 1000,
-        }}
-      />
-    </>
-  );
-});
+      </>
+    );
+  },
+);
 
 LayoutModule.displayName = "LayoutModule";
 
diff --git a/libs/react/containers/src/overviews/overview-module/index.ts b/libs/react/containers/src/overviews/overview-module/index.ts
new file mode 100644
index 000000000..f6130f52d
--- /dev/null
+++ b/libs/react/containers/src/overviews/overview-module/index.ts
@@ -0,0 +1 @@
+export { OverviewModule } from "./overview-module";
diff --git a/libs/react/containers/src/overviews/overview-module/overview-module.tsx b/libs/react/containers/src/overviews/overview-module/overview-module.tsx
new file mode 100644
index 000000000..aff3b245b
--- /dev/null
+++ b/libs/react/containers/src/overviews/overview-module/overview-module.tsx
@@ -0,0 +1,69 @@
+import { useState } from "react";
+import { Button, Divider, Grid, Typography } from "@mui/joy";
+import { CtaSearch } from "@chair-flight/react/components";
+import { trpc } from "@chair-flight/trpc/client";
+import { LayoutModule } from "../../layouts/layout-module";
+import { container, getRequiredParam } from "../../wraper";
+import type { QuestionBankName } from "@chair-flight/base/types";
+
+type Props = {
+  questionBank: QuestionBankName;
+};
+
+type Params = {
+  questionBank: QuestionBankName;
+};
+
+type Data = {
+  hasFlashcards: boolean;
+  hasQuestions: boolean;
+  hasLearningObjectives: boolean;
+  hasMedia: boolean;
+};
+
+export const OverviewModule = container<Props, Params, Data>(
+  ({ questionBank, sx, component = "section" }) => {
+    const config = LayoutModule.useData({ questionBank });
+    const [searchQuestion, setQuestionSearch] = useState("");
+
+    return (
+      <Grid container component={component} sx={sx} spacing={2}>
+        {config.hasQuestions && (
+          <>
+            <Grid xs={12} md={6}>
+              <Button>Search Questions</Button>
+            </Grid>
+            <Grid xs={12} md={6}>
+              <Button>Something Tests</Button>
+            </Grid>
+            <Grid xs={12} md={6}>
+              <Button>Create Test</Button>
+            </Grid>
+          </>
+        )}
+        {config.hasQuestions && (
+          <Grid xs={12} md={6}>
+            <Typography level="h2">Search Questions</Typography>
+            <Divider sx={{ mb: 2 }} />
+            <CtaSearch
+              disableLabel
+              value={searchQuestion}
+              onChange={(v) => setQuestionSearch(v)}
+            />
+          </Grid>
+        )}
+      </Grid>
+    );
+  },
+);
+
+OverviewModule.getData = async ({ helper, params }) => {
+  const questionBank = getRequiredParam(params, "questionBank");
+  return await helper.questionBank.getConfig.fetch({ questionBank });
+};
+
+OverviewModule.useData = (params) => {
+  const qb = trpc.questionBank;
+  const questionBank = getRequiredParam(params, "questionBank");
+  return qb.getConfig.useSuspenseQuery({ questionBank })[0];
+};
diff --git a/libs/react/containers/src/overviews/overview-modules/overview-modules.tsx b/libs/react/containers/src/overviews/overview-modules/overview-modules.tsx
index b28eeac3e..8747bfe10 100644
--- a/libs/react/containers/src/overviews/overview-modules/overview-modules.tsx
+++ b/libs/react/containers/src/overviews/overview-modules/overview-modules.tsx
@@ -79,6 +79,7 @@ export const OverviewModules = container<Props, Params, Data>(
           return (
             <Grid xs={12} sm={6} lg={3} key={mod.id}>
               <Card
+                replace
                 component={NextLink}
                 role="button"
                 href={`/modules/${mod.id}`}
diff --git a/libs/react/containers/src/tests/test-exam/test-exam.tsx b/libs/react/containers/src/tests/test-exam/test-exam.tsx
index 3fb7f1a55..925f16875 100644
--- a/libs/react/containers/src/tests/test-exam/test-exam.tsx
+++ b/libs/react/containers/src/tests/test-exam/test-exam.tsx
@@ -1,5 +1,4 @@
 import { useState } from "react";
-import { useRouter } from "next/router";
 import { default as AccessAlarmsOutlinedIcon } from "@mui/icons-material/AccessAlarmsOutlined";
 import { default as AppsOutlinedIcon } from "@mui/icons-material/AppsOutlined";
 import { default as ChevronLeftIcon } from "@mui/icons-material/ChevronLeft";
@@ -40,15 +39,15 @@ type DrawingPointsMap = Record<string, DrawingPoints[]>;
 
 type Props = {
   testId: string;
+  onTestFinished?: () => void;
 };
 
 export const TestExam = container<Props>(
-  ({ testId, sx, component = "section" }) => {
+  ({ testId, sx, onTestFinished, component = "section" }) => {
     useTestHotkeys({ testId });
     useTestProgressTime({ testId });
 
     const theme = useTheme();
-    const router = useRouter();
     const test = useTestProgress((state) => state.tests[testId]);
     const goToQuestion = useTestProgress((s) => s.goToTestQuestion);
     const goToPreviousQuestion = useTestProgress((s) => s.goToPreviousQuestion);
@@ -222,7 +221,7 @@ export const TestExam = container<Props>(
               children="Finish"
               onClick={() => {
                 finishTest({ testId: test.id });
-                router.push(`../${test.id}/review`);
+                onTestFinished?.();
               }}
             />
           </Box>
@@ -243,7 +242,7 @@ export const TestExam = container<Props>(
               color="danger"
               onClick={() => {
                 finishTest({ testId: test.id });
-                router.push(`../${test.id}/review`);
+                onTestFinished?.();
               }}
             />
           </ModalDialog>
diff --git a/libs/react/containers/src/tests/test-maker/test-maker.tsx b/libs/react/containers/src/tests/test-maker/test-maker.tsx
index c65c487ab..09a4acc70 100644
--- a/libs/react/containers/src/tests/test-maker/test-maker.tsx
+++ b/libs/react/containers/src/tests/test-maker/test-maker.tsx
@@ -30,7 +30,6 @@ import type {
 } from "@chair-flight/base/types";
 import type { NewTestConfiguration } from "@chair-flight/core/app";
 import type { NestedCheckboxSelectProps } from "@chair-flight/react/components";
-import type { BoxProps } from "@mui/joy";
 
 const resolver = zodResolver(newTestConfigurationSchema);
 
@@ -45,9 +44,10 @@ const testMakerPersistence = {
     createUsePersistenceHook<NewTestConfiguration>("cf-test-maker-prep"),
 };
 
-type Props = Pick<BoxProps, "sx" | "component"> & {
+type Props = {
   onSuccessfulTestCreation: (test: Test) => void;
   questionBank: QuestionBankName;
+  component?: "form";
 };
 
 type Params = {
@@ -59,7 +59,7 @@ type Data = {
 };
 
 export const TestMaker = container<Props, Params, Data>(
-  ({ questionBank, onSuccessfulTestCreation, sx, component = "form" }) => {
+  ({ questionBank, onSuccessfulTestCreation, sx }) => {
     const params: Params = { questionBank };
     const persistenceKey = `cf-test-maker-${questionBank}` as const;
     const useTestMakerPersistence = testMakerPersistence[persistenceKey];
@@ -165,7 +165,7 @@ export const TestMaker = container<Props, Params, Data>(
 
     return (
       <Box
-        component={component as "form"}
+        component={"form"}
         onSubmit={onSubmit}
         onBlur={() => setPersistedData(form.getValues())}
         sx={{
diff --git a/libs/react/containers/src/tests/test-study/test-study.tsx b/libs/react/containers/src/tests/test-study/test-study.tsx
index a12a08248..0dc14f456 100644
--- a/libs/react/containers/src/tests/test-study/test-study.tsx
+++ b/libs/react/containers/src/tests/test-study/test-study.tsx
@@ -1,5 +1,4 @@
 import { useState } from "react";
-import { useRouter } from "next/router";
 import { default as AccessAlarmsOutlinedIcon } from "@mui/icons-material/AccessAlarmsOutlined";
 import { default as AppsOutlinedIcon } from "@mui/icons-material/AppsOutlined";
 import { default as ChevronLeftIcon } from "@mui/icons-material/ChevronLeft";
@@ -48,16 +47,24 @@ type DrawingPointsMap = Record<string, DrawingPoints[]>;
 
 type Props = {
   testId: string;
+  onTestDismissed?: () => void;
+  onTestFinished?: () => void;
   onMenuClicked?: () => void;
 };
 
 export const TestStudy = container<Props>(
-  ({ testId, onMenuClicked, component = "section", sx }) => {
+  ({
+    testId,
+    onTestDismissed,
+    onTestFinished,
+    onMenuClicked,
+    component = "section",
+    sx,
+  }) => {
     useTestHotkeys({ testId });
     useTestProgressTime({ testId });
 
     const theme = useTheme();
-    const router = useRouter();
     const test = useTestProgress((state) => state.tests[testId]);
     const goToQuestion = useTestProgress((s) => s.goToTestQuestion);
     const goToPreviousQuestion = useTestProgress((s) => s.goToPreviousQuestion);
@@ -266,7 +273,7 @@ export const TestStudy = container<Props>(
               children="Finish"
               onClick={() => {
                 finishTest({ testId: test.id });
-                router.push(`../${test.id}/review`);
+                onTestDismissed?.();
               }}
             />
           </Box>
@@ -311,9 +318,7 @@ export const TestStudy = container<Props>(
               variant="outlined"
               children="Exit without finishing"
               color="warning"
-              onClick={() => {
-                router.push(`../`);
-              }}
+              onClick={() => onTestDismissed?.()}
             />
             <Button
               fullWidth
@@ -321,7 +326,7 @@ export const TestStudy = container<Props>(
               color="danger"
               onClick={() => {
                 finishTest({ testId: test.id });
-                router.push(`../${test.id}/review`);
+                onTestFinished?.();
               }}
             />
           </ModalDialog>
diff --git a/libs/trpc/mock/src/__mocks__/learning-objectives-search.mock.ts b/libs/trpc/mock/src/__mocks__/learning-objectives-search.mock.ts
index 870f0e0d6..b6a6f3bb7 100644
--- a/libs/trpc/mock/src/__mocks__/learning-objectives-search.mock.ts
+++ b/libs/trpc/mock/src/__mocks__/learning-objectives-search.mock.ts
@@ -1,5 +1,5 @@
-import type { MatchInfo } from "minisearch";
 import type { QuestionBankLearningObjective } from "@chair-flight/base/types";
+import type { MatchInfo } from "minisearch";
 
 export const mockLearningObjectiveSearchItems = [
   {