diff --git a/app/_components/account-email-form.tsx b/app/_components/account-email-form.tsx
index b9fd4af7..b0ac9fb5 100644
--- a/app/_components/account-email-form.tsx
+++ b/app/_components/account-email-form.tsx
@@ -28,6 +28,7 @@ const AccountEmailForm = ({ user }: AccountEmailFormProps) => {
 
   return (
     <form
+      className="flex flex-col gap-8 px-4 pb-8 pt-6 sm:px-8"
       onSubmit={form.handleSubmit((values) =>
         startTransition(async () => {
           const supabase = createBrowserSupabaseClient();
@@ -47,20 +48,16 @@ const AccountEmailForm = ({ user }: AccountEmailFormProps) => {
         }),
       )}
     >
-      <div className="px-4 pb-8 pt-6 sm:px-8">
-        <Input
-          label="Email address"
-          required
-          type="email"
-          {...form.register('email')}
-        />
-      </div>
+      <Input
+        label="Email address"
+        required
+        type="email"
+        {...form.register('email')}
+      />
       {form.formState.errors.root && (
-        <div className="px-4 py-8 text-center sm:px-8">
-          {form.formState.errors.root.message}
-        </div>
+        <div className="text-center">{form.formState.errors.root.message}</div>
       )}
-      <div className="flex gap-4 px-4 py-8 sm:px-8">
+      <div className="flex gap-4 pt-8">
         <BackButton className="w-full" colorScheme="transparent">
           Close
         </BackButton>
diff --git a/app/_components/account-password-form.tsx b/app/_components/account-password-form.tsx
index f2703c1e..e44dd812 100644
--- a/app/_components/account-password-form.tsx
+++ b/app/_components/account-password-form.tsx
@@ -23,6 +23,7 @@ const AccountPasswordForm = () => {
 
   return (
     <form
+      className="flex flex-col gap-8 px-4 pb-8 pt-6 sm:px-8"
       onSubmit={form.handleSubmit((values) =>
         startTransition(async () => {
           const supabase = createBrowserSupabaseClient();
@@ -44,21 +45,17 @@ const AccountPasswordForm = () => {
         }),
       )}
     >
-      <div className="px-4 pb-8 pt-6 sm:px-8">
-        <Input
-          label="New password"
-          minLength={6}
-          placeholder="••••••••••••"
-          type="password"
-          {...form.register('password')}
-        />
-      </div>
+      <Input
+        label="New password"
+        minLength={6}
+        placeholder="••••••••••••"
+        type="password"
+        {...form.register('password')}
+      />
       {form.formState.errors.root && (
-        <div className="px-4 py-8 text-center sm:px-8">
-          {form.formState.errors.root.message}
-        </div>
+        <div className="text-center">{form.formState.errors.root.message}</div>
       )}
-      <div className="flex gap-4 px-4 py-8 sm:px-8">
+      <div className="flex gap-4 pt-8">
         <BackButton className="w-full" colorScheme="transparent">
           Close
         </BackButton>
diff --git a/app/_components/account-profile-form.tsx b/app/_components/account-profile-form.tsx
index 7ccb0a76..889c45fa 100644
--- a/app/_components/account-profile-form.tsx
+++ b/app/_components/account-profile-form.tsx
@@ -35,6 +35,7 @@ const AccountProfileForm = ({ user }: AccountProfileFormProps) => {
 
   return (
     <form
+      className="flex flex-col gap-8 px-4 pb-8 pt-6 sm:px-8"
       onSubmit={form.handleSubmit((values) =>
         startTransition(async () => {
           const supabase = createBrowserSupabaseClient();
@@ -71,37 +72,33 @@ const AccountProfileForm = ({ user }: AccountProfileFormProps) => {
         }),
       )}
     >
-      <div className="flex flex-col gap-8 px-4 pb-8 pt-6 sm:px-8">
-        <div className="flex gap-6">
-          <Input label="First name" required {...form.register('firstName')} />
-          <Input label="Last name" required {...form.register('lastName')} />
-        </div>
-        <div className="relative">
-          <label className="group">
-            <span className="label">Profile image</span>
-            <AvatarDropzone
-              file={form.watch('avatar')}
-              id={user.id}
-              onDrop={(files) => form.setValue('avatar', files[0])}
-            />
-          </label>
-          {form.watch('avatar') && (
-            <Button
-              className="absolute right-2 top-0"
-              onClick={() => form.setValue('avatar', null)}
-              variant="link"
-            >
-              Remove image
-            </Button>
-          )}
-        </div>
+      <div className="flex gap-6">
+        <Input label="First name" required {...form.register('firstName')} />
+        <Input label="Last name" required {...form.register('lastName')} />
+      </div>
+      <div className="relative">
+        <label className="group">
+          <span className="label">Profile image</span>
+          <AvatarDropzone
+            file={form.watch('avatar')}
+            id={user.id}
+            onDrop={(files) => form.setValue('avatar', files[0])}
+          />
+        </label>
+        {form.watch('avatar') && (
+          <Button
+            className="absolute right-2 top-0"
+            onClick={() => form.setValue('avatar', null)}
+            variant="link"
+          >
+            Remove image
+          </Button>
+        )}
       </div>
       {form.formState.errors.root && (
-        <div className="px-4 py-8 text-center sm:px-8">
-          {form.formState.errors.root.message}
-        </div>
+        <div className="text-center">{form.formState.errors.root.message}</div>
       )}
-      <div className="flex gap-4 px-4 py-8 sm:px-8">
+      <div className="flex gap-4 pt-8">
         <BackButton className="w-full" colorScheme="transparent">
           Close
         </BackButton>
diff --git a/app/_components/change-password-form.tsx b/app/_components/change-password-form.tsx
index 208d352f..cec779c7 100644
--- a/app/_components/change-password-form.tsx
+++ b/app/_components/change-password-form.tsx
@@ -9,7 +9,7 @@ const ChangePasswordForm = () => {
   const [state, action] = useActionState(updatePassword, null);
 
   return (
-    <form action={action} className="flex flex-col gap-6">
+    <form action={action} className="flex flex-col gap-8">
       <Input
         label="New password"
         minLength={6}
diff --git a/app/_components/event-form.tsx b/app/_components/event-form.tsx
index 6ed70803..5687ace4 100644
--- a/app/_components/event-form.tsx
+++ b/app/_components/event-form.tsx
@@ -139,7 +139,7 @@ const EventForm = ({
   return (
     <form
       action={() => {}}
-      className={twMerge('flex flex-col gap-6 px-4 sm:px-8', className)}
+      className={twMerge('flex flex-col gap-8 px-4 sm:px-8', className)}
       onSubmit={form.handleSubmit((values) =>
         startTransition(async () => {
           pendingComment.current = values.comment;
@@ -299,12 +299,10 @@ const EventForm = ({
         />
       )}
       {form.formState.errors.root && (
-        <div className="py-8 text-center">
-          {form.formState.errors.root.message}
-        </div>
+        <div className="text-center">{form.formState.errors.root.message}</div>
       )}
       {!isPublic && !isArchived && (!event || form.formState.isDirty) && (
-        <div className="flex gap-4 pt-10">
+        <div className="flex gap-4 pt-8">
           {!event && !isMission && (
             <BackButton className="w-full" colorScheme="transparent">
               Close
diff --git a/app/_components/event-type-form.tsx b/app/_components/event-type-form.tsx
index 465ed2bd..707ad464 100644
--- a/app/_components/event-type-form.tsx
+++ b/app/_components/event-type-form.tsx
@@ -128,7 +128,7 @@ const EventTypeForm = ({
           )}
         />
         {form.formState.errors.root && (
-          <div className="py-8 text-center">
+          <div className="text-center">
             {form.formState.errors.root.message}
           </div>
         )}
diff --git a/app/_components/forgot-password-form.tsx b/app/_components/forgot-password-form.tsx
index 46781a2c..f6bf8ce8 100644
--- a/app/_components/forgot-password-form.tsx
+++ b/app/_components/forgot-password-form.tsx
@@ -12,7 +12,7 @@ const ForgotPasswordForm = () => {
   });
 
   return (
-    <form action={action} className="flex flex-col gap-6">
+    <form action={action} className="flex flex-col gap-8">
       <Input
         defaultValue={state.defaultValues.email}
         label="Email address"
diff --git a/app/_components/module-card.tsx b/app/_components/module-card.tsx
index 73928245..03597ded 100644
--- a/app/_components/module-card.tsx
+++ b/app/_components/module-card.tsx
@@ -39,7 +39,7 @@ const ModuleCard = ({
       className="space-y-16 pb-8 pt-10"
       defaultOpen={!event && !disabled}
       title={
-        <div className="min-w-0 py-2 text-left">
+        <div className="min-w-0 text-left">
           <div className="truncate leading-snug">
             Module {(eventType.order as number) + 1}
             {eventType.name ? `: ${eventType.name}` : ''}
diff --git a/app/_components/sign-in-form.tsx b/app/_components/sign-in-form.tsx
index 9303e929..3b38056a 100644
--- a/app/_components/sign-in-form.tsx
+++ b/app/_components/sign-in-form.tsx
@@ -16,7 +16,7 @@ const SignInForm = ({ next }: SignInFormProps) => {
   });
 
   return (
-    <form action={action} className="flex flex-col gap-6">
+    <form action={action} className="flex flex-col gap-8">
       <Input
         defaultValue={state.defaultValues.email}
         label="Email address"
diff --git a/app/_components/sign-up-form.tsx b/app/_components/sign-up-form.tsx
index 6da098af..58f8f413 100644
--- a/app/_components/sign-up-form.tsx
+++ b/app/_components/sign-up-form.tsx
@@ -16,7 +16,7 @@ const SignUpForm = ({ next }: SignUpFormProps) => {
   });
 
   return (
-    <form action={action} className="flex flex-col gap-6">
+    <form action={action} className="flex flex-col gap-8">
       <div className="flex gap-6">
         <Input
           defaultValue={state.defaultValues.firstName}
diff --git a/app/_components/subject-form.tsx b/app/_components/subject-form.tsx
index beed8c18..81ec3d15 100644
--- a/app/_components/subject-form.tsx
+++ b/app/_components/subject-form.tsx
@@ -47,6 +47,7 @@ const SubjectForm = ({ subject }: SubjectFormProps) => {
 
   return (
     <form
+      className="flex flex-col gap-8 px-4 pb-8 pt-6 sm:px-8"
       onSubmit={form.handleSubmit((values) =>
         startTransition(async () => {
           const res = await upsertSubject(
@@ -84,117 +85,113 @@ const SubjectForm = ({ subject }: SubjectFormProps) => {
         }),
       )}
     >
-      <div className="flex flex-col gap-6 px-4 pb-8 pt-6 sm:px-8">
-        <Input
-          label="Name"
-          maxLength={49}
-          required
-          tooltip="Who or what are you tracking?"
-          {...form.register('name')}
-        />
-        <div className="relative">
-          <label className="group">
-            <span className="label">Profile image</span>
-            <AvatarDropzone
-              file={form.watch('avatar')}
-              id={subject?.id}
-              onDrop={(files) => form.setValue('avatar', files[0])}
-            />
-          </label>
-          {form.watch('avatar') && (
-            <Button
-              className="absolute right-2 top-0"
-              onClick={() => form.setValue('avatar', null)}
-              variant="link"
-            >
-              Remove image
-            </Button>
-          )}
+      <Input
+        label="Name"
+        maxLength={49}
+        required
+        tooltip="Who or what are you tracking?"
+        {...form.register('name')}
+      />
+      <div className="relative">
+        <label className="group">
+          <span className="label">Profile image</span>
+          <AvatarDropzone
+            file={form.watch('avatar')}
+            id={subject?.id}
+            onDrop={(files) => form.setValue('avatar', files[0])}
+          />
+        </label>
+        {form.watch('avatar') && (
+          <Button
+            className="absolute right-2 top-0"
+            onClick={() => form.setValue('avatar', null)}
+            variant="link"
+          >
+            Remove image
+          </Button>
+        )}
+      </div>
+      <Controller
+        control={form.control}
+        name="data.banner"
+        render={({ field }) => (
+          <RichTextarea
+            label="Note"
+            tooltip={
+              <>
+                An optional note displayed at the top of the subject&rsquo;s
+                profile.
+              </>
+            }
+            {...field}
+          />
+        )}
+      />
+      <fieldset className="group">
+        <div className="flex justify-between">
+          <span className="label">Links</span>
+          <Tip className="relative -top-1 -mr-[0.2rem]" side="left">
+            Optional links displayed at the top of&nbsp;the subject&rsquo;s
+            profile.
+          </Tip>
         </div>
-        <Controller
-          control={form.control}
-          name="data.banner"
-          render={({ field }) => (
-            <RichTextarea
-              label="Note"
-              tooltip={
-                <>
-                  An optional note displayed at the top of the subject&rsquo;s
-                  profile.
-                </>
-              }
-              {...field}
-            />
+        <div className="space-y-2">
+          {!!linkArray.fields.length && (
+            <ul className="flex flex-col gap-2">
+              {linkArray.fields.map((link, linkIndex) => (
+                <li key={link.id}>
+                  <Controller
+                    control={form.control}
+                    name={`data.links.${linkIndex}.label`}
+                    render={({ field }) => (
+                      <Input
+                        className="rounded-b-none border-b-0"
+                        placeholder="Label…"
+                        required
+                        right={
+                          <IconButton
+                            className="m-0 h-full w-full justify-center p-0"
+                            icon={<XMarkIcon className="w-5" />}
+                            label="Delete link"
+                            onClick={() => linkArray.remove(linkIndex)}
+                            tabIndex={-1}
+                          />
+                        }
+                        {...field}
+                      />
+                    )}
+                  />
+                  <Controller
+                    control={form.control}
+                    name={`data.links.${linkIndex}.url`}
+                    render={({ field }) => (
+                      <Input
+                        className="rounded-t-none"
+                        placeholder="https://…"
+                        required
+                        type="url"
+                        {...field}
+                      />
+                    )}
+                  />
+                </li>
+              ))}
+            </ul>
           )}
-        />
-        <fieldset className="group">
-          <div className="flex justify-between">
-            <span className="label">Links</span>
-            <Tip className="relative -top-1 -mr-[0.2rem]" side="left">
-              Optional links displayed at the top of&nbsp;the subject&rsquo;s
-              profile.
-            </Tip>
-          </div>
-          <div className="space-y-2">
-            {!!linkArray.fields.length && (
-              <ul className="flex flex-col gap-2">
-                {linkArray.fields.map((link, linkIndex) => (
-                  <li key={link.id}>
-                    <Controller
-                      control={form.control}
-                      name={`data.links.${linkIndex}.label`}
-                      render={({ field }) => (
-                        <Input
-                          className="rounded-b-none border-b-0"
-                          placeholder="Label…"
-                          required
-                          right={
-                            <IconButton
-                              className="m-0 h-full w-full justify-center p-0"
-                              icon={<XMarkIcon className="w-5" />}
-                              label="Delete link"
-                              onClick={() => linkArray.remove(linkIndex)}
-                              tabIndex={-1}
-                            />
-                          }
-                          {...field}
-                        />
-                      )}
-                    />
-                    <Controller
-                      control={form.control}
-                      name={`data.links.${linkIndex}.url`}
-                      render={({ field }) => (
-                        <Input
-                          className="rounded-t-none"
-                          placeholder="https://…"
-                          required
-                          type="url"
-                          {...field}
-                        />
-                      )}
-                    />
-                  </li>
-                ))}
-              </ul>
-            )}
-            <Button
-              className="w-full"
-              colorScheme="transparent"
-              onClick={() => linkArray.append({ label: '', url: '' })}
-            >
-              <PlusIcon className="w-5" />
-              Add link
-            </Button>
-          </div>
-        </fieldset>
-      </div>
-      {form.formState.errors.root && (
-        <div className="px-4 py-8 text-center sm:px-8">
-          {form.formState.errors.root.message}
+          <Button
+            className="w-full"
+            colorScheme="transparent"
+            onClick={() => linkArray.append({ label: '', url: '' })}
+          >
+            <PlusIcon className="w-5" />
+            Add link
+          </Button>
         </div>
+      </fieldset>
+      {form.formState.errors.root && (
+        <div className="text-center">{form.formState.errors.root.message}</div>
       )}
-      <div className="flex gap-4 px-4 py-8 sm:px-8">
+      <div className="flex gap-4 pt-8">
         <BackButton className="w-full" colorScheme="transparent">
           Close
         </BackButton>
diff --git a/app/_components/subject-page.tsx b/app/_components/subject-page.tsx
index 1c6f82be..1c139224 100644
--- a/app/_components/subject-page.tsx
+++ b/app/_components/subject-page.tsx
@@ -42,14 +42,13 @@ const SubjectPage = async ({
 }: SubjectPageProps) => {
   const f = formatEventFilters({ from, limit, to });
 
-  const [{ data: subject }, { data: events, error }, user] = await Promise.all([
+  const [{ data: subject }, { data: events }, user] = await Promise.all([
     isPublic ? getPublicSubject(subjectId) : getSubject(subjectId),
     isPublic
       ? await listPublicEvents(subjectId, f)
       : await listEvents(subjectId, f),
     getCurrentUser(),
   ]);
-  console.log(error);
 
   if (!subject) return null;
   const isTeamMember = !!user && subject.team_id === user.id;
diff --git a/app/_components/template-form.tsx b/app/_components/template-form.tsx
index edf5d0ef..87d469e8 100644
--- a/app/_components/template-form.tsx
+++ b/app/_components/template-form.tsx
@@ -132,7 +132,7 @@ const TemplateForm = ({
           )}
         />
         {form.formState.errors.root && (
-          <div className="py-8 text-center">
+          <div className="text-center">
             {form.formState.errors.root.message}
           </div>
         )}
diff --git a/app/_components/training-plan-form.tsx b/app/_components/training-plan-form.tsx
index 7aee1286..270416a3 100644
--- a/app/_components/training-plan-form.tsx
+++ b/app/_components/training-plan-form.tsx
@@ -29,6 +29,7 @@ const TrainingPlanForm = ({ mission, subjectId }: TrainingPlanFormProps) => {
 
   return (
     <form
+      className="px-4 pb-8 pt-6 sm:px-8"
       onSubmit={form.handleSubmit((values) =>
         startTransition(async () => {
           const res = await upsertTrainingPlan(
@@ -53,21 +54,17 @@ const TrainingPlanForm = ({ mission, subjectId }: TrainingPlanFormProps) => {
         }),
       )}
     >
-      <div className="px-4 py-8 sm:px-8">
-        <Input
-          label="Name"
-          maxLength={49}
-          required
-          tooltip="Succinctly describe the goal or purpose of the training plan."
-          {...form.register('name')}
-        />
-      </div>
+      <Input
+        label="Name"
+        maxLength={49}
+        required
+        tooltip="Succinctly describe the goal or purpose of the training plan."
+        {...form.register('name')}
+      />
       {form.formState.errors.root && (
-        <div className="px-4 py-8 text-center sm:px-8">
-          {form.formState.errors.root.message}
-        </div>
+        <div className="text-center">{form.formState.errors.root.message}</div>
       )}
-      <div className="flex gap-4 px-4 py-8 sm:px-8">
+      <div className="flex gap-4 pt-8">
         <BackButton className="w-full" colorScheme="transparent">
           Close
         </BackButton>
diff --git a/bun.lockb b/bun.lockb
index 79b80469..96445c19 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/package.json b/package.json
index bc846fef..728876a6 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "lodash": "^4.17.21",
     "nanoid": "^5.0.7",
     "next": "canary",
-    "prettier": "^3.3.2",
+    "prettier": "^3.3.3",
     "prettier-plugin-organize-imports": "^3.2.4",
     "prettier-plugin-tailwindcss": "^0.6.5",
     "react": "canary",