diff --git a/app/(pages)/(with-nav)/inputs/layout.tsx b/app/(pages)/(with-nav)/inputs/layout.tsx
index 29517454..cca15b23 100644
--- a/app/(pages)/(with-nav)/inputs/layout.tsx
+++ b/app/(pages)/(with-nav)/inputs/layout.tsx
@@ -11,7 +11,7 @@ const Layout = ({ children }: LayoutProps) => (
     <div className="my-16 flex h-8 items-center justify-between gap-8 px-4">
       <h1 className="text-2xl">Inputs</h1>
       <Button href="/inputs/create" scroll={false} size="sm">
-        <PlusIcon className="w-5" />
+        <PlusIcon className="-ml-0.5 w-5" />
         New input
       </Button>
     </div>
diff --git a/app/(pages)/(with-nav)/subjects/(list)/layout.tsx b/app/(pages)/(with-nav)/subjects/(list)/layout.tsx
index 83db1635..da77431b 100644
--- a/app/(pages)/(with-nav)/subjects/(list)/layout.tsx
+++ b/app/(pages)/(with-nav)/subjects/(list)/layout.tsx
@@ -11,7 +11,7 @@ const Layout = async ({ children }: LayoutProps) => (
     <div className="my-16 flex h-8 items-center justify-between gap-8 px-4">
       <h1 className="text-2xl">Subjects</h1>
       <Button href="/subjects/create" scroll={false} size="sm">
-        <PlusIcon className="w-5" />
+        <PlusIcon className="-ml-0.5 w-5" />
         New subject
       </Button>
     </div>
diff --git a/app/(pages)/(with-nav)/subjects/(list)/page.tsx b/app/(pages)/(with-nav)/subjects/(list)/page.tsx
index 72f14463..200ba77c 100644
--- a/app/(pages)/(with-nav)/subjects/(list)/page.tsx
+++ b/app/(pages)/(with-nav)/subjects/(list)/page.tsx
@@ -45,21 +45,23 @@ const Page = async () => {
       {!clientSubjects.length && !teamSubjects.length && (
         <Empty className="mx-4">
           <InformationCircleIcon className="w-7" />
-          Subjects can be dogs, cats, humans or
+          Add a subject to start collaboratively
           <br />
-          anything else you want to track.
+          tracking and improving behavior.
         </Empty>
       )}
       <SubjectList
         clientSubjects={clientSubjects}
         teamSubjects={teamSubjects}
       />
-      <CollapsibleArchive>
-        <SubjectList
-          clientSubjects={archivedClientSubjects}
-          teamSubjects={archivedTeamSubjects}
-        />
-      </CollapsibleArchive>
+      {(!!archivedTeamSubjects.length || !!archivedClientSubjects.length) && (
+        <CollapsibleArchive>
+          <SubjectList
+            clientSubjects={archivedClientSubjects}
+            teamSubjects={archivedTeamSubjects}
+          />
+        </CollapsibleArchive>
+      )}
     </>
   );
 };
diff --git a/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/layout.tsx b/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/layout.tsx
deleted file mode 100644
index 5d84c1f4..00000000
--- a/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/layout.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import SubjectLayout from '@/_components/subject-layout';
-import { ReactNode } from 'react';
-
-interface PageProps {
-  children: ReactNode;
-  params: { subjectId: string };
-}
-
-const Layout = ({ children, params: { subjectId } }: PageProps) => (
-  <SubjectLayout subjectId={subjectId}>{children}</SubjectLayout>
-);
-
-export default Layout;
diff --git a/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/loading.tsx b/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/loading.tsx
deleted file mode 100644
index a626e9fb..00000000
--- a/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/loading.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import Spinner from '@/_components/spinner';
-
-const Loading = () => <Spinner className="mx-auto my-16" />;
-
-export default Loading;
diff --git a/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/layout.tsx b/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/layout.tsx
deleted file mode 100644
index fc1ebfa1..00000000
--- a/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/layout.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ReactNode } from 'react';
-
-interface LayoutProps {
-  children: ReactNode;
-}
-
-const Layout = ({ children }: LayoutProps) => children;
-
-export default Layout;
diff --git a/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/loading.tsx b/app/(pages)/(with-nav)/subjects/[subjectId]/loading.tsx
similarity index 100%
rename from app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/loading.tsx
rename to app/(pages)/(with-nav)/subjects/[subjectId]/loading.tsx
diff --git a/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/events/page.tsx b/app/(pages)/(with-nav)/subjects/[subjectId]/page.tsx
similarity index 71%
rename from app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/events/page.tsx
rename to app/(pages)/(with-nav)/subjects/[subjectId]/page.tsx
index 10ca69ad..b4b0888a 100644
--- a/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/events/page.tsx
+++ b/app/(pages)/(with-nav)/subjects/[subjectId]/page.tsx
@@ -1,4 +1,4 @@
-import SubjectEventsPage from '@/_components/subject-events-page';
+import SubjectPage from '@/_components/subject-page';
 import formatTitle from '@/_utilities/format-title';
 
 interface PageProps {
@@ -12,7 +12,7 @@ const Page = ({
   params: { subjectId },
   searchParams: { from, limit, to },
 }: PageProps) => (
-  <SubjectEventsPage from={from} limit={limit} subjectId={subjectId} to={to} />
+  <SubjectPage from={from} limit={limit} subjectId={subjectId} to={to} />
 );
 
 export default Page;
diff --git a/app/(pages)/(with-nav)/templates/layout.tsx b/app/(pages)/(with-nav)/templates/layout.tsx
index 382b97fd..8c79e817 100644
--- a/app/(pages)/(with-nav)/templates/layout.tsx
+++ b/app/(pages)/(with-nav)/templates/layout.tsx
@@ -11,7 +11,7 @@ const Layout = ({ children }: LayoutProps) => (
     <div className="my-16 flex h-8 items-center justify-between gap-8 px-4">
       <h1 className="text-2xl">Templates</h1>
       <Button href="/templates/create" scroll={false} size="sm">
-        <PlusIcon className="w-5" />
+        <PlusIcon className="-ml-0.5 w-5" />
         New template
       </Button>
     </div>
diff --git a/app/(pages)/share/[subjectId]/(subject-loading)/(subject)/insights/page.tsx b/app/(pages)/@modal/(lg)/share/[subjectId]/insights/page.tsx
similarity index 67%
rename from app/(pages)/share/[subjectId]/(subject-loading)/(subject)/insights/page.tsx
rename to app/(pages)/@modal/(lg)/share/[subjectId]/insights/page.tsx
index 9b48a269..4426ac96 100644
--- a/app/(pages)/share/[subjectId]/(subject-loading)/(subject)/insights/page.tsx
+++ b/app/(pages)/@modal/(lg)/share/[subjectId]/insights/page.tsx
@@ -1,4 +1,4 @@
-import SubjectInsightsPage from '@/_components/subject-insights-page';
+import InsightsPage from '@/_components/insights-page';
 import formatTitle from '@/_utilities/format-title';
 
 interface PageProps {
@@ -9,11 +9,7 @@ interface PageProps {
 export const metadata = { title: formatTitle(['Subjects', 'Insights']) };
 
 const Page = async ({ params: { subjectId }, searchParams }: PageProps) => (
-  <SubjectInsightsPage
-    isPublic
-    searchParams={searchParams}
-    subjectId={subjectId}
-  />
+  <InsightsPage isPublic searchParams={searchParams} subjectId={subjectId} />
 );
 
 export default Page;
diff --git a/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/edit/page.tsx b/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/edit/page.tsx
index 0ba7cd1e..47b5176c 100644
--- a/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/edit/page.tsx
+++ b/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/edit/page.tsx
@@ -26,7 +26,7 @@ const Page = async ({ params: { insightId, subjectId } }: PageProps) => {
 
   return (
     <>
-      <PageModalHeader title="New insight" />
+      <PageModalHeader title="Edit insight" />
       <InsightForm events={events} insight={insight} subjectId={subjectId} />
     </>
   );
diff --git a/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/loading.tsx b/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/loading.tsx
index e3d948d8..3999a6f2 100644
--- a/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/loading.tsx
+++ b/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/loading.tsx
@@ -1,5 +1,7 @@
 import PageModalLoading from '@/_components/page-modal-loading';
 
-const Loading = PageModalLoading;
+const Loading = () => (
+  <PageModalLoading className="rounded bg-alpha-reverse-1" />
+);
 
 export default Loading;
diff --git a/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/insights/page.tsx b/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/page.tsx
similarity index 69%
rename from app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/insights/page.tsx
rename to app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/page.tsx
index 77f0a661..cc13bf92 100644
--- a/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/insights/page.tsx
+++ b/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/page.tsx
@@ -1,4 +1,4 @@
-import SubjectInsightsPage from '@/_components/subject-insights-page';
+import InsightsPage from '@/_components/insights-page';
 import formatTitle from '@/_utilities/format-title';
 
 interface PageProps {
@@ -9,7 +9,7 @@ interface PageProps {
 export const metadata = { title: formatTitle(['Subjects', 'Insights']) };
 
 const Page = async ({ params: { subjectId }, searchParams }: PageProps) => (
-  <SubjectInsightsPage searchParams={searchParams} subjectId={subjectId} />
+  <InsightsPage searchParams={searchParams} subjectId={subjectId} />
 );
 
 export default Page;
diff --git a/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/edit/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/edit/page.tsx
index 98c932f5..fb875260 100644
--- a/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/edit/page.tsx
+++ b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/edit/page.tsx
@@ -1,7 +1,7 @@
-import MissionForm from '@/_components/mission-form';
 import PageModalHeader from '@/_components/page-modal-header';
-import getMission from '@/_queries/get-mission';
+import TrainingPlanForm from '@/_components/training-plan-form';
 import getSubject from '@/_queries/get-subject';
+import getTrainingPlan from '@/_queries/get-training-plan';
 import formatTitle from '@/_utilities/format-title';
 
 interface PageProps {
@@ -18,7 +18,7 @@ export const metadata = {
 const Page = async ({ params: { missionId, subjectId } }: PageProps) => {
   const [{ data: subject }, { data: mission }] = await Promise.all([
     getSubject(subjectId),
-    getMission(missionId),
+    getTrainingPlan(missionId),
   ]);
 
   if (!subject || !mission) return null;
@@ -26,7 +26,7 @@ const Page = async ({ params: { missionId, subjectId } }: PageProps) => {
   return (
     <>
       <PageModalHeader title={mission.name} />
-      <MissionForm mission={mission} subjectId={subjectId} />
+      <TrainingPlanForm mission={mission} subjectId={subjectId} />
     </>
   );
 };
diff --git a/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/edit/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/edit/page.tsx
index e81e393a..85d20a20 100644
--- a/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/edit/page.tsx
+++ b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/edit/page.tsx
@@ -3,9 +3,9 @@ import PageModalHeader from '@/_components/page-modal-header';
 import SessionForm from '@/_components/session-form';
 import SessionLayout from '@/_components/session-layout';
 import getCurrentUser from '@/_queries/get-current-user';
-import getMissionWithSessions from '@/_queries/get-mission-with-sessions';
 import getSession from '@/_queries/get-session';
 import getSubject from '@/_queries/get-subject';
+import getTrainingPlanWithSessions from '@/_queries/get-training-plan-with-sessions';
 import listInputsBySubjectId from '@/_queries/list-inputs-by-subject-id';
 import listSubjectsByTeamId from '@/_queries/list-subjects-by-team-id';
 import listTemplatesWithData from '@/_queries/list-templates-with-data';
@@ -37,7 +37,7 @@ const Page = async ({
     user,
   ] = await Promise.all([
     getSubject(subjectId),
-    getMissionWithSessions(missionId, { draft: true }),
+    getTrainingPlanWithSessions(missionId, { draft: true }),
     getSession(sessionId),
     listInputsBySubjectId(subjectId),
     listTemplatesWithData(),
diff --git a/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/from-session/[sessionId]/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/from-session/[sessionId]/page.tsx
index 55b0b8b8..e4d9da98 100644
--- a/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/from-session/[sessionId]/page.tsx
+++ b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/from-session/[sessionId]/page.tsx
@@ -3,9 +3,9 @@ import PageModalHeader from '@/_components/page-modal-header';
 import SessionForm from '@/_components/session-form';
 import SessionLayout from '@/_components/session-layout';
 import getCurrentUser from '@/_queries/get-current-user';
-import getMissionWithSessions from '@/_queries/get-mission-with-sessions';
 import getSession from '@/_queries/get-session';
 import getSubject from '@/_queries/get-subject';
+import getTrainingPlanWithSessions from '@/_queries/get-training-plan-with-sessions';
 import listInputsBySubjectId from '@/_queries/list-inputs-by-subject-id';
 import listSubjectsByTeamId from '@/_queries/list-subjects-by-team-id';
 import listTemplatesWithData from '@/_queries/list-templates-with-data';
@@ -37,7 +37,7 @@ const Page = async ({
     user,
   ] = await Promise.all([
     getSubject(subjectId),
-    getMissionWithSessions(missionId, { draft: true }),
+    getTrainingPlanWithSessions(missionId, { draft: true }),
     getSession(sessionId),
     listInputsBySubjectId(subjectId),
     listTemplatesWithData(),
diff --git a/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/page.tsx
index cd60486f..ea2954db 100644
--- a/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/page.tsx
+++ b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/page.tsx
@@ -3,8 +3,8 @@ import PageModalHeader from '@/_components/page-modal-header';
 import SessionForm from '@/_components/session-form';
 import SessionLayout from '@/_components/session-layout';
 import getCurrentUser from '@/_queries/get-current-user';
-import getMissionWithSessions from '@/_queries/get-mission-with-sessions';
 import getSubject from '@/_queries/get-subject';
+import getTrainingPlanWithSessions from '@/_queries/get-training-plan-with-sessions';
 import listInputsBySubjectId from '@/_queries/list-inputs-by-subject-id';
 import listSubjectsByTeamId from '@/_queries/list-subjects-by-team-id';
 import listTemplatesWithData from '@/_queries/list-templates-with-data';
@@ -32,7 +32,7 @@ const Page = async ({ params: { missionId, order, subjectId } }: PageProps) => {
     user,
   ] = await Promise.all([
     getSubject(subjectId),
-    getMissionWithSessions(missionId, { draft: true }),
+    getTrainingPlanWithSessions(missionId, { draft: true }),
     listSubjectsByTeamId(),
     listInputsBySubjectId(subjectId),
     listTemplatesWithData(),
diff --git a/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/create/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/create/page.tsx
index 5c94ff77..0a3d7067 100644
--- a/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/create/page.tsx
+++ b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/create/page.tsx
@@ -1,5 +1,5 @@
-import MissionForm from '@/_components/mission-form';
 import PageModalHeader from '@/_components/page-modal-header';
+import TrainingPlanForm from '@/_components/training-plan-form';
 import getSubject from '@/_queries/get-subject';
 import formatTitle from '@/_utilities/format-title';
 
@@ -20,7 +20,7 @@ const Page = async ({ params: { subjectId } }: PageProps) => {
   return (
     <>
       <PageModalHeader title="New training plan" />
-      <MissionForm subjectId={subjectId} />
+      <TrainingPlanForm subjectId={subjectId} />
     </>
   );
 };
diff --git a/app/(pages)/loading.tsx b/app/(pages)/loading.tsx
deleted file mode 100644
index b95ccc10..00000000
--- a/app/(pages)/loading.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-const Loading = () => null;
-
-export default Loading;
diff --git a/app/(pages)/share/[subjectId]/(subject-loading)/(subject)/layout.tsx b/app/(pages)/share/[subjectId]/(subject-loading)/(subject)/layout.tsx
deleted file mode 100644
index 651fa7de..00000000
--- a/app/(pages)/share/[subjectId]/(subject-loading)/(subject)/layout.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import SubjectLayout from '@/_components/subject-layout';
-import { ReactNode } from 'react';
-
-interface PageProps {
-  children: ReactNode;
-  params: { subjectId: string };
-}
-
-const Layout = ({ children, params: { subjectId } }: PageProps) => (
-  <SubjectLayout isPublic subjectId={subjectId}>
-    {children}
-  </SubjectLayout>
-);
-
-export default Layout;
diff --git a/app/(pages)/share/[subjectId]/(subject-loading)/(subject)/loading.tsx b/app/(pages)/share/[subjectId]/(subject-loading)/(subject)/loading.tsx
deleted file mode 100644
index a626e9fb..00000000
--- a/app/(pages)/share/[subjectId]/(subject-loading)/(subject)/loading.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import Spinner from '@/_components/spinner';
-
-const Loading = () => <Spinner className="mx-auto my-16" />;
-
-export default Loading;
diff --git a/app/(pages)/share/[subjectId]/(subject-loading)/layout.tsx b/app/(pages)/share/[subjectId]/(subject-loading)/layout.tsx
deleted file mode 100644
index fc1ebfa1..00000000
--- a/app/(pages)/share/[subjectId]/(subject-loading)/layout.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ReactNode } from 'react';
-
-interface LayoutProps {
-  children: ReactNode;
-}
-
-const Layout = ({ children }: LayoutProps) => children;
-
-export default Layout;
diff --git a/app/(pages)/share/[subjectId]/(subject-loading)/loading.tsx b/app/(pages)/share/[subjectId]/(subject-loading)/loading.tsx
deleted file mode 100644
index e25c34a7..00000000
--- a/app/(pages)/share/[subjectId]/(subject-loading)/loading.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import SubjectLoading from '@/_components/subject-loading';
-
-export default SubjectLoading;
diff --git a/app/(pages)/share/[subjectId]/events.csv/route.tsx b/app/(pages)/share/[subjectId]/events.csv/route.tsx
deleted file mode 100644
index 2f168997..00000000
--- a/app/(pages)/share/[subjectId]/events.csv/route.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import Number from '@/_constants/enum-number';
-import listPublicEvents from '@/_queries/list-public-events';
-import formatTabularEventsCsvResponse from '@/_utilities/format-tabular-events-csv-response';
-
-interface GetContext {
-  params: {
-    subjectId: string;
-  };
-}
-
-export const GET = async (_: Request, ctx: GetContext) => {
-  const { data } = await listPublicEvents(ctx.params.subjectId, {
-    from: 0,
-    to: Number.FourByteSignedIntMax - 1,
-  });
-
-  return formatTabularEventsCsvResponse(data);
-};
diff --git a/app/(pages)/share/[subjectId]/layout.tsx b/app/(pages)/share/[subjectId]/layout.tsx
index 8dbced09..a110cf4d 100644
--- a/app/(pages)/share/[subjectId]/layout.tsx
+++ b/app/(pages)/share/[subjectId]/layout.tsx
@@ -29,7 +29,7 @@ const Layout = async ({ children, params: { subjectId } }: LayoutProps) => {
                   </span>
                   <Button
                     className="text-sm"
-                    href={`/subjects/${subjectId}/events`}
+                    href={`/subjects/${subjectId}`}
                     variant="link"
                   >
                     View full profile
diff --git a/app/(pages)/share/[subjectId]/loading.tsx b/app/(pages)/share/[subjectId]/loading.tsx
index b95ccc10..e25c34a7 100644
--- a/app/(pages)/share/[subjectId]/loading.tsx
+++ b/app/(pages)/share/[subjectId]/loading.tsx
@@ -1,3 +1,3 @@
-const Loading = () => null;
+import SubjectLoading from '@/_components/subject-loading';
 
-export default Loading;
+export default SubjectLoading;
diff --git a/app/(pages)/share/[subjectId]/(subject-loading)/(subject)/events/page.tsx b/app/(pages)/share/[subjectId]/page.tsx
similarity index 84%
rename from app/(pages)/share/[subjectId]/(subject-loading)/(subject)/events/page.tsx
rename to app/(pages)/share/[subjectId]/page.tsx
index 49816361..385b3237 100644
--- a/app/(pages)/share/[subjectId]/(subject-loading)/(subject)/events/page.tsx
+++ b/app/(pages)/share/[subjectId]/page.tsx
@@ -1,4 +1,4 @@
-import SubjectEventsPage from '@/_components/subject-events-page';
+import SubjectPage from '@/_components/subject-page';
 import formatTitle from '@/_utilities/format-title';
 
 interface PageProps {
@@ -12,7 +12,7 @@ const Page = async ({
   params: { subjectId },
   searchParams: { from, limit, to },
 }: PageProps) => (
-  <SubjectEventsPage
+  <SubjectPage
     from={from}
     limit={limit}
     isPublic
diff --git a/app/(pages)/(with-nav)/subjects/[subjectId]/events.csv/route.ts b/app/(pages)/subjects/[subjectId]/events.csv/route.ts
similarity index 100%
rename from app/(pages)/(with-nav)/subjects/[subjectId]/events.csv/route.ts
rename to app/(pages)/subjects/[subjectId]/events.csv/route.ts
diff --git a/app/(pages)/(with-nav)/subjects/[subjectId]/join/[shareCode]/page.tsx b/app/(pages)/subjects/[subjectId]/join/[shareCode]/page.tsx
similarity index 92%
rename from app/(pages)/(with-nav)/subjects/[subjectId]/join/[shareCode]/page.tsx
rename to app/(pages)/subjects/[subjectId]/join/[shareCode]/page.tsx
index f4ef42e3..1b4ae545 100644
--- a/app/(pages)/(with-nav)/subjects/[subjectId]/join/[shareCode]/page.tsx
+++ b/app/(pages)/subjects/[subjectId]/join/[shareCode]/page.tsx
@@ -18,7 +18,7 @@ const Page = async ({ params: { shareCode, subjectId } }: PageProps) => {
     });
   }
 
-  redirect(`/subjects/${subjectId}/events`);
+  redirect(`/subjects/${subjectId}`);
 };
 
 export default Page;
diff --git a/app/_components/button.tsx b/app/_components/button.tsx
index da567d55..557afe97 100644
--- a/app/_components/button.tsx
+++ b/app/_components/button.tsx
@@ -107,7 +107,10 @@ const Button = forwardRef<HTMLButtonElement | HTMLAnchorElement, ButtonProps>(
         {loading || (type === 'submit' && pending) ? (
           <>
             {variant !== 'link' && (
-              <Spinner color={spinnerColorSchemes[colorScheme]} />
+              <Spinner
+                className="-ml-0.5"
+                color={spinnerColorSchemes[colorScheme]}
+              />
             )}
             {loadingText ?? children}
           </>
diff --git a/app/_components/event-type-form.tsx b/app/_components/event-type-form.tsx
index 2887aa42..b6e5e796 100644
--- a/app/_components/event-type-form.tsx
+++ b/app/_components/event-type-form.tsx
@@ -119,9 +119,8 @@ const EventTypeForm = ({
               placeholder="Select inputs or type to create…"
               tooltip={
                 <>
-                  Define the specific data points you are interested in tracking
-                  for this event type. For example: &ldquo;Duration&rdquo;,
-                  &ldquo;Rating&rdquo;, &ldquo;Body language&rdquo;, etc.
+                  Define the specific data points you are interested in
+                  tracking.
                 </>
               }
               value={field.value as IOption[]}
diff --git a/app/_components/insight-form.tsx b/app/_components/insight-form.tsx
index 99ff4f70..b7c18ee5 100644
--- a/app/_components/insight-form.tsx
+++ b/app/_components/insight-form.tsx
@@ -150,7 +150,6 @@ const InsightForm = ({ events, insight, subjectId }: InsightFormProps) => {
             return;
           }
 
-          localStorage.setItem('refresh', '1');
           router.back();
         }),
       )}
@@ -181,6 +180,29 @@ const InsightForm = ({ events, insight, subjectId }: InsightFormProps) => {
           />
         </div>
       </div>
+      <div className="rounded bg-alpha-reverse-1">
+        <PlotFigure
+          barInterval={form.watch('barInterval')}
+          barReducer={form.watch('barReducer')}
+          defaultHeight={250}
+          events={events}
+          includeEventsFrom={form.watch('includeEventsFrom')}
+          includeEventsSince={form.watch('includeEventsSince')}
+          inputId={inputId}
+          lineCurveFunction={form.watch('lineCurveFunction')}
+          marginBottom={form.watch('marginBottom')}
+          marginLeft={form.watch('marginLeft')}
+          marginRight={form.watch('marginRight')}
+          marginTop={form.watch('marginTop')}
+          showBars={showBars}
+          showDots={form.watch('showDots')}
+          showLine={showLine}
+          showLinearRegression={form.watch('showLinearRegression')}
+          subjectId={subjectId}
+          title={form.watch('name')}
+          type={form.watch('type')}
+        />
+      </div>
       <div className="grid grid-cols-2 gap-4 md:grid-cols-4">
         <Checkbox
           disabled={showBars && isInputNominal}
@@ -351,31 +373,6 @@ const InsightForm = ({ events, insight, subjectId }: InsightFormProps) => {
           {...form.register('marginRight')}
         />
       </CollapsibleSection>
-      <div className="rounded border border-alpha-1">
-        <div className="rounded bg-alpha-reverse-1">
-          <PlotFigure
-            barInterval={form.watch('barInterval')}
-            barReducer={form.watch('barReducer')}
-            defaultHeight={250}
-            events={events}
-            includeEventsFrom={form.watch('includeEventsFrom')}
-            includeEventsSince={form.watch('includeEventsSince')}
-            inputId={inputId}
-            lineCurveFunction={form.watch('lineCurveFunction')}
-            marginBottom={form.watch('marginBottom')}
-            marginLeft={form.watch('marginLeft')}
-            marginRight={form.watch('marginRight')}
-            marginTop={form.watch('marginTop')}
-            showBars={showBars}
-            showDots={form.watch('showDots')}
-            showLine={showLine}
-            showLinearRegression={form.watch('showLinearRegression')}
-            subjectId={subjectId}
-            title={form.watch('name')}
-            type={form.watch('type')}
-          />
-        </div>
-      </div>
       {form.formState.errors.root && (
         <div className="text-center">{form.formState.errors.root.message}</div>
       )}
diff --git a/app/_components/subject-insights-page.tsx b/app/_components/insights-page.tsx
similarity index 52%
rename from app/_components/subject-insights-page.tsx
rename to app/_components/insights-page.tsx
index 03a5d1cd..f89ed61f 100644
--- a/app/_components/subject-insights-page.tsx
+++ b/app/_components/insights-page.tsx
@@ -1,6 +1,8 @@
+import BackButton from '@/_components/back-button';
 import Button from '@/_components/button';
 import Empty from '@/_components/empty';
 import Insights from '@/_components/insights';
+import PageModalHeader from '@/_components/page-modal-header';
 import Number from '@/_constants/enum-number';
 import getCurrentUser from '@/_queries/get-current-user';
 import getPublicSubject from '@/_queries/get-public-subject';
@@ -14,17 +16,17 @@ import InformationCircleIcon from '@heroicons/react/24/outline/InformationCircle
 import PlusIcon from '@heroicons/react/24/outline/PlusIcon';
 import { URLSearchParams } from 'next/dist/compiled/@edge-runtime/primitives';
 
-interface SubjectInsightsPageProps {
+interface InsightsPageProps {
   isPublic?: boolean;
   searchParams: { from?: string; to?: string };
   subjectId: string;
 }
 
-const SubjectInsightsPage = async ({
+const InsightsPage = async ({
   isPublic,
   searchParams,
   subjectId,
-}: SubjectInsightsPageProps) => {
+}: InsightsPageProps) => {
   const f = formatEventFilters({
     from: searchParams.from,
     limit: String(Number.FourByteSignedIntMax - 1),
@@ -39,44 +41,62 @@ const SubjectInsightsPage = async ({
       getCurrentUser(),
     ]);
 
-  if (!subject || !events) return null;
+  if (!subject) return null;
   const isTeamMember = !!user && subject.team_id === user.id;
   const shareOrSubjects = isPublic ? 'share' : 'subjects';
   const searchObject = new URLSearchParams(searchParams);
   const searchString = searchObject.size ? `?${searchObject.toString()}` : '';
 
   return (
-    <div className="mt-16 space-y-4">
-      {isTeamMember && !subject.archived && (
-        <Button
-          className="w-full"
-          colorScheme="transparent"
-          href={`/subjects/${subjectId}/insights/create`}
-          scroll={false}
+    <>
+      <PageModalHeader
+        className="pb-8"
+        subtitle={
+          isTeamMember &&
+          !subject.archived && (
+            <Button
+              className="-my-1.5"
+              href={`/subjects/${subjectId}/insights/create`}
+              scroll={false}
+              size="sm"
+            >
+              <PlusIcon className="w-5" />
+              New insight
+            </Button>
+          )
+        }
+        title="Insights"
+        titlesWrapperClassName="flex w-full sm:pr-2 justify-between items-center"
+      />
+      <div className="px-4 sm:px-8">
+        {!insights?.length ? (
+          <Empty className="flex-row justify-center border-0 py-24">
+            <InformationCircleIcon className="w-7" />
+            No insights.
+          </Empty>
+        ) : (
+          <div className="space-y-4">
+            <Insights
+              events={events}
+              insights={insights}
+              isArchived={subject.archived}
+              isPublic={isPublic}
+              isTeamMember={isTeamMember}
+              searchString={searchString}
+              shareOrSubjects={shareOrSubjects}
+              subjectId={subjectId}
+            />
+          </div>
+        )}
+        <BackButton
+          className="m-0 block w-full py-6 text-center"
+          variant="link"
         >
-          <PlusIcon className="w-5" />
-          Create insight
-        </Button>
-      )}
-      {!insights?.length ? (
-        <Empty className="mt-4">
-          <InformationCircleIcon className="w-7" />
-          No insights.
-        </Empty>
-      ) : (
-        <Insights
-          events={events}
-          insights={insights}
-          isArchived={subject.archived}
-          isPublic={isPublic}
-          isTeamMember={isTeamMember}
-          searchString={searchString}
-          shareOrSubjects={shareOrSubjects}
-          subjectId={subjectId}
-        />
-      )}
-    </div>
+          Close
+        </BackButton>
+      </div>
+    </>
   );
 };
 
-export default SubjectInsightsPage;
+export default InsightsPage;
diff --git a/app/_components/insights.tsx b/app/_components/insights.tsx
index 717d2a8f..db546031 100644
--- a/app/_components/insights.tsx
+++ b/app/_components/insights.tsx
@@ -6,12 +6,13 @@ import PlotFigure from '@/_components/plot-figure';
 import { ListEventsData } from '@/_queries/list-events';
 import { ListInsightsData } from '@/_queries/list-insights';
 import { InsightConfigJson } from '@/_types/insight-config-json';
+import ArrowsPointingOutIcon from '@heroicons/react/24/outline/ArrowsPointingOutIcon';
 import ArrowUpRightIcon from '@heroicons/react/24/outline/ArrowUpRightIcon';
 import { useState } from 'react';
 import { twMerge } from 'tailwind-merge';
 
 interface InsightsProps {
-  events: NonNullable<ListEventsData>;
+  events: ListEventsData;
   insights: NonNullable<ListInsightsData>;
   isArchived?: boolean;
   isPublic?: boolean;
@@ -39,58 +40,54 @@ const Insights = ({
     const isReadOnly = !isTeamMember || isArchived;
 
     return (
-      <article
-        className="rounded border border-alpha-1 bg-bg-2"
-        key={insight.id}
-      >
-        <div className="min-h-12 rounded bg-alpha-reverse-1">
-          <div className="-mb-5 flex items-stretch rounded-t">
-            <Button
-              className={twMerge(
-                'm-0 flex w-full gap-4 px-4 pt-3 leading-snug',
-                !isReadOnly && 'pr-0',
-              )}
-              href={`/${shareOrSubjects}/${subjectId}/insights/${insight.id}${searchString}`}
-              scroll={false}
-              variant="link"
-            >
-              {insight.name}
-              {isReadOnly && (
-                <ArrowUpRightIcon className="ml-auto w-5 shrink-0" />
-              )}
-            </Button>
-            {!isReadOnly && (
-              <InsightMenu insightId={insight.id} subjectId={subjectId} />
+      <div className="min-h-12 rounded bg-alpha-reverse-1" key={insight.id}>
+        <div className="-mb-5 flex items-stretch rounded-t">
+          <Button
+            className={twMerge(
+              'm-0 flex w-full gap-4 px-4 pt-3 leading-snug',
+              !isReadOnly && 'pr-0',
             )}
-          </div>
-          <PlotFigure
-            barInterval={config.barInterval}
-            barReducer={config.barReducer}
-            defaultHeight={250}
-            events={events}
-            id={insight.id}
-            includeEventsFrom={config.includeEventsFrom}
-            includeEventsSince={config.includeEventsSince}
-            inputId={config.input}
-            isPublic={isPublic}
-            lineCurveFunction={config.lineCurveFunction}
-            marginBottom={config.marginBottom}
-            marginLeft={config.marginLeft}
-            marginRight={config.marginRight}
-            marginTop={config.marginTop}
-            setActiveId={setActiveId}
-            setSyncDate={setSyncDate}
-            showBars={config.showBars}
-            showDots={config.showDots}
-            showLine={config.showLine}
-            showLinearRegression={config.showLinearRegression}
-            subjectId={subjectId}
-            syncDate={insight.id === activeId ? null : syncDate}
-            title={insight.name}
-            type={config.type}
-          />
+            href={`/${shareOrSubjects}/${subjectId}/insights/${insight.id}${searchString}`}
+            scroll={false}
+            variant="link"
+          >
+            <ArrowsPointingOutIcon className="w-5" />
+            {insight.name}
+            {isReadOnly && (
+              <ArrowUpRightIcon className="ml-auto w-5 shrink-0" />
+            )}
+          </Button>
+          {!isReadOnly && (
+            <InsightMenu insightId={insight.id} subjectId={subjectId} />
+          )}
         </div>
-      </article>
+        <PlotFigure
+          barInterval={config.barInterval}
+          barReducer={config.barReducer}
+          defaultHeight={250}
+          events={events}
+          id={insight.id}
+          includeEventsFrom={config.includeEventsFrom}
+          includeEventsSince={config.includeEventsSince}
+          inputId={config.input}
+          isPublic={isPublic}
+          lineCurveFunction={config.lineCurveFunction}
+          marginBottom={config.marginBottom}
+          marginLeft={config.marginLeft}
+          marginRight={config.marginRight}
+          marginTop={config.marginTop}
+          setActiveId={setActiveId}
+          setSyncDate={setSyncDate}
+          showBars={config.showBars}
+          showDots={config.showDots}
+          showLine={config.showLine}
+          showLinearRegression={config.showLinearRegression}
+          subjectId={subjectId}
+          syncDate={insight.id === activeId ? null : syncDate}
+          title={insight.name}
+          type={config.type}
+        />
+      </div>
     );
   });
 };
diff --git a/app/_components/module-card.tsx b/app/_components/module-card.tsx
index 696ddcbc..fe739606 100644
--- a/app/_components/module-card.tsx
+++ b/app/_components/module-card.tsx
@@ -1,8 +1,8 @@
 import Avatar from '@/_components/avatar';
 import CollapsibleSection from '@/_components/collapsible-section';
 import DirtyHtml from '@/_components/dirty-html';
-import { GetMissionWithSessionsData } from '@/_queries/get-mission-with-sessions';
 import { GetSessionWithDetailsData } from '@/_queries/get-session-with-details';
+import { GetTrainingPlanWithSessionsData } from '@/_queries/get-training-plan-with-sessions';
 import forceArray from '@/_utilities/force-array';
 import { User } from '@supabase/supabase-js';
 import EventCommentForm from './event-comment-form';
@@ -16,7 +16,7 @@ interface ModuleCardProps {
   isArchived?: boolean;
   isPublic?: boolean;
   isTeamMember?: boolean;
-  mission: NonNullable<GetMissionWithSessionsData>;
+  mission: NonNullable<GetTrainingPlanWithSessionsData>;
   subjectId: string;
   user?: User | null;
 }
@@ -40,11 +40,11 @@ const ModuleCard = ({
       defaultOpen={!event && !disabled}
       title={
         <div className="py-2 text-left">
-          <div className="leading-none">
+          <div className="-mt-0.5">
             Module {(eventType.order as number) + 1}
           </div>
           {event && (
-            <div className="smallcaps flex items-center gap-2 pt-2 text-fg-4">
+            <div className="smallcaps flex items-center gap-2 pt-1 text-fg-4">
               Completed by
               <Avatar
                 className="-my-[0.15rem]"
diff --git a/app/_components/notifications.tsx b/app/_components/notifications.tsx
index 1e8aee3d..298167ad 100644
--- a/app/_components/notifications.tsx
+++ b/app/_components/notifications.tsx
@@ -45,7 +45,7 @@ const Notifications = ({ notifications }: NotificationsProps) => {
               href={
                 sourceEvent
                   ? `/subjects/${n?.subject?.id}/events/${sourceEvent.id}`
-                  : `/subjects/${n?.subject?.id}/events`
+                  : `/subjects/${n?.subject?.id}`
               }
               scroll={!sourceEvent}
               variant="link"
diff --git a/app/_components/page-modal-header.tsx b/app/_components/page-modal-header.tsx
index e2a40f50..09fb2077 100644
--- a/app/_components/page-modal-header.tsx
+++ b/app/_components/page-modal-header.tsx
@@ -8,6 +8,7 @@ interface PageModalHeaderProps {
   onClose?: () => void;
   subtitle?: ReactNode;
   title?: ReactNode;
+  titlesWrapperClassName?: string;
 }
 
 const PageModalHeader = ({
@@ -15,6 +16,7 @@ const PageModalHeader = ({
   onClose,
   subtitle,
   title,
+  titlesWrapperClassName,
 }: PageModalHeaderProps) => (
   <div
     className={twMerge(
@@ -22,7 +24,7 @@ const PageModalHeader = ({
       className,
     )}
   >
-    <div className="min-w-0">
+    <div className={twMerge('min-w-0', titlesWrapperClassName)}>
       {title && <h1 className="-my-1 truncate text-xl">{title}</h1>}
       {subtitle}
     </div>
diff --git a/app/_components/page-modal-loading.tsx b/app/_components/page-modal-loading.tsx
index 3e2d2031..ad0b25e1 100644
--- a/app/_components/page-modal-loading.tsx
+++ b/app/_components/page-modal-loading.tsx
@@ -4,8 +4,12 @@ import BackIconButton from '@/_components/back-icon-button';
 import Spinner from '@/_components/spinner';
 import XMarkIcon from '@heroicons/react/24/outline/XMarkIcon';
 
-const PageModalLoading = () => (
-  <>
+interface PageModalLoadingProps {
+  className?: string;
+}
+
+const PageModalLoading = ({ className }: PageModalLoadingProps) => (
+  <div className={className}>
     <div className="align-start flex justify-between px-4 py-8 sm:px-8">
       <div className="h-6 w-32 animate-pulse rounded-sm bg-alpha-3" />
       <BackIconButton
@@ -13,10 +17,10 @@ const PageModalLoading = () => (
         icon={<XMarkIcon className="w-7" />}
       />
     </div>
-    <div className="py-24">
+    <div className="pb-24 pt-16">
       <Spinner className="mx-auto" />
     </div>
-  </>
+  </div>
 );
 
 export default PageModalLoading;
diff --git a/app/_components/page-modal.tsx b/app/_components/page-modal.tsx
index 53fb9fae..c0363871 100644
--- a/app/_components/page-modal.tsx
+++ b/app/_components/page-modal.tsx
@@ -16,7 +16,7 @@ const PageModal = ({ children, className }: PageModalProps) => {
 
   return (
     <Dialog initialFocus={scrollContainer} onClose={router.back} open>
-      <div className="fixed -inset-4 z-10 bg-alpha-reverse-1 backdrop-blur" />
+      <div className="fixed inset-0 z-10 bg-alpha-reverse-1 backdrop-blur" />
       <div
         className="fixed left-0 top-0 z-20 h-dvh w-dvw overflow-y-auto py-16"
         ref={scrollContainer}
diff --git a/app/_components/plot-figure.tsx b/app/_components/plot-figure.tsx
index 07fd10e8..a2f8bf4f 100644
--- a/app/_components/plot-figure.tsx
+++ b/app/_components/plot-figure.tsx
@@ -45,7 +45,7 @@ const PlotFigure = ({
   barInterval: BarInterval;
   barReducer: BarReducer;
   defaultHeight?: number;
-  events: NonNullable<ListEventsData>;
+  events: ListEventsData;
   includeEventsFrom: string | null;
   includeEventsSince: TimeSinceMilliseconds | null;
   id?: string;
@@ -72,7 +72,7 @@ const PlotFigure = ({
   const { parentRef, width } = useParentSize();
 
   useEffect(() => {
-    if (!containerRef.current) return;
+    if (!containerRef.current || !events) return;
 
     const { input, isDuration, isInputNominal } = getInputDetailsFromEvents({
       events,
diff --git a/app/_components/scroll-to-top-hack.tsx b/app/_components/scroll-to-top-hack.tsx
deleted file mode 100644
index deb7a88b..00000000
--- a/app/_components/scroll-to-top-hack.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-'use client';
-
-import { usePathname, useSearchParams } from 'next/navigation';
-import { useEffect } from 'react';
-
-interface ScrollToTopHackProps {
-  subjectId: string;
-}
-
-// hack to work around https://github.com/vercel/next.js/issues/63497
-const ScrollToTopHack = ({ subjectId }: ScrollToTopHackProps) => {
-  const pathname = usePathname();
-  const searchParams = useSearchParams();
-
-  useEffect(() => {
-    if (
-      searchParams.get('s') === '1' ||
-      pathname !== `/subjects/${subjectId}/events`
-    ) {
-      return;
-    }
-
-    window.scrollTo({ top: 0 });
-    const newSearchParams = new URLSearchParams(searchParams);
-    newSearchParams.set('s', '1');
-    const searchString = newSearchParams.toString();
-    const delimiter = searchString ? '?' : '';
-    const url = `${pathname}${delimiter}${searchString}`;
-    window.history.replaceState(null, '', url);
-  }, [pathname, searchParams, subjectId]);
-
-  return null;
-};
-
-export default ScrollToTopHack;
diff --git a/app/_components/session-form.tsx b/app/_components/session-form.tsx
index a49bd08f..23799d01 100644
--- a/app/_components/session-form.tsx
+++ b/app/_components/session-form.tsx
@@ -7,8 +7,8 @@ import ModuleFormSection from '@/_components/module-form-section';
 import UnsavedChangesBanner from '@/_components/unsaved-changes-banner';
 import useCachedForm from '@/_hooks/use-cached-form';
 import upsertSession from '@/_mutations/upsert-session';
-import { GetMissionWithSessionsData } from '@/_queries/get-mission-with-sessions';
 import { GetSessionData } from '@/_queries/get-session';
+import { GetTrainingPlanWithSessionsData } from '@/_queries/get-training-plan-with-sessions';
 import { ListInputsBySubjectIdData } from '@/_queries/list-inputs-by-subject-id';
 import { ListSubjectsByTeamIdData } from '@/_queries/list-subjects-by-team-id';
 import { ListTemplatesWithDataData } from '@/_queries/list-templates-with-data';
@@ -41,6 +41,7 @@ import {
   useSensors,
 } from '@dnd-kit/core';
 
+import Tip from '@/_components/tip';
 import {
   SortableContext,
   verticalListSortingStrategy,
@@ -50,7 +51,7 @@ interface SessionFormProps {
   availableInputs: NonNullable<ListInputsBySubjectIdData>;
   availableTemplates: NonNullable<ListTemplatesWithDataData>;
   isDuplicate?: boolean;
-  mission: NonNullable<GetMissionWithSessionsData>;
+  mission: NonNullable<GetTrainingPlanWithSessionsData>;
   order?: number;
   session?: NonNullable<GetSessionData>;
   subjects: NonNullable<ListSubjectsByTeamIdData>;
@@ -146,7 +147,7 @@ const SessionForm = ({
   return (
     <>
       <form
-        className="flex flex-col gap-8 px-4 py-8 sm:px-8"
+        className="flex flex-col gap-8 px-4 pb-8 pt-16 sm:px-8"
         onSubmit={form.handleSubmit((values) =>
           startTransition(async () => {
             values.scheduledFor = values.scheduledFor
@@ -233,14 +234,20 @@ const SessionForm = ({
             </SortableContext>
           </DndContext>
         </ul>
-        <Button
-          className="w-full"
-          colorScheme="transparent"
-          onClick={() => modulesArray.append({ content: '', inputs: [] })}
-        >
-          <PlusIcon className="w-5" />
-          Add module
-        </Button>
+        <div className="flex items-center gap-4">
+          <Tip side="right">
+            Modules break up your session and allow you to capture inputs at
+            different points. You can add as many modules as you need.
+          </Tip>
+          <Button
+            className="w-full"
+            colorScheme="transparent"
+            onClick={() => modulesArray.append({ content: '', inputs: [] })}
+          >
+            <PlusIcon className="w-5" />
+            Add module
+          </Button>
+        </div>
         {form.formState.errors.root && (
           <div className="text-center">
             {form.formState.errors.root.message}
diff --git a/app/_components/session-layout.tsx b/app/_components/session-layout.tsx
index 7642297b..5dcdec03 100644
--- a/app/_components/session-layout.tsx
+++ b/app/_components/session-layout.tsx
@@ -1,6 +1,6 @@
 import ForwardSearchParamsButton from '@/_components/forward-search-params-button';
 import ForwardSearchParamsIconButton from '@/_components/forward-search-params-icon-button';
-import { GetMissionWithSessionsData } from '@/_queries/get-mission-with-sessions';
+import { GetTrainingPlanWithSessionsData } from '@/_queries/get-training-plan-with-sessions';
 import ChevronLeftIcon from '@heroicons/react/24/outline/ChevronLeftIcon';
 import ChevronRightIcon from '@heroicons/react/24/outline/ChevronRightIcon';
 import EyeIcon from '@heroicons/react/24/outline/EyeIcon';
@@ -18,7 +18,7 @@ interface SessionLayoutProps {
   missionId: string;
   order?: string;
   sessionId?: string;
-  sessions: NonNullable<GetMissionWithSessionsData>['sessions'];
+  sessions: NonNullable<GetTrainingPlanWithSessionsData>['sessions'];
   subjectId: string;
 }
 
diff --git a/app/_components/session-menu.tsx b/app/_components/session-menu.tsx
index 3b4ad3d0..5906d458 100644
--- a/app/_components/session-menu.tsx
+++ b/app/_components/session-menu.tsx
@@ -4,7 +4,7 @@ import Alert from '@/_components/alert';
 import DropdownMenu from '@/_components/dropdown-menu';
 import deleteSession from '@/_mutations/delete-session';
 import moveSession from '@/_mutations/move-session';
-import { GetMissionWithSessionsData } from '@/_queries/get-mission-with-sessions';
+import { GetTrainingPlanWithSessionsData } from '@/_queries/get-training-plan-with-sessions';
 import ArrowDownIcon from '@heroicons/react/24/outline/ArrowDownIcon';
 import ArrowUpIcon from '@heroicons/react/24/outline/ArrowUpIcon';
 import DocumentDuplicateIcon from '@heroicons/react/24/outline/DocumentDuplicateIcon';
@@ -18,7 +18,7 @@ interface SessionMenuProps {
   highestPublishedOrder: number;
   missionId: string;
   nextSessionOrder: number;
-  session: NonNullable<GetMissionWithSessionsData>['sessions'][0];
+  session: NonNullable<GetTrainingPlanWithSessionsData>['sessions'][0];
   subjectId: string;
 }
 
diff --git a/app/_components/session-page.tsx b/app/_components/session-page.tsx
index b34cf059..5b631a9b 100644
--- a/app/_components/session-page.tsx
+++ b/app/_components/session-page.tsx
@@ -6,12 +6,12 @@ import PageModalHeader from '@/_components/page-modal-header';
 import SessionLayout from '@/_components/session-layout';
 import ViewAllSessionsButton from '@/_components/view-all-sessions-button';
 import getCurrentUser from '@/_queries/get-current-user';
-import getMissionWithSessions from '@/_queries/get-mission-with-sessions';
-import getPublicMissionWithSessions from '@/_queries/get-public-mission-with-sessions';
 import getPublicSessionWithDetails from '@/_queries/get-public-session-with-details';
 import getPublicSubject from '@/_queries/get-public-subject';
+import getPublicTrainingPlanWithSessions from '@/_queries/get-public-training-plan-with-sessions';
 import getSessionWithDetails from '@/_queries/get-session-with-details';
 import getSubject from '@/_queries/get-subject';
+import getTrainingPlanWithSessions from '@/_queries/get-training-plan-with-sessions';
 import firstIfArray from '@/_utilities/first-if-array';
 import CalendarDaysIcon from '@heroicons/react/24/outline/CalendarDaysIcon';
 
@@ -32,8 +32,8 @@ const SessionPage = async ({
     await Promise.all([
       isPublic ? getPublicSubject(subjectId) : getSubject(subjectId),
       isPublic
-        ? getPublicMissionWithSessions(missionId)
-        : getMissionWithSessions(missionId),
+        ? getPublicTrainingPlanWithSessions(missionId)
+        : getTrainingPlanWithSessions(missionId),
       isPublic
         ? getPublicSessionWithDetails(sessionId)
         : getSessionWithDetails(sessionId),
diff --git a/app/_components/sessions-page.tsx b/app/_components/sessions-page.tsx
index 087169e5..4c66714f 100644
--- a/app/_components/sessions-page.tsx
+++ b/app/_components/sessions-page.tsx
@@ -5,10 +5,10 @@ import Empty from '@/_components/empty';
 import PageModalHeader from '@/_components/page-modal-header';
 import SessionMenu from '@/_components/session-menu';
 import getCurrentUser from '@/_queries/get-current-user';
-import getMissionWithSessionsAndEvents from '@/_queries/get-mission-with-sessions-and-events';
-import getPublicMissionWithSessionsAndEvents from '@/_queries/get-public-mission-with-sessions-and-events';
 import getPublicSubject from '@/_queries/get-public-subject';
+import getPublicTrainingPlanWithSessionsAndEvents from '@/_queries/get-public-training-plan-with-sessions-and-events';
 import getSubject from '@/_queries/get-subject';
+import getTrainingPlanWithSessionsAndEvents from '@/_queries/get-training-plan-with-sessions-and-events';
 import getHighestPublishedOrder from '@/_utilities/get-highest-published-order';
 import ArrowRightIcon from '@heroicons/react/24/outline/ArrowRightIcon';
 import InformationCircleIcon from '@heroicons/react/24/outline/InformationCircleIcon';
@@ -34,8 +34,10 @@ const SessionsPage = async ({
   const isTeamMember = !!user && subject.team_id === user.id;
 
   const { data: mission } = isPublic
-    ? await getPublicMissionWithSessionsAndEvents(missionId)
-    : await getMissionWithSessionsAndEvents(missionId, { draft: isTeamMember });
+    ? await getPublicTrainingPlanWithSessionsAndEvents(missionId)
+    : await getTrainingPlanWithSessionsAndEvents(missionId, {
+        draft: isTeamMember,
+      });
 
   if (!mission) return null;
 
@@ -68,7 +70,7 @@ const SessionsPage = async ({
             scroll={false}
           >
             <PlusIcon className="w-5" />
-            Add session
+            New session
           </Button>
         </div>
       )}
diff --git a/app/_components/subject-events-date-filter.tsx b/app/_components/subject-events-date-filter.tsx
index 0259d877..8f930159 100644
--- a/app/_components/subject-events-date-filter.tsx
+++ b/app/_components/subject-events-date-filter.tsx
@@ -49,11 +49,11 @@ const SubjectEventsDateFilter = () => {
           ) : opDate?.from ? (
             formatDate(opDate.from, { weekday: undefined })
           ) : (
-            'Date range'
+            'Filter by date range'
           )}
         </Button>
       </Popover.Trigger>
-      <Popover.Content align="end" className="my-2" sideOffset={0}>
+      <Popover.Content align="start" className="my-2" sideOffset={0}>
         <Calendar
           defaultMonth={opDate?.to ?? opDate?.from}
           disabled={{ after: new Date() }}
diff --git a/app/_components/subject-events-page.tsx b/app/_components/subject-events-page.tsx
deleted file mode 100644
index f26bfa46..00000000
--- a/app/_components/subject-events-page.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import Empty from '@/_components/empty';
-import TimelineEvents from '@/_components/timeline-events';
-import getCurrentUser from '@/_queries/get-current-user';
-import getPublicSubject from '@/_queries/get-public-subject';
-import getSubject from '@/_queries/get-subject';
-import listEvents from '@/_queries/list-events';
-import listPublicEvents from '@/_queries/list-public-events';
-import formatEventFilters from '@/_utilities/format-event-filters';
-import InformationCircleIcon from '@heroicons/react/24/outline/InformationCircleIcon';
-
-interface SubjectEventsPageProps {
-  from?: string;
-  limit?: string;
-  isPublic?: boolean;
-  subjectId: string;
-  to?: string;
-}
-
-const SubjectEventsPage = async ({
-  from,
-  limit,
-  isPublic,
-  subjectId,
-  to,
-}: SubjectEventsPageProps) => {
-  const f = formatEventFilters({ from, limit, to });
-
-  const [{ data: subject }, { data: events }, user] = await Promise.all([
-    isPublic ? getPublicSubject(subjectId) : getSubject(subjectId),
-    isPublic
-      ? await listPublicEvents(subjectId, f)
-      : await listEvents(subjectId, f),
-    getCurrentUser(),
-  ]);
-
-  if (!subject) return null;
-
-  if (!events?.length) {
-    return (
-      <>
-        <div className="mx-4 mt-4 h-14 border-l-2 border-dashed border-alpha-2" />
-        <Empty className="mt-4">
-          <InformationCircleIcon className="w-7" />
-          No events.
-        </Empty>
-      </>
-    );
-  }
-
-  return (
-    <TimelineEvents
-      events={events}
-      filters={f}
-      isArchived={subject.archived}
-      isPublic={isPublic}
-      isTeamMember={!!user && subject.team_id === user.id}
-      subjectId={subjectId}
-      user={user}
-    />
-  );
-};
-
-export default SubjectEventsPage;
diff --git a/app/_components/subject-form.tsx b/app/_components/subject-form.tsx
index dd7294d3..beed8c18 100644
--- a/app/_components/subject-form.tsx
+++ b/app/_components/subject-form.tsx
@@ -79,7 +79,7 @@ const SubjectForm = ({ subject }: SubjectFormProps) => {
           }
 
           localStorage.setItem('refresh', '1');
-          if (!subject?.id) router.replace(`/subjects/${subjectId}/events`);
+          if (!subject?.id) router.replace(`/subjects/${subjectId}`);
           else router.back();
         }),
       )}
@@ -89,6 +89,7 @@ const SubjectForm = ({ subject }: SubjectFormProps) => {
           label="Name"
           maxLength={49}
           required
+          tooltip="Who or what are you tracking?"
           {...form.register('name')}
         />
         <div className="relative">
@@ -118,8 +119,8 @@ const SubjectForm = ({ subject }: SubjectFormProps) => {
               label="Note"
               tooltip={
                 <>
-                  Add an optional note to be displayed at the top of the
-                  subject&rsquo;s profile.
+                  An optional note displayed at the top of the subject&rsquo;s
+                  profile.
                 </>
               }
               {...field}
@@ -130,7 +131,7 @@ const SubjectForm = ({ subject }: SubjectFormProps) => {
           <div className="flex justify-between">
             <span className="label">Links</span>
             <Tip className="relative -top-1 -mr-[0.2rem]" side="left">
-              Add optional links to be listed at the top of the subject&rsquo;s
+              Optional links displayed at the top of&nbsp;the subject&rsquo;s
               profile.
             </Tip>
           </div>
diff --git a/app/_components/subject-layout.tsx b/app/_components/subject-layout.tsx
deleted file mode 100644
index 61a338a3..00000000
--- a/app/_components/subject-layout.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-import Avatar from '@/_components/avatar';
-import BackIconButton from '@/_components/back-icon-button';
-import Button from '@/_components/button';
-import DirtyHtml from '@/_components/dirty-html';
-import EventTypes from '@/_components/event-types';
-import ForwardSearchParamsButton from '@/_components/forward-search-params-button';
-import Missions from '@/_components/missions';
-import ScrollToTopHack from '@/_components/scroll-to-top-hack';
-import SubjectEventsDateFilter from '@/_components/subject-events-date-filter';
-import SubjectMenu from '@/_components/subject-menu';
-import Tip from '@/_components/tip';
-import getCurrentUser from '@/_queries/get-current-user';
-import getPublicSubject from '@/_queries/get-public-subject';
-import getSubject from '@/_queries/get-subject';
-import { SubjectDataJson } from '@/_types/subject-data-json';
-import ArrowLeftIcon from '@heroicons/react/24/outline/ArrowLeftIcon';
-import ArrowTopRightOnSquareIcon from '@heroicons/react/24/outline/ArrowTopRightOnSquareIcon';
-import Bars3Icon from '@heroicons/react/24/outline/Bars3Icon';
-import PlusIcon from '@heroicons/react/24/outline/PlusIcon';
-import { ReactNode } from 'react';
-import { twMerge } from 'tailwind-merge';
-
-interface SubjectLayoutProps {
-  children: ReactNode;
-  isPublic?: boolean;
-  subjectId: string;
-}
-
-const SubjectLayout = async ({
-  children,
-  isPublic,
-  subjectId,
-}: SubjectLayoutProps) => {
-  const [{ data: subject }, user] = await Promise.all([
-    isPublic ? getPublicSubject(subjectId) : getSubject(subjectId),
-    getCurrentUser(),
-  ]);
-
-  if (!subject) return null;
-  const isTeamMember = !!user && subject.team_id === user.id;
-  const shareOrSubjects = isPublic ? 'share' : 'subjects';
-  const subjectData = subject.data as SubjectDataJson;
-
-  return (
-    <div className="px-4 pb-[calc(100vh-8rem)]">
-      <ScrollToTopHack subjectId={subjectId} />
-      <div className="mt-16 flex h-8 items-center justify-between gap-6">
-        <div className="flex min-w-0 items-center gap-6">
-          {!isPublic && (
-            <BackIconButton
-              icon={<ArrowLeftIcon className="relative -left-[0.16em] w-7" />}
-              label="Back"
-            />
-          )}
-          <h1 className="truncate text-2xl">{subject.name}</h1>
-        </div>
-        {isTeamMember ? (
-          <SubjectMenu
-            contentClassName="mt-0.5"
-            isPublic={isPublic}
-            subject={subject}
-          >
-            <div className="flex gap-2 rounded-sm border border-alpha-3 pl-2 transition-colors hover:bg-alpha-1 active:bg-alpha-1">
-              <Bars3Icon className="w-5" />
-              <Avatar
-                className="-m-px"
-                file={subject.image_uri}
-                id={subject.id}
-              />
-            </div>
-          </SubjectMenu>
-        ) : (
-          <Avatar file={subject.image_uri} id={subject.id} />
-        )}
-      </div>
-      {!isPublic && (
-        <div className="mt-16 space-y-4">
-          {!subject.archived && isTeamMember && (
-            <div className="flex justify-end gap-4">
-              <Tip align="start" side="bottom" tipClassName="space-y-4">
-                <p>
-                  <span className="font-bold text-fg-1">Event types</span>{' '}
-                  define the events that can be recorded at any time.
-                </p>
-                <p>
-                  <span className="font-bold text-fg-1">Training plans</span>{' '}
-                  are long-term behavior modification plans for clients.
-                </p>
-              </Tip>
-              <Button
-                colorScheme="transparent"
-                href={`/subjects/${subjectId}/event-types/create`}
-                scroll={false}
-                size="sm"
-              >
-                <PlusIcon className="w-5" />
-                Event type
-              </Button>
-              <Button
-                colorScheme="transparent"
-                href={`/subjects/${subjectId}/training-plans/create`}
-                scroll={false}
-                size="sm"
-              >
-                <PlusIcon className="w-5" />
-                Training plan
-              </Button>
-            </div>
-          )}
-          <div>
-            {subjectData?.banner && (
-              <DirtyHtml
-                className={twMerge(
-                  'rounded border border-alpha-2 px-4 py-2 text-fg-4',
-                  subjectData?.links?.length && 'rounded-b-none border-b-0',
-                )}
-              >
-                {subjectData?.banner}
-              </DirtyHtml>
-            )}
-            {!!subjectData?.links?.length && (
-              <nav>
-                <ul>
-                  {subjectData.links.map((link) => (
-                    <li className="group" key={link.url}>
-                      <Button
-                        className={twMerge(
-                          'w-full justify-between rounded-none border-b-0 pr-3 group-first:rounded-t group-last:rounded-b group-last:border-b',
-                          subjectData?.banner && 'group-first:rounded-t-none',
-                        )}
-                        colorScheme="transparent"
-                        href={link.url}
-                        target="_blank"
-                      >
-                        {link.label}
-                        <ArrowTopRightOnSquareIcon className="w-5" />
-                      </Button>
-                    </li>
-                  ))}
-                </ul>
-              </nav>
-            )}
-          </div>
-          {!subject.archived && (
-            <>
-              <Missions isTeamMember={isTeamMember} subjectId={subjectId} />
-              <EventTypes isTeamMember={isTeamMember} subjectId={subjectId} />
-            </>
-          )}
-        </div>
-      )}
-      <div className="mt-16 flex h-8 items-center justify-between">
-        <div className="flex divide-x divide-alpha-3 rounded-sm border border-alpha-3">
-          <ForwardSearchParamsButton
-            activeClassName="text-fg-2 bg-alpha-1"
-            colorScheme="transparent"
-            className="rounded-r-none border-0"
-            href={`/${shareOrSubjects}/${subjectId}/events`}
-            replace
-            scroll={false}
-            size="sm"
-          >
-            Events
-          </ForwardSearchParamsButton>
-          <ForwardSearchParamsButton
-            activeClassName="text-fg-2 bg-alpha-1"
-            colorScheme="transparent"
-            className="rounded-l-none border-0"
-            href={`/${shareOrSubjects}/${subjectId}/insights`}
-            replace
-            scroll={false}
-            size="sm"
-          >
-            Insights
-          </ForwardSearchParamsButton>
-        </div>
-        <SubjectEventsDateFilter />
-      </div>
-      {children}
-    </div>
-  );
-};
-
-export default SubjectLayout;
diff --git a/app/_components/subject-list.tsx b/app/_components/subject-list.tsx
index 3b367794..aaa37350 100644
--- a/app/_components/subject-list.tsx
+++ b/app/_components/subject-list.tsx
@@ -24,7 +24,7 @@ const SubjectList = async ({
           >
             <Button
               className="m-0 w-full gap-4 px-4 py-3 pr-0 leading-snug"
-              href={`/subjects/${subject.id}/events`}
+              href={`/subjects/${subject.id}`}
               variant="link"
             >
               <Avatar
@@ -53,7 +53,7 @@ const SubjectList = async ({
           <li key={subject.id}>
             <Button
               className="m-0 w-full gap-6 px-4 py-3 leading-snug hover:bg-alpha-1 active:bg-alpha-1"
-              href={`/subjects/${subject.id}/events`}
+              href={`/subjects/${subject.id}`}
               variant="link"
             >
               <Avatar
diff --git a/app/_components/subject-menu.tsx b/app/_components/subject-menu.tsx
index 79cca64e..3cafea94 100644
--- a/app/_components/subject-menu.tsx
+++ b/app/_components/subject-menu.tsx
@@ -26,14 +26,12 @@ import { ReactNode, useOptimistic, useRef, useTransition } from 'react';
 
 interface SubjectMenuProps {
   children: ReactNode;
-  isPublic?: boolean;
   contentClassName?: string;
   subject: NonNullable<GetSubjectData> | NonNullable<ListSubjectsData>[0];
 }
 
 const SubjectMenu = ({
   children,
-  isPublic,
   contentClassName,
   subject,
 }: SubjectMenuProps) => {
@@ -49,7 +47,6 @@ const SubjectMenu = ({
   const [shareModal, toggleShareModal] = useToggle(false);
   const clientLinkTimeoutRef = useRef<NodeJS.Timeout>();
   const publicLinkTimeoutRef = useRef<NodeJS.Timeout>();
-  const shareOrSubjects = isPublic ? 'share' : 'subjects';
 
   return (
     <>
@@ -121,7 +118,7 @@ const SubjectMenu = ({
                 const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
 
                 const r = await fetch(
-                  `/${shareOrSubjects}/${subject.id}/events.csv?tz=${tz}`,
+                  `/subjects/${subject.id}/events.csv?tz=${tz}`,
                 );
 
                 const blob = await r.blob();
@@ -208,7 +205,7 @@ const SubjectMenu = ({
                   <Button
                     className="w-full justify-between"
                     colorScheme="transparent"
-                    href={`/share/${subject.id}/events`}
+                    href={`/share/${subject.id}`}
                     target="_blank"
                   >
                     View public profile
@@ -221,7 +218,7 @@ const SubjectMenu = ({
                       clearTimeout(publicLinkTimeoutRef.current);
 
                       void copyToClipboard(
-                        `${location.origin}/share/${subject.id}/events`,
+                        `${location.origin}/share/${subject.id}`,
                       );
 
                       publicLinkTimeoutRef.current = setTimeout(
diff --git a/app/_components/subject-page.tsx b/app/_components/subject-page.tsx
new file mode 100644
index 00000000..8e554207
--- /dev/null
+++ b/app/_components/subject-page.tsx
@@ -0,0 +1,201 @@
+import Avatar from '@/_components/avatar';
+import BackIconButton from '@/_components/back-icon-button';
+import Button from '@/_components/button';
+import DirtyHtml from '@/_components/dirty-html';
+import Empty from '@/_components/empty';
+import EventTypes from '@/_components/event-types';
+import ForwardSearchParamsButton from '@/_components/forward-search-params-button';
+import SubjectEventsDateFilter from '@/_components/subject-events-date-filter';
+import SubjectMenu from '@/_components/subject-menu';
+import TimelineEvents from '@/_components/timeline-events';
+import Tip from '@/_components/tip';
+import TrainingPlans from '@/_components/training-plans';
+import getCurrentUser from '@/_queries/get-current-user';
+import getPublicSubject from '@/_queries/get-public-subject';
+import getSubject from '@/_queries/get-subject';
+import listEvents from '@/_queries/list-events';
+import listPublicEvents from '@/_queries/list-public-events';
+import { SubjectDataJson } from '@/_types/subject-data-json';
+import formatEventFilters from '@/_utilities/format-event-filters';
+import { ChartBarSquareIcon } from '@heroicons/react/24/outline';
+import ArrowLeftIcon from '@heroicons/react/24/outline/ArrowLeftIcon';
+import ArrowTopRightOnSquareIcon from '@heroicons/react/24/outline/ArrowTopRightOnSquareIcon';
+import Bars3Icon from '@heroicons/react/24/outline/Bars3Icon';
+import InformationCircleIcon from '@heroicons/react/24/outline/InformationCircleIcon';
+import PlusIcon from '@heroicons/react/24/outline/PlusIcon';
+import { twMerge } from 'tailwind-merge';
+
+interface SubjectPageProps {
+  from?: string;
+  limit?: string;
+  isPublic?: boolean;
+  subjectId: string;
+  to?: string;
+}
+
+const SubjectPage = async ({
+  from,
+  limit,
+  isPublic,
+  subjectId,
+  to,
+}: SubjectPageProps) => {
+  const f = formatEventFilters({ from, limit, to });
+
+  const [{ data: subject }, { data: events }, user] = await Promise.all([
+    isPublic ? getPublicSubject(subjectId) : getSubject(subjectId),
+    isPublic
+      ? await listPublicEvents(subjectId, f)
+      : await listEvents(subjectId, f),
+    getCurrentUser(),
+  ]);
+
+  if (!subject) return null;
+  const isTeamMember = !!user && subject.team_id === user.id;
+  const shareOrSubjects = isPublic ? 'share' : 'subjects';
+  const subjectData = subject.data as SubjectDataJson;
+
+  return (
+    <div className="px-4">
+      <div className="mt-16 flex h-8 items-center justify-between gap-6">
+        <div className="flex min-w-0 items-center gap-6">
+          {!isPublic && (
+            <BackIconButton
+              icon={<ArrowLeftIcon className="relative -left-[0.16em] w-7" />}
+              label="Back"
+            />
+          )}
+          <h1 className="truncate text-2xl">{subject.name}</h1>
+        </div>
+        {isTeamMember && !isPublic ? (
+          <SubjectMenu contentClassName="mt-0.5" subject={subject}>
+            <div className="flex gap-2 rounded-sm border border-alpha-3 pl-2 transition-colors hover:bg-alpha-1 active:bg-alpha-1">
+              <Bars3Icon className="w-5" />
+              <Avatar
+                className="-m-px"
+                file={subject.image_uri}
+                id={subject.id}
+              />
+            </div>
+          </SubjectMenu>
+        ) : (
+          <Avatar file={subject.image_uri} id={subject.id} />
+        )}
+      </div>
+      {!isPublic && (
+        <div className="mt-16 space-y-4">
+          {!subject.archived && isTeamMember && (
+            <div className="flex justify-end gap-4">
+              <Tip align="start" side="bottom" tipClassName="space-y-4">
+                <p>
+                  Event types define the individual events that you want to
+                  track.
+                </p>
+                <p>
+                  Training plans are structured, long-term modification
+                  programs.
+                </p>
+              </Tip>
+              <Button
+                colorScheme="transparent"
+                href={`/subjects/${subjectId}/event-types/create`}
+                scroll={false}
+                size="sm"
+              >
+                <PlusIcon className="-ml-0.5 w-5" />
+                Event type
+              </Button>
+              <Button
+                colorScheme="transparent"
+                href={`/subjects/${subjectId}/training-plans/create`}
+                scroll={false}
+                size="sm"
+              >
+                <PlusIcon className="-ml-0.5 w-5" />
+                Training plan
+              </Button>
+            </div>
+          )}
+          {(subjectData?.banner || !!subjectData?.links?.length) && (
+            <div>
+              {subjectData?.banner && (
+                <DirtyHtml
+                  className={twMerge(
+                    'rounded border border-alpha-2 px-4 py-2 text-fg-4',
+                    subjectData?.links?.length && 'rounded-b-none border-b-0',
+                  )}
+                >
+                  {subjectData?.banner}
+                </DirtyHtml>
+              )}
+              {!!subjectData?.links?.length && (
+                <nav>
+                  <ul>
+                    {subjectData.links.map((link) => (
+                      <li className="group" key={link.url}>
+                        <Button
+                          className={twMerge(
+                            'w-full justify-between rounded-none border-b-0 pr-3 group-first:rounded-t group-last:rounded-b group-last:border-b',
+                            subjectData?.banner && 'group-first:rounded-t-none',
+                          )}
+                          colorScheme="transparent"
+                          href={link.url}
+                          target="_blank"
+                        >
+                          {link.label}
+                          <ArrowTopRightOnSquareIcon className="w-5" />
+                        </Button>
+                      </li>
+                    ))}
+                  </ul>
+                </nav>
+              )}
+            </div>
+          )}
+          {!subject.archived && (
+            <>
+              <TrainingPlans
+                isTeamMember={isTeamMember}
+                subjectId={subjectId}
+              />
+              <EventTypes isTeamMember={isTeamMember} subjectId={subjectId} />
+            </>
+          )}
+        </div>
+      )}
+      <div className="mt-16 flex h-8 items-center justify-between">
+        <SubjectEventsDateFilter />
+        <ForwardSearchParamsButton
+          colorScheme="transparent"
+          href={`/${shareOrSubjects}/${subjectId}/insights`}
+          scroll={false}
+          size="sm"
+        >
+          <ChartBarSquareIcon className="-ml-0.5 w-5" />
+          Insights
+        </ForwardSearchParamsButton>
+      </div>
+      {!!events?.length ? (
+        <TimelineEvents
+          events={events}
+          filters={f}
+          isArchived={subject.archived}
+          isPublic={isPublic}
+          isTeamMember={!!user && subject.team_id === user.id}
+          subjectId={subjectId}
+          user={user}
+        />
+      ) : (
+        <>
+          <div className="mx-4 mt-4 h-14 border-l-2 border-dashed border-alpha-2" />
+          <Empty className="mt-4">
+            <InformationCircleIcon className="w-7" />
+            No events.
+          </Empty>
+        </>
+      )}
+    </div>
+  );
+};
+
+export default SubjectPage;
diff --git a/app/_components/mission-form.tsx b/app/_components/training-plan-form.tsx
similarity index 75%
rename from app/_components/mission-form.tsx
rename to app/_components/training-plan-form.tsx
index 686ebc7c..7aee1286 100644
--- a/app/_components/mission-form.tsx
+++ b/app/_components/training-plan-form.tsx
@@ -3,25 +3,25 @@
 import BackButton from '@/_components/back-button';
 import Button from '@/_components/button';
 import Input from '@/_components/input';
-import upsertMission from '@/_mutations/upsert-mission';
-import { GetMissionData } from '@/_queries/get-mission';
+import upsertTrainingPlan from '@/_mutations/upsert-training-plan';
+import { GetTrainingPlanData } from '@/_queries/get-training-plan';
 import { useRouter } from 'next/navigation';
 import { useTransition } from 'react';
 import { useForm } from 'react-hook-form';
 
-interface MissionFormProps {
-  mission?: NonNullable<GetMissionData>;
+interface TrainingPlanFormProps {
+  mission?: NonNullable<GetTrainingPlanData>;
   subjectId: string;
 }
 
-interface MissionFormValues {
+interface TrainingPlanFormValues {
   name: string;
 }
 
-const MissionForm = ({ mission, subjectId }: MissionFormProps) => {
+const TrainingPlanForm = ({ mission, subjectId }: TrainingPlanFormProps) => {
   const [isTransitioning, startTransition] = useTransition();
 
-  const form = useForm<MissionFormValues>({
+  const form = useForm<TrainingPlanFormValues>({
     defaultValues: { name: mission?.name },
   });
 
@@ -31,7 +31,7 @@ const MissionForm = ({ mission, subjectId }: MissionFormProps) => {
     <form
       onSubmit={form.handleSubmit((values) =>
         startTransition(async () => {
-          const res = await upsertMission(
+          const res = await upsertTrainingPlan(
             { missionId: mission?.id, subjectId },
             values,
           );
@@ -58,6 +58,7 @@ const MissionForm = ({ mission, subjectId }: MissionFormProps) => {
           label="Name"
           maxLength={49}
           required
+          tooltip="Succinctly describe the goal or purpose of the training plan."
           {...form.register('name')}
         />
       </div>
@@ -83,5 +84,5 @@ const MissionForm = ({ mission, subjectId }: MissionFormProps) => {
   );
 };
 
-export type { MissionFormValues };
-export default MissionForm;
+export type { TrainingPlanFormValues };
+export default TrainingPlanForm;
diff --git a/app/_components/mission-menu.tsx b/app/_components/training-plan-menu.tsx
similarity index 85%
rename from app/_components/mission-menu.tsx
rename to app/_components/training-plan-menu.tsx
index e4a5f05c..51282a86 100644
--- a/app/_components/mission-menu.tsx
+++ b/app/_components/training-plan-menu.tsx
@@ -2,18 +2,18 @@
 
 import Alert from '@/_components/alert';
 import DropdownMenu from '@/_components/dropdown-menu';
-import deleteMission from '@/_mutations/delete-mission';
+import deleteTrainingPlan from '@/_mutations/delete-training-plan';
 import EllipsisVerticalIcon from '@heroicons/react/24/outline/EllipsisVerticalIcon';
 import PencilIcon from '@heroicons/react/24/outline/PencilIcon';
 import TrashIcon from '@heroicons/react/24/outline/TrashIcon';
 import { useToggle } from '@uidotdev/usehooks';
 
-interface MissionMenuProps {
+interface TrainingPlanMenuProps {
   missionId: string;
   subjectId: string;
 }
 
-const MissionMenu = ({ missionId, subjectId }: MissionMenuProps) => {
+const TrainingPlanMenu = ({ missionId, subjectId }: TrainingPlanMenuProps) => {
   const [deleteAlert, toggleDeleteAlert] = useToggle(false);
 
   return (
@@ -46,10 +46,10 @@ const MissionMenu = ({ missionId, subjectId }: MissionMenuProps) => {
         isConfirmingText="Deleting…"
         isOpen={deleteAlert}
         onClose={toggleDeleteAlert}
-        onConfirm={() => deleteMission(missionId)}
+        onConfirm={() => deleteTrainingPlan(missionId)}
       />
     </>
   );
 };
 
-export default MissionMenu;
+export default TrainingPlanMenu;
diff --git a/app/_components/missions.tsx b/app/_components/training-plans.tsx
similarity index 82%
rename from app/_components/missions.tsx
rename to app/_components/training-plans.tsx
index fce66340..5fc3e8f8 100644
--- a/app/_components/missions.tsx
+++ b/app/_components/training-plans.tsx
@@ -1,6 +1,6 @@
 import Button from '@/_components/button';
-import MissionMenu from '@/_components/mission-menu';
-import listSubjectMissions from '@/_queries/list-subject-missions';
+import TrainingPlanMenu from '@/_components/training-plan-menu';
+import listSubjectTrainingPlans from '@/_queries/list-subject-training-plans';
 import ArrowUpRightIcon from '@heroicons/react/24/outline/ArrowUpRightIcon';
 import { ReactElement } from 'react';
 import { twMerge } from 'tailwind-merge';
@@ -10,8 +10,8 @@ interface MissionsProps {
   subjectId: string;
 }
 
-const Missions = async ({ isTeamMember, subjectId }: MissionsProps) => {
-  const { data: missions } = await listSubjectMissions(subjectId);
+const TrainingPlans = async ({ isTeamMember, subjectId }: MissionsProps) => {
+  const { data: missions } = await listSubjectTrainingPlans(subjectId);
   if (!missions) return null;
 
   const listItems = missions.reduce((acc, mission) => {
@@ -53,7 +53,7 @@ const Missions = async ({ isTeamMember, subjectId }: MissionsProps) => {
           )}
         </Button>
         {isTeamMember && (
-          <MissionMenu missionId={mission.id} subjectId={subjectId} />
+          <TrainingPlanMenu missionId={mission.id} subjectId={subjectId} />
         )}
       </li>,
     );
@@ -70,4 +70,4 @@ const Missions = async ({ isTeamMember, subjectId }: MissionsProps) => {
   );
 };
 
-export default Missions;
+export default TrainingPlans;
diff --git a/app/_mutations/delete-mission.ts b/app/_mutations/delete-training-plan.ts
similarity index 75%
rename from app/_mutations/delete-mission.ts
rename to app/_mutations/delete-training-plan.ts
index 13ead4bc..5686c09e 100644
--- a/app/_mutations/delete-mission.ts
+++ b/app/_mutations/delete-training-plan.ts
@@ -3,9 +3,9 @@
 import createServerSupabaseClient from '@/_utilities/create-server-supabase-client';
 import { revalidatePath } from 'next/cache';
 
-const deleteMission = async (id: string) => {
+const deleteTrainingPlan = async (id: string) => {
   await createServerSupabaseClient().from('missions').delete().eq('id', id);
   revalidatePath('/', 'layout');
 };
 
-export default deleteMission;
+export default deleteTrainingPlan;
diff --git a/app/_mutations/upsert-insight.ts b/app/_mutations/upsert-insight.ts
index 9f8a3ba2..b249eded 100644
--- a/app/_mutations/upsert-insight.ts
+++ b/app/_mutations/upsert-insight.ts
@@ -2,6 +2,7 @@
 
 import { InsightFormValues } from '@/_components/insight-form';
 import createServerSupabaseClient from '@/_utilities/create-server-supabase-client';
+import { revalidatePath } from 'next/cache';
 
 const upsertInsight = async (
   context: { insightId?: string; subjectId: string },
@@ -15,6 +16,7 @@ const upsertInsight = async (
   });
 
   if (error) return { error: error.message };
+  revalidatePath('/', 'layout');
 };
 
 export default upsertInsight;
diff --git a/app/_mutations/upsert-mission.ts b/app/_mutations/upsert-training-plan.ts
similarity index 74%
rename from app/_mutations/upsert-mission.ts
rename to app/_mutations/upsert-training-plan.ts
index 8b3b1648..08241386 100644
--- a/app/_mutations/upsert-mission.ts
+++ b/app/_mutations/upsert-training-plan.ts
@@ -1,11 +1,11 @@
 'use server';
 
-import { MissionFormValues } from '@/_components/mission-form';
+import { TrainingPlanFormValues } from '@/_components/training-plan-form';
 import createServerSupabaseClient from '@/_utilities/create-server-supabase-client';
 
-const upsertMission = async (
+const upsertTrainingPlan = async (
   context: { missionId?: string; subjectId: string },
-  data: MissionFormValues,
+  data: TrainingPlanFormValues,
 ) => {
   const supabase = createServerSupabaseClient();
 
@@ -23,4 +23,4 @@ const upsertMission = async (
   return { data: mission };
 };
 
-export default upsertMission;
+export default upsertTrainingPlan;
diff --git a/app/_queries/get-mission.ts b/app/_queries/get-mission.ts
deleted file mode 100644
index 0af7b285..00000000
--- a/app/_queries/get-mission.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import createServerSupabaseClient from '@/_utilities/create-server-supabase-client';
-
-const getMission = (missionId: string) =>
-  createServerSupabaseClient()
-    .from('missions')
-    .select('id, name')
-    .eq('id', missionId)
-    .single();
-
-export type GetMissionData = Awaited<ReturnType<typeof getMission>>['data'];
-
-export default getMission;
diff --git a/app/_queries/get-public-mission-with-sessions-and-events.ts b/app/_queries/get-public-mission-with-sessions-and-events.ts
deleted file mode 100644
index 2e917635..00000000
--- a/app/_queries/get-public-mission-with-sessions-and-events.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import getMissionWithSessionsAndEvents from '@/_queries/get-mission-with-sessions-and-events';
-import createServerSupabaseClient from '@/_utilities/create-server-supabase-client';
-
-const getPublicMissionWithSessionsAndEvents = (missionId: string) =>
-  createServerSupabaseClient().rpc(
-    'get_public_mission_with_sessions_and_events',
-    { public_mission_id: missionId },
-  ) as ReturnType<typeof getMissionWithSessionsAndEvents>;
-
-export default getPublicMissionWithSessionsAndEvents;
diff --git a/app/_queries/get-public-mission-with-sessions.ts b/app/_queries/get-public-mission-with-sessions.ts
deleted file mode 100644
index 85b1769b..00000000
--- a/app/_queries/get-public-mission-with-sessions.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import getMissionWithSessions from '@/_queries/get-mission-with-sessions';
-import createServerSupabaseClient from '@/_utilities/create-server-supabase-client';
-
-const getPublicMissionWithSessions = (missionId: string) =>
-  createServerSupabaseClient().rpc('get_public_mission_with_sessions', {
-    public_mission_id: missionId,
-  }) as ReturnType<typeof getMissionWithSessions>;
-
-export default getPublicMissionWithSessions;
diff --git a/app/_queries/get-public-training-plan-with-sessions-and-events.ts b/app/_queries/get-public-training-plan-with-sessions-and-events.ts
new file mode 100644
index 00000000..e87dbe26
--- /dev/null
+++ b/app/_queries/get-public-training-plan-with-sessions-and-events.ts
@@ -0,0 +1,10 @@
+import getTrainingPlanWithSessionsAndEvents from '@/_queries/get-training-plan-with-sessions-and-events';
+import createServerSupabaseClient from '@/_utilities/create-server-supabase-client';
+
+const getPublicTrainingPlanWithSessionsAndEvents = (trainingPlanId: string) =>
+  createServerSupabaseClient().rpc(
+    'get_public_mission_with_sessions_and_events',
+    { public_mission_id: trainingPlanId },
+  ) as ReturnType<typeof getTrainingPlanWithSessionsAndEvents>;
+
+export default getPublicTrainingPlanWithSessionsAndEvents;
diff --git a/app/_queries/get-public-training-plan-with-sessions.ts b/app/_queries/get-public-training-plan-with-sessions.ts
new file mode 100644
index 00000000..23cd6098
--- /dev/null
+++ b/app/_queries/get-public-training-plan-with-sessions.ts
@@ -0,0 +1,9 @@
+import getTrainingPlanWithSessions from '@/_queries/get-training-plan-with-sessions';
+import createServerSupabaseClient from '@/_utilities/create-server-supabase-client';
+
+const getPublicTrainingPlanWithSessions = (trainingPlanId: string) =>
+  createServerSupabaseClient().rpc('get_public_mission_with_sessions', {
+    public_mission_id: trainingPlanId,
+  }) as ReturnType<typeof getTrainingPlanWithSessions>;
+
+export default getPublicTrainingPlanWithSessions;
diff --git a/app/_queries/get-mission-with-sessions-and-events.ts b/app/_queries/get-training-plan-with-sessions-and-events.ts
similarity index 70%
rename from app/_queries/get-mission-with-sessions-and-events.ts
rename to app/_queries/get-training-plan-with-sessions-and-events.ts
index 64709dc7..db145c94 100644
--- a/app/_queries/get-mission-with-sessions-and-events.ts
+++ b/app/_queries/get-training-plan-with-sessions-and-events.ts
@@ -1,7 +1,7 @@
 import createServerSupabaseClient from '@/_utilities/create-server-supabase-client';
 
-const getMissionWithSessionsAndEvents = (
-  missionId: string,
+const getTrainingPlanWithSessionsAndEvents = (
+  trainingPlanId: string,
   { draft } = { draft: false },
 ) =>
   createServerSupabaseClient()
@@ -22,15 +22,15 @@ const getMissionWithSessionsAndEvents = (
         title
       )`,
     )
-    .eq('id', missionId)
+    .eq('id', trainingPlanId)
     .order('order', { referencedTable: 'sessions' })
     .not('sessions.draft', 'is', draft ? null : true)
     .order('draft', { ascending: false, referencedTable: 'sessions' })
     .eq('sessions.modules.archived', false)
     .single();
 
-export type GetMissionWithSessionsAndEventsData = Awaited<
-  ReturnType<typeof getMissionWithSessionsAndEvents>
+export type GetTrainingPlanWithSessionsAndEventsData = Awaited<
+  ReturnType<typeof getTrainingPlanWithSessionsAndEvents>
 >['data'];
 
-export default getMissionWithSessionsAndEvents;
+export default getTrainingPlanWithSessionsAndEvents;
diff --git a/app/_queries/get-mission-with-sessions.ts b/app/_queries/get-training-plan-with-sessions.ts
similarity index 65%
rename from app/_queries/get-mission-with-sessions.ts
rename to app/_queries/get-training-plan-with-sessions.ts
index e2fa3a88..f05fe767 100644
--- a/app/_queries/get-mission-with-sessions.ts
+++ b/app/_queries/get-training-plan-with-sessions.ts
@@ -1,20 +1,20 @@
 import createServerSupabaseClient from '@/_utilities/create-server-supabase-client';
 
-const getMissionWithSessions = (
-  missionId: string,
+const getTrainingPlanWithSessions = (
+  trainingPlanId: string,
   { draft } = { draft: false },
 ) =>
   createServerSupabaseClient()
     .from('missions')
     .select('id, name, sessions(draft, id, order, scheduled_for, title)')
-    .eq('id', missionId)
+    .eq('id', trainingPlanId)
     .order('order', { referencedTable: 'sessions' })
     .not('sessions.draft', 'is', draft ? null : true)
     .order('draft', { ascending: false, referencedTable: 'sessions' })
     .single();
 
-export type GetMissionWithSessionsData = Awaited<
-  ReturnType<typeof getMissionWithSessions>
+export type GetTrainingPlanWithSessionsData = Awaited<
+  ReturnType<typeof getTrainingPlanWithSessions>
 >['data'];
 
-export default getMissionWithSessions;
+export default getTrainingPlanWithSessions;
diff --git a/app/_queries/get-training-plan.ts b/app/_queries/get-training-plan.ts
new file mode 100644
index 00000000..97349023
--- /dev/null
+++ b/app/_queries/get-training-plan.ts
@@ -0,0 +1,14 @@
+import createServerSupabaseClient from '@/_utilities/create-server-supabase-client';
+
+const getTrainingPlan = (trainingPlanId: string) =>
+  createServerSupabaseClient()
+    .from('missions')
+    .select('id, name')
+    .eq('id', trainingPlanId)
+    .single();
+
+export type GetTrainingPlanData = Awaited<
+  ReturnType<typeof getTrainingPlan>
+>['data'];
+
+export default getTrainingPlan;
diff --git a/app/_queries/list-subject-missions.ts b/app/_queries/list-subject-training-plans.ts
similarity index 74%
rename from app/_queries/list-subject-missions.ts
rename to app/_queries/list-subject-training-plans.ts
index 9d9b7f72..c3ff1385 100644
--- a/app/_queries/list-subject-missions.ts
+++ b/app/_queries/list-subject-training-plans.ts
@@ -1,6 +1,6 @@
 import createServerSupabaseClient from '@/_utilities/create-server-supabase-client';
 
-const listSubjectMissions = (subjectId: string) =>
+const listSubjectTrainingPlans = (subjectId: string) =>
   createServerSupabaseClient()
     .from('missions')
     .select(
@@ -16,8 +16,8 @@ const listSubjectMissions = (subjectId: string) =>
     })
     .eq('sessions.modules.archived', false);
 
-export type ListSubjectMissionsData = Awaited<
-  ReturnType<typeof listSubjectMissions>
+export type ListSubjectTrainingPlansData = Awaited<
+  ReturnType<typeof listSubjectTrainingPlans>
 >['data'];
 
-export default listSubjectMissions;
+export default listSubjectTrainingPlans;