diff --git a/package.json b/package.json
index bb190c8b..9debc022 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.4",
     "prettier": "^3.1.1",
-    "typescript": "^5.2.2",
+    "typescript": "^5.5.2",
     "vite": "^5.0.0",
     "vite-plugin-node-polyfills": "^0.17.0"
   }
diff --git a/packages/api/src/fetchEventGroupCategories.ts b/packages/api/src/fetchEventGroupCategories.ts
new file mode 100644
index 00000000..5bd3f82e
--- /dev/null
+++ b/packages/api/src/fetchEventGroupCategories.ts
@@ -0,0 +1,29 @@
+import { GetGroupCategoriesResponse } from './types';
+
+async function fetchEventGroupCategories(
+  eventId: string,
+): Promise<GetGroupCategoriesResponse | null> {
+  try {
+    const response = await fetch(
+      `${import.meta.env.VITE_SERVER_URL}/api/events/${eventId}/group-categories`,
+      {
+        credentials: 'include',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      },
+    );
+
+    if (!response.ok) {
+      throw new Error(`HTTP Error! Status: ${response.status}`);
+    }
+
+    const groupCategories = (await response.json()) as { data: GetGroupCategoriesResponse };
+    return groupCategories.data;
+  } catch (error) {
+    console.error('Error fetching cycles:', error);
+    return null;
+  }
+}
+
+export default fetchEventGroupCategories;
diff --git a/packages/api/src/fetchGroupCategories.ts b/packages/api/src/fetchGroupCategories.ts
index 9fad1de5..f9c4d49d 100644
--- a/packages/api/src/fetchGroupCategories.ts
+++ b/packages/api/src/fetchGroupCategories.ts
@@ -2,7 +2,7 @@ import { GetGroupCategoriesResponse } from './types';
 
 async function fetchGroupCategories(): Promise<GetGroupCategoriesResponse | null> {
   try {
-    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api//group-categories`, {
+    const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/api/group-categories`, {
       credentials: 'include',
       headers: {
         'Content-type': 'application/json',
diff --git a/packages/api/src/fetchGroups.ts b/packages/api/src/fetchGroups.ts
index 8ccc94d6..bda24450 100644
--- a/packages/api/src/fetchGroups.ts
+++ b/packages/api/src/fetchGroups.ts
@@ -1,13 +1,13 @@
 import { GetGroupsResponse } from './types';
 
 async function fetchGroups({
-  groupCategoryName,
+  groupCategoryId,
 }: {
-  groupCategoryName: string;
+  groupCategoryId: string;
 }): Promise<GetGroupsResponse[] | null> {
   try {
     const response = await fetch(
-      `${import.meta.env.VITE_SERVER_URL}/api/group-categories/${groupCategoryName}/groups`,
+      `${import.meta.env.VITE_SERVER_URL}/api/group-categories/${groupCategoryId}/groups`,
       {
         credentials: 'include',
         headers: {
diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts
index bfe38a75..5fd17c38 100644
--- a/packages/api/src/index.ts
+++ b/packages/api/src/index.ts
@@ -36,4 +36,5 @@ export { default as postVotes } from './postVotes';
 export { default as putRegistration } from './putRegistration';
 export { default as putUser } from './putUser';
 export { default as putUsersToGroups } from './putUsersToGroups';
+export { default as fetchEventGroupCategories } from './fetchEventGroupCategories';
 export * from './types';
diff --git a/packages/api/src/types/CycleType.ts b/packages/api/src/types/CycleType.ts
index b1bdad5d..b95e5612 100644
--- a/packages/api/src/types/CycleType.ts
+++ b/packages/api/src/types/CycleType.ts
@@ -7,6 +7,7 @@ export type GetCycleResponse = {
   endAt: string;
   forumQuestions: {
     id: string;
+    showScore: boolean;
     createdAt: string;
     updatedAt: string;
     questionSubTitle: string | null;
@@ -20,12 +21,23 @@ export type GetCycleResponse = {
       optionTitle: string;
       optionSubTitle?: string;
       accepted: boolean;
+      voteScore?: number;
       fundingRequest: string;
-      user: {
-        group: {
+      user?: {
+        groups?: {
           id: string;
           name: string;
-        };
+          groupCategory?: {
+            id: string;
+            name: string | null;
+            createdAt: Date;
+            updatedAt: Date;
+            eventId: string | null;
+            userCanCreate: boolean;
+            userCanView: boolean;
+            required: boolean;
+          };
+        }[];
         username: string;
         firstName: string;
         lastName: string;
diff --git a/packages/api/src/types/GroupCategoryType.ts b/packages/api/src/types/GroupCategoryType.ts
index 275e2b90..aa88128f 100644
--- a/packages/api/src/types/GroupCategoryType.ts
+++ b/packages/api/src/types/GroupCategoryType.ts
@@ -6,6 +6,7 @@ export type GetGroupCategoryResponse = {
   eventId: string | null;
   userCanCreate: boolean;
   userCanView: boolean;
+  required: boolean;
 };
 
 export type GetGroupCategoriesResponse = GetGroupCategoryResponse[];
diff --git a/packages/api/src/types/GroupType.ts b/packages/api/src/types/GroupType.ts
index 18bb538c..e2964ff5 100644
--- a/packages/api/src/types/GroupType.ts
+++ b/packages/api/src/types/GroupType.ts
@@ -12,6 +12,7 @@ export type GetGroupsResponse = {
     eventId: string;
     userCanCreate: boolean;
     userCanView: boolean;
+    required: boolean;
     createdAt: string;
     updatedAt: string;
   };
@@ -27,6 +28,7 @@ export type PostGroupResponse = {
   groupCategoryId: string | null;
   name: string;
   secret: string | null;
+  required: boolean;
   description: string;
   createdAt: string;
   updatedAt: string;
diff --git a/packages/api/src/types/UserType.ts b/packages/api/src/types/UserType.ts
index 657353a3..3380a096 100644
--- a/packages/api/src/types/UserType.ts
+++ b/packages/api/src/types/UserType.ts
@@ -16,5 +16,4 @@ export type PutUserRequest = {
   lastName: string;
   email?: string;
   telegram?: string | null;
-  userAttributes: Record<string, string>;
 };
diff --git a/packages/berlin/public/logos/lexicon-light.svg b/packages/berlin/public/logos/lexicon-light.svg
index 53a5bf02..f0109986 100644
--- a/packages/berlin/public/logos/lexicon-light.svg
+++ b/packages/berlin/public/logos/lexicon-light.svg
@@ -1,19 +1,24 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_113_4524)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15.1565 4.80038L53.7173 4L48.5759 11.7904L61.2689 32.2801L45.6839 59.8664L14.9959 59.5463L0 33.4006L8.53257 7.57503H13.8176L15.1565 4.80038ZM43.1667 9.70937L16.6026 55.4377L3.05273 32.5468L16.3348 9.76273L43.1667 9.70937ZM34.0621 38.3096L32.7232 35.5883L18.5306 56.6116H43.8629L54.3601 38.3096H34.0621Z" fill="black"/>
-<path d="M34.0635 38.3427L32.7246 35.6188L34.492 32.8415L57.6285 32.3608L54.3615 38.3427H34.0635Z" fill="url(#paint0_linear_113_4524)"/>
-<path d="M64.0005 20.9307L59.3411 29.2626L48.5762 11.7977L53.5034 4.32031L64.0005 20.9307Z" fill="url(#paint1_linear_113_4524)"/>
+<g clip-path="url(#clip0_128_12540)">
+<mask id="mask0_128_12540" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="64" height="64">
+<path d="M64 0H0V64H64V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_128_12540)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.1565 4.80038L53.7173 4L48.5759 11.7904L61.2689 32.2801L45.6839 59.8664L14.9959 59.5463L0 33.4006L8.53257 7.57503H13.8176L15.1565 4.80038ZM43.1667 9.70937L16.6026 55.4377L3.05273 32.5468L16.3348 9.76273L43.1667 9.70937ZM34.0621 38.3096L32.7232 35.5883L18.5306 56.6116H43.8629L54.3601 38.3096H34.0621Z" fill="#222222"/>
+<path d="M34.0635 38.3427L32.7246 35.6188L34.492 32.8415L57.6285 32.3608L54.3615 38.3427H34.0635Z" fill="url(#paint0_linear_128_12540)"/>
+<path d="M64.0005 20.9307L59.3411 29.2626L48.5762 11.7977L53.5034 4.32031L64.0005 20.9307Z" fill="url(#paint1_linear_128_12540)"/>
+</g>
 </g>
 <defs>
-<linearGradient id="paint0_linear_113_4524" x1="32.7246" y1="35.3518" x2="57.6285" y2="35.3518" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint0_linear_128_12540" x1="32.7246" y1="35.3518" x2="57.6285" y2="35.3518" gradientUnits="userSpaceOnUse">
 <stop offset="0.0958369" stop-color="#91869B"/>
 <stop offset="1" stop-color="#4CF3DE"/>
 </linearGradient>
-<linearGradient id="paint1_linear_113_4524" x1="51.2005" y1="8.00558" x2="62.2429" y2="25.7115" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint1_linear_128_12540" x1="51.2005" y1="8.00558" x2="62.2429" y2="25.7115" gradientUnits="userSpaceOnUse">
 <stop offset="0.0424592" stop-color="#F1FBFA"/>
 <stop offset="1" stop-color="#4CF3DE"/>
 </linearGradient>
-<clipPath id="clip0_113_4524">
+<clipPath id="clip0_128_12540">
 <rect width="64" height="64" fill="white"/>
 </clipPath>
 </defs>
diff --git a/packages/berlin/src/App.tsx b/packages/berlin/src/App.tsx
index 8477dd86..a7a349db 100644
--- a/packages/berlin/src/App.tsx
+++ b/packages/berlin/src/App.tsx
@@ -1,16 +1,17 @@
 // React and third-party libraries
-import { RouterProvider, createBrowserRouter, redirect } from 'react-router-dom';
 import { QueryClient } from '@tanstack/react-query';
+import { RouterProvider, createBrowserRouter, redirect } from 'react-router-dom';
 
 // Store
 import { useAppStore } from './store';
 
 // API
-import { fetchEvents, fetchUser, fetchCycle, fetchRegistrations } from 'api';
+import { fetchCycle, fetchEvents, fetchRegistrations, fetchUser } from 'api';
 
 // Pages
 import { default as BerlinLayout } from './layout/index.ts';
 import Account from './pages/Account';
+import Comments from './pages/Comments.tsx';
 import Cycle from './pages/Cycle.tsx';
 import DataPolicy from './pages/DataPolicy.tsx';
 import Event from './pages/Event.tsx';
@@ -18,7 +19,6 @@ import Events from './pages/Events.tsx';
 import Holding from './pages/Holding';
 import Landing from './pages/Landing';
 import Onboarding from './pages/Onboarding';
-import Comments from './pages/Comments.tsx';
 import PassportPopupRedirect from './pages/Popup';
 import PublicGroupRegistration from './pages/PublicGroupRegistration.tsx';
 import Register from './pages/Register';
diff --git a/packages/berlin/src/components/columns/cycle-columns/CycleColumns.styled.tsx b/packages/berlin/src/components/columns/cycle-columns/CycleColumns.styled.tsx
index eac82e67..9ddf80a7 100644
--- a/packages/berlin/src/components/columns/cycle-columns/CycleColumns.styled.tsx
+++ b/packages/berlin/src/components/columns/cycle-columns/CycleColumns.styled.tsx
@@ -2,9 +2,13 @@ import styled from 'styled-components';
 import { FlexRow } from '../../containers/FlexRow.styled';
 
 export const Card = styled(FlexRow)`
-  border-bottom: 2px solid var(--color-black);
-  gap: 0;
-  width: 100%;
+  display: none;
+  @media (min-width: 600px) {
+    display: flex;
+    border-bottom: 2px solid var(--color-black);
+    gap: 0;
+    width: 100%;
+  }
 `;
 
 export const Proposal = styled(FlexRow)`
@@ -53,7 +57,7 @@ export const Hearts = styled(FlexRow)`
   padding: 1.5rem;
 `;
 
-// export const Plurality = styled(FlexRow)`
-//   max-width: 5.5rem;
-//   padding: 1.5rem;
-// `;
+export const Plurality = styled(FlexRow)`
+  max-width: 5rem;
+  padding: 1.5rem;
+`;
diff --git a/packages/berlin/src/components/columns/cycle-columns/CycleColumns.tsx b/packages/berlin/src/components/columns/cycle-columns/CycleColumns.tsx
index 8fd8221b..f939be67 100644
--- a/packages/berlin/src/components/columns/cycle-columns/CycleColumns.tsx
+++ b/packages/berlin/src/components/columns/cycle-columns/CycleColumns.tsx
@@ -1,12 +1,13 @@
 import IconButton from '../../icon-button';
 import { Body } from '../../typography/Body.styled';
-import { Affiliation, Lead, Card, Hearts, Proposal } from './CycleColumns.styled';
+import { Affiliation, Lead, Card, Hearts, Proposal, Plurality } from './CycleColumns.styled';
 
 type CycleColumnsProps = {
   onColumnClick: (column: string) => void;
+  showScore?: boolean;
 };
 
-function CycleColumns({ onColumnClick }: CycleColumnsProps) {
+function CycleColumns({ onColumnClick, showScore }: CycleColumnsProps) {
   return (
     <Card>
       <Proposal>
@@ -25,13 +26,15 @@ function CycleColumns({ onColumnClick }: CycleColumnsProps) {
           icon={{ src: `/icons/heart-full.svg`, alt: 'Full heart' }}
         />
       </Hearts>
-      {/* <Plurality onClick={() => onColumnClick('voteScore')}>
-        <IconButton
-          $padding={0}
-          $color="secondary"
-          icon={{ src: `/icons/plurality-score.svg`, alt: 'Plurality score' }}
-        />
-      </Plurality> */}
+      {showScore && (
+        <Plurality onClick={() => onColumnClick('voteScore')}>
+          <IconButton
+            $padding={0}
+            $color="secondary"
+            icon={{ src: `/icons/plurality-score.svg`, alt: 'Plurality score' }}
+          />
+        </Plurality>
+      )}
     </Card>
   );
 }
diff --git a/packages/berlin/src/components/columns/results-columns/ResultsColumns.styled.tsx b/packages/berlin/src/components/columns/results-columns/ResultsColumns.styled.tsx
index 331a2142..63314245 100644
--- a/packages/berlin/src/components/columns/results-columns/ResultsColumns.styled.tsx
+++ b/packages/berlin/src/components/columns/results-columns/ResultsColumns.styled.tsx
@@ -2,8 +2,12 @@ import styled from 'styled-components';
 import { Grid } from '../../containers/Grid.styled';
 
 export const Card = styled(Grid)<{ $showFunding: boolean }>`
-  border-bottom: 2px solid var(--color-black);
-  grid-template-columns: ${(props) =>
-    props.$showFunding ? 'auto repeat(3, 48px) 100px' : 'auto repeat(3, 48px)'};
-  padding: 1.5rem;
+  display: none;
+  @media (min-width: 600px) {
+    border-bottom: 2px solid var(--color-black);
+    display: grid;
+    grid-template-columns: ${(props) =>
+      props.$showFunding ? 'auto repeat(3, 48px) 100px' : 'auto repeat(3, 48px)'};
+    padding: 1.5rem;
+  }
 `;
diff --git a/packages/berlin/src/components/dots/Dots.tsx b/packages/berlin/src/components/dots/Dots.tsx
index d5bef910..fd3ede01 100644
--- a/packages/berlin/src/components/dots/Dots.tsx
+++ b/packages/berlin/src/components/dots/Dots.tsx
@@ -4,14 +4,14 @@ import { Dot } from './Dots.styled';
 type DotsProps = {
   dots: number;
   activeDotIndex: number;
-  setStep: React.Dispatch<React.SetStateAction<number>>;
+  handleClick: (index: number) => void;
 };
 
-function Dots({ dots, activeDotIndex, setStep }: DotsProps) {
+function Dots({ dots, activeDotIndex, handleClick }: DotsProps) {
   return (
     <FlexRow>
       {Array.from({ length: dots }).map((_, index) => (
-        <Dot key={index} $active={index === activeDotIndex} onClick={() => setStep(index)} />
+        <Dot key={index} $active={index === activeDotIndex} onClick={() => handleClick(index)} />
       ))}
     </FlexRow>
   );
diff --git a/packages/berlin/src/components/event-card/EventCard.styled.tsx b/packages/berlin/src/components/event-card/EventCard.styled.tsx
index ec9898cb..a3742b19 100644
--- a/packages/berlin/src/components/event-card/EventCard.styled.tsx
+++ b/packages/berlin/src/components/event-card/EventCard.styled.tsx
@@ -1,18 +1,12 @@
-import styled, { css } from 'styled-components';
+import styled from 'styled-components';
 import { FlexColumn } from '../containers/FlexColumn.styled';
+import { FlexRowToColumn } from '../containers/FlexRowToColumn.styled';
 
-export const Card = styled(FlexColumn)<{ $direction?: 'row' | 'column' }>`
+export const Card = styled(FlexRowToColumn)`
   border-radius: 1rem;
   border: 1px solid var(--color-black);
-  flex-direction: column;
   overflow: hidden;
   width: 100%;
-
-  ${(props) =>
-    props.$direction === 'row' &&
-    css`
-      flex-direction: row;
-    `}
 `;
 
 export const ImageContainer = styled.div`
diff --git a/packages/berlin/src/components/event-card/EventCard.tsx b/packages/berlin/src/components/event-card/EventCard.tsx
index cec0a4ec..5c6d1878 100644
--- a/packages/berlin/src/components/event-card/EventCard.tsx
+++ b/packages/berlin/src/components/event-card/EventCard.tsx
@@ -10,13 +10,12 @@ import Markdown from 'react-markdown';
 
 type EventCardProps = {
   event: GetEventResponse;
-  $direction?: 'row' | 'column';
   onClick?: () => void;
 };
 
-function EventCard({ event, $direction = 'column', onClick }: EventCardProps) {
+function EventCard({ event, onClick }: EventCardProps) {
   return (
-    <Card $direction={$direction}>
+    <Card>
       <ImageContainer>
         <img src={event.imageUrl} alt={`${event.name} image`} />
       </ImageContainer>
diff --git a/packages/berlin/src/components/form/FormInput.tsx b/packages/berlin/src/components/form/FormInput.tsx
new file mode 100644
index 00000000..2f5bc69f
--- /dev/null
+++ b/packages/berlin/src/components/form/FormInput.tsx
@@ -0,0 +1,56 @@
+import { FieldValues, Path, UseFormReturn } from 'react-hook-form';
+import { SelectInput } from './SelectInput';
+import { TextAreaInput } from './TextAreaInput';
+import { TextInput } from './TextInput';
+import { NumberInput } from './NumberInput';
+
+export function FormInput<T extends FieldValues>(props: {
+  form: UseFormReturn<T>;
+  name: Path<T>;
+  label: string;
+  options?: { name: string; value: string }[];
+  required: boolean | null;
+  type: string;
+}) {
+  switch (props.type) {
+    case 'TEXT':
+      return (
+        <TextInput
+          form={props.form}
+          name={props.name}
+          label={props.label}
+          required={props.required}
+        />
+      );
+    case 'TEXTAREA':
+      return (
+        <TextAreaInput
+          form={props.form}
+          name={props.name}
+          label={props.label}
+          required={props.required}
+        />
+      );
+    case 'SELECT':
+      return (
+        <SelectInput
+          form={props.form}
+          name={props.name}
+          label={props.label}
+          required={props.required}
+          options={props.options ?? []}
+        />
+      );
+    case 'NUMBER':
+      return (
+        <NumberInput
+          form={props.form}
+          name={props.name}
+          label={props.label}
+          required={props.required}
+        />
+      );
+    default:
+      return <></>;
+  }
+}
diff --git a/packages/berlin/src/components/form/NumberInput.tsx b/packages/berlin/src/components/form/NumberInput.tsx
new file mode 100644
index 00000000..262524a7
--- /dev/null
+++ b/packages/berlin/src/components/form/NumberInput.tsx
@@ -0,0 +1,37 @@
+import { Controller, FieldValues, Path, UseFormReturn } from 'react-hook-form';
+import Input from '../input';
+
+export function NumberInput<T extends FieldValues>(props: {
+  form: UseFormReturn<T>;
+  name: Path<T>;
+  label: string;
+  required: boolean | null;
+  customValidation?: (value: number) => string | undefined;
+}) {
+  return (
+    <Controller
+      name={props.name}
+      control={props.form.control}
+      rules={{
+        required: props.required ? `${props.label} is required` : false,
+        validate: props.customValidation,
+      }}
+      render={({ field }) => (
+        <Input
+          type="number"
+          label={props.label}
+          required={!!props.required}
+          placeholder="Enter a value"
+          errors={
+            props.form.formState.errors[props.name]
+              ? [props.form.formState.errors[props.name]?.message?.toString() ?? '']
+              : []
+          }
+          value={field.value ?? undefined}
+          onChange={field.onChange}
+          onBlur={field.onBlur}
+        />
+      )}
+    />
+  );
+}
diff --git a/packages/berlin/src/components/form/SelectInput.tsx b/packages/berlin/src/components/form/SelectInput.tsx
new file mode 100644
index 00000000..102beaed
--- /dev/null
+++ b/packages/berlin/src/components/form/SelectInput.tsx
@@ -0,0 +1,34 @@
+import { Controller, FieldValues, Path, UseFormReturn } from 'react-hook-form';
+import Select from '../select';
+
+export function SelectInput<T extends FieldValues>(props: {
+  form: UseFormReturn<T>;
+  name: Path<T>;
+  label: string;
+  required: boolean | null;
+  options: { name: string; value: string }[];
+}) {
+  return (
+    <Controller
+      name={props.name}
+      control={props.form.control}
+      rules={{ required: props.required ? 'Value is required' : false }}
+      render={({ field }) => (
+        <Select
+          label={props.label}
+          placeholder="Choose a value"
+          required={!!props.required}
+          options={props.options.map((option) => ({ id: option.value, name: option.name }))}
+          errors={
+            props.form.formState.errors[props.name]?.message
+              ? [props.form.formState.errors[props.name]?.message?.toString() ?? '']
+              : undefined
+          }
+          onBlur={field.onBlur}
+          onChange={(val) => field.onChange(val)}
+          value={field.value ?? undefined}
+        />
+      )}
+    />
+  );
+}
diff --git a/packages/berlin/src/components/form/TextAreaInput.tsx b/packages/berlin/src/components/form/TextAreaInput.tsx
new file mode 100644
index 00000000..e08198bc
--- /dev/null
+++ b/packages/berlin/src/components/form/TextAreaInput.tsx
@@ -0,0 +1,36 @@
+import { Controller, FieldValues, Path, UseFormReturn } from 'react-hook-form';
+import Textarea from '../textarea';
+
+export function TextAreaInput<T extends FieldValues>(props: {
+  form: UseFormReturn<T>;
+  name: Path<T>;
+  label: string;
+  required: boolean | null;
+  customValidation?: (value: string) => string | undefined;
+}) {
+  return (
+    <Controller
+      name={props.name}
+      control={props.form.control}
+      rules={{
+        required: props.required ? `${props.label} is required` : false,
+        validate: props.customValidation,
+      }}
+      render={({ field }) => (
+        <Textarea
+          label={props.label}
+          required={!!props.required}
+          placeholder="Enter a value"
+          errors={
+            props.form.formState.errors[props.name]
+              ? [props.form.formState.errors[props.name]?.message?.toString() ?? '']
+              : []
+          }
+          value={field.value ?? undefined}
+          onChange={field.onChange}
+          onBlur={field.onBlur}
+        />
+      )}
+    />
+  );
+}
diff --git a/packages/berlin/src/components/form/TextInput.tsx b/packages/berlin/src/components/form/TextInput.tsx
new file mode 100644
index 00000000..9861f6e9
--- /dev/null
+++ b/packages/berlin/src/components/form/TextInput.tsx
@@ -0,0 +1,38 @@
+import { Controller, FieldValues, Path, UseFormReturn } from 'react-hook-form';
+import Input from '../input';
+
+export function TextInput<T extends FieldValues>(props: {
+  form: UseFormReturn<T>;
+  name: Path<T>;
+  label: string;
+  required: boolean | null;
+  placeholder?: string;
+  customValidation?: (value: string) => string | undefined;
+}) {
+  return (
+    <Controller
+      name={props.name}
+      control={props.form.control}
+      rules={{
+        required: props.required ? `${props.label} is required` : false,
+        validate: props.customValidation,
+      }}
+      render={({ field }) => (
+        <Input
+          type="text"
+          label={props.label}
+          required={!!props.required}
+          placeholder={props.placeholder ?? 'Please enter a value'}
+          errors={
+            props.form.formState.errors[props.name]
+              ? [props.form.formState.errors[props.name]?.message?.toString() ?? '']
+              : []
+          }
+          value={field.value ?? undefined}
+          onBlur={field.onBlur}
+          onChange={field.onChange}
+        />
+      )}
+    />
+  );
+}
diff --git a/packages/berlin/src/components/form/index.ts b/packages/berlin/src/components/form/index.ts
new file mode 100644
index 00000000..038dc54e
--- /dev/null
+++ b/packages/berlin/src/components/form/index.ts
@@ -0,0 +1,5 @@
+export * from './NumberInput';
+export * from './SelectInput';
+export * from './TextAreaInput';
+export * from './TextInput';
+export * from './FormInput';
diff --git a/packages/berlin/src/components/header/Header.tsx b/packages/berlin/src/components/header/Header.tsx
index 79544b75..ad38c389 100644
--- a/packages/berlin/src/components/header/Header.tsx
+++ b/packages/berlin/src/components/header/Header.tsx
@@ -1,7 +1,10 @@
 // React and third-party libraries
 import { useState } from 'react';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useLocation, useNavigate } from 'react-router-dom';
+import {
+  // useLocation,
+  useNavigate,
+} from 'react-router-dom';
 
 // Store
 import { useAppStore } from '../../store';
@@ -27,7 +30,6 @@ import {
   DesktopButtons,
   HeaderContainer,
   LogoContainer,
-  LogoImage,
   LogoSubtitle,
   LogoTextContainer,
   LogoTitle,
@@ -43,7 +45,6 @@ import IconButton from '../icon-button';
 function Header() {
   const queryClient = useQueryClient();
   const { user } = useUser();
-  const location = useLocation();
   const theme = useAppStore((state) => state.theme);
   const toggleTheme = useAppStore((state) => state.toggleTheme);
   const navigate = useNavigate();
@@ -83,13 +84,11 @@ function Header() {
     <SyledHeader>
       <HeaderContainer>
         <LogoContainer onClick={() => navigate('/')}>
-          <LogoImage src={header.logo.src} alt={header.logo.alt} height={96} width={96} />
-          {location.pathname === '/' && (
-            <LogoTextContainer>
-              <LogoTitle>{header.title}</LogoTitle>
-              <LogoSubtitle>{header.subtitle}</LogoSubtitle>
-            </LogoTextContainer>
-          )}
+          <img src={`/logos/lexicon-${theme}.svg`} alt="Lexicon Logo" height={64} width={64} />
+          <LogoTextContainer>
+            <LogoTitle>{header.title}</LogoTitle>
+            <LogoSubtitle>{header.subtitle}</LogoSubtitle>
+          </LogoTextContainer>
         </LogoContainer>
         <NavContainer>
           <NavButtons>
diff --git a/packages/berlin/src/components/option-card/OptionCard.styled.tsx b/packages/berlin/src/components/option-card/OptionCard.styled.tsx
index eb97a35f..5a48ff92 100644
--- a/packages/berlin/src/components/option-card/OptionCard.styled.tsx
+++ b/packages/berlin/src/components/option-card/OptionCard.styled.tsx
@@ -1,26 +1,55 @@
-import styled from 'styled-components';
+import styled, { css } from 'styled-components';
 import { FlexRow } from '../containers/FlexRow.styled';
+import { FlexRowToColumn } from '../containers/FlexRowToColumn.styled';
+import { FlexColumn } from '../containers/FlexColumn.styled';
+import { Bold } from '../typography/Bold.styled';
 
-export const Card = styled(FlexRow)<{ $expanded: boolean }>`
-  border-bottom: 1px solid var(--color-black);
-  gap: 0;
+export const Card = styled.div<{ $expanded: boolean }>`
+  border-radius: 0.5rem;
+  border: 1px solid var(--color-black);
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  margin-block: 0.5rem;
+  padding: 2rem;
   width: 100%;
 
+  @media (min-width: 600px) {
+    margin: 0;
+    border: none;
+    border-radius: 0;
+    border-bottom: 1px solid var(--color-black);
+    flex-direction: row;
+    gap: 0;
+    padding: 0;
+  }
+
   .description {
     display: ${(props) => (props.$expanded ? 'flex' : 'none')};
-    padding: 1.5rem;
-    padding-top: 0;
+    @media (min-width: 600px) {
+      padding: 1.5rem;
+      padding-top: 0;
+    }
+  }
+`;
+
+export const Container = styled(FlexRowToColumn)`
+  gap: 1rem;
+  @media (min-width: 600px) {
+    gap: 0;
   }
 `;
 
 export const Proposal = styled(FlexRow)`
-  flex: 1;
-  min-width: 11rem;
-  padding: 1.5rem;
+  @media (min-width: 600px) {
+    flex: 1;
+    min-width: 11rem;
+    padding: 1.5rem;
+  }
 `;
 
 export const Author = styled(FlexRow)`
-  display: none;
+  gap: 0.25rem;
   @media (min-width: 600px) {
     display: flex;
     max-width: 10rem;
@@ -30,7 +59,7 @@ export const Author = styled(FlexRow)`
 `;
 
 export const Affiliation = styled(FlexRow)`
-  display: none;
+  gap: 0.25rem;
   @media (min-width: 600px) {
     display: flex;
     max-width: 10rem;
@@ -39,13 +68,74 @@ export const Affiliation = styled(FlexRow)`
   }
 `;
 
-export const Votes = styled(FlexRow)`
-  gap: 0.5rem;
-  max-width: 5rem;
-  padding: 1.5rem;
+export const Votes = styled(FlexRow)<{ $showScore: boolean | undefined }>`
+  @media (min-width: 600px) {
+    gap: 0.5rem;
+    max-width: 5rem;
+    padding: 1.5rem;
+  }
+
+  ${(props) =>
+    !props.$showScore &&
+    css`
+      border-bottom: 1px solid var(--color-black);
+      padding-bottom: 0.75rem;
+      @media (min-width: 600px) {
+        border: none;
+        padding: 1.5rem;
+      }
+    `}
+`;
+export const VotesIcon = styled(FlexColumn)`
+  width: 1.25rem;
+  :first-child {
+    height: 1.25rem;
+    width: 1.25rem;
+  }
+  @media (min-width: 600px) {
+    width: 1.5rem;
+    :first-child {
+      height: 1rem;
+      width: 1rem;
+    }
+  }
 `;
 
-// export const Plurality = styled(FlexRow)`
-//   max-width: 5.5rem;
-//   padding: 1.5rem;
-// `;
+export const Plurality = styled(FlexRow)`
+  border-bottom: 1px solid var(--color-black);
+  padding-bottom: 0.75rem;
+
+  @media (min-width: 600px) {
+    border: none;
+    gap: 0.5rem;
+    max-width: 5rem;
+    padding-bottom: 0;
+    padding: 1.5rem;
+  }
+`;
+
+export const PluralityIcon = styled.div`
+  display: block;
+  @media (min-width: 600px) {
+    display: none;
+  }
+`;
+
+export const ArrowIcon = styled(PluralityIcon)`
+  margin-left: auto;
+`;
+
+export const Field = styled(Bold)`
+  display: inline;
+  font-size: 1.125rem;
+  @media (min-width: 600px) {
+    display: none;
+  }
+`;
+
+export const ArrowDownIcon = styled.div`
+  display: none;
+  @media (min-width: 600px) {
+    display: block;
+  }
+`;
diff --git a/packages/berlin/src/components/option-card/OptionCard.tsx b/packages/berlin/src/components/option-card/OptionCard.tsx
index 3816d57a..1072de63 100644
--- a/packages/berlin/src/components/option-card/OptionCard.tsx
+++ b/packages/berlin/src/components/option-card/OptionCard.tsx
@@ -1,8 +1,20 @@
-import { Affiliation, Author, Card, Proposal, Votes } from './OptionCard.styled';
+import {
+  Affiliation,
+  ArrowDownIcon,
+  ArrowIcon,
+  Author,
+  Card,
+  Container,
+  Field,
+  Plurality,
+  PluralityIcon,
+  Proposal,
+  Votes,
+  VotesIcon,
+} from './OptionCard.styled';
 import { Body } from '../typography/Body.styled';
 import { Bold } from '../typography/Bold.styled';
 import { FlexColumn } from '../containers/FlexColumn.styled';
-import { FlexRow } from '../containers/FlexRow.styled';
 import { fetchOptionUsers, GetCycleResponse } from 'api';
 import { useAppStore } from '../../store';
 import { useNavigate, useParams } from 'react-router-dom';
@@ -13,16 +25,19 @@ import IconButton from '../icon-button';
 type OptionCardProps = {
   option: GetCycleResponse['forumQuestions'][number]['questionOptions'][number];
   showFundingRequest?: boolean;
+  showScore?: boolean;
   numOfVotes: number;
   onVote: () => void;
   onUnVote: () => void;
 };
+
 function OptionCard({
   option,
   numOfVotes,
   onVote,
   onUnVote,
   showFundingRequest = false,
+  showScore,
 }: OptionCardProps) {
   const { eventId, cycleId } = useParams();
   const theme = useAppStore((state) => state.theme);
@@ -33,14 +48,14 @@ function OptionCard({
     enabled: !!option.id,
   });
 
-  // const formattedPluralityScore = useMemo(() => {
-  //   const score = parseFloat(String(option.voteScore));
-  //   return score % 1 === 0 ? score.toFixed(0) : score.toFixed(1);
-  // }, [option.voteScore]);
+  const formattedPluralityScore = useMemo(() => {
+    const score = parseFloat(String(option.voteScore));
+    return score % 1 === 0 ? score.toFixed(0) : score.toFixed(1);
+  }, [option.voteScore]);
 
   const [expanded, setExpanded] = useState(false);
 
-  const author = `${option.user.firstName} ${option.user.lastName}`;
+  const author = option.user ? `${option.user?.firstName} ${option.user?.lastName}` : 'Anonymous';
 
   const handleCommentsClick = () => {
     navigate(`/events/${eventId}/cycles/${cycleId}/options/${option.id}`);
@@ -48,32 +63,39 @@ function OptionCard({
 
   const coauthors = useMemo(() => {
     return optionUsers?.group?.users?.filter(
-      (optionUser) => optionUser.username !== option.user.username,
+      (optionUser) => optionUser.username !== option.user?.username,
     );
-  }, [optionUsers, option.user.username]);
+  }, [optionUsers, option.user?.username]);
 
   return (
     <Card $expanded={expanded}>
       <FlexColumn>
-        <FlexRow $gap="0">
+        <Container>
           <Proposal>
-            <IconButton
-              $padding={4}
-              $color="secondary"
-              onClick={() => setExpanded((e) => !e)}
-              icon={{ src: `/icons/arrow-down-${theme}.svg`, alt: '' }}
-              $flipVertical={expanded}
-            />
+            <ArrowDownIcon>
+              <IconButton
+                $padding={4}
+                $color="secondary"
+                onClick={() => setExpanded((e) => !e)}
+                icon={{ src: `/icons/arrow-down-${theme}.svg`, alt: 'Arrow down' }}
+                $flipVertical={expanded}
+              />
+            </ArrowDownIcon>
             <Body>{option.optionTitle}</Body>
           </Proposal>
           <Author>
+            <Field>Lead:</Field>
             <Body>{author}</Body>
           </Author>
           <Affiliation>
-            <Body>{option.user?.group?.name}</Body>
+            <Field>Affiliation:</Field>
+            <Body>
+              {option.user?.groups?.find((group) => group.groupCategory?.required)?.name ??
+                'No affiliation'}
+            </Body>
           </Affiliation>
-          <Votes>
-            <FlexColumn $gap="-4px">
+          <Votes $showScore={showScore}>
+            <VotesIcon $gap="-4px">
               <IconButton
                 $padding={0}
                 $color="secondary"
@@ -91,10 +113,42 @@ function OptionCard({
                 $height={16}
                 disabled={numOfVotes === 0}
               />
-            </FlexColumn>
+            </VotesIcon>
             <Body>{numOfVotes}</Body>
+            {!showScore && (
+              <ArrowIcon>
+                <IconButton
+                  $padding={4}
+                  $color="secondary"
+                  onClick={() => setExpanded((e) => !e)}
+                  icon={{ src: `/icons/arrow-down-${theme}.svg`, alt: 'Arrow down' }}
+                  $flipVertical={expanded}
+                />
+              </ArrowIcon>
+            )}
           </Votes>
-        </FlexRow>
+          {showScore && (
+            <Plurality>
+              <PluralityIcon>
+                <IconButton
+                  $padding={0}
+                  $color="secondary"
+                  icon={{ src: `/icons/plurality-score.svg`, alt: 'Plurality score' }}
+                />
+              </PluralityIcon>
+              {formattedPluralityScore}
+              <ArrowIcon>
+                <IconButton
+                  $padding={4}
+                  $color="secondary"
+                  onClick={() => setExpanded((e) => !e)}
+                  icon={{ src: `/icons/arrow-down-${theme}.svg`, alt: 'Arrow down' }}
+                  $flipVertical={expanded}
+                />
+              </ArrowIcon>
+            </Plurality>
+          )}
+        </Container>
         <FlexColumn className="description" $gap="1.5rem">
           {coauthors && coauthors.length > 0 && (
             <Body>
diff --git a/packages/berlin/src/components/table/Table.styled.tsx b/packages/berlin/src/components/table/Table.styled.tsx
index b399c73d..bdc199f3 100644
--- a/packages/berlin/src/components/table/Table.styled.tsx
+++ b/packages/berlin/src/components/table/Table.styled.tsx
@@ -1,10 +1,15 @@
 import styled from 'styled-components';
+import { FlexColumn } from '../containers/FlexColumn.styled';
 
 export const TableContainer = styled.table`
-  width: 100%;
-  border-collapse: collapse;
-  margin-bottom: 2rem;
-  table-layout: fixed;
+  display: none;
+  @media (min-width: 600px) {
+    border-collapse: collapse;
+    display: table;
+    margin-bottom: 2rem;
+    table-layout: fixed;
+    width: 100%;
+  }
 `;
 
 export const TableHeader = styled.th`
@@ -24,3 +29,24 @@ export const TableCell = styled.td`
 export const TableRow = styled.tr`
   border-bottom: 1px solid var(--color-black);
 `;
+
+export const Cards = styled(FlexColumn)`
+  width: 100%;
+  @media (min-width: 600px) {
+    display: none;
+  }
+`;
+
+export const Card = styled.article`
+  border-radius: 0.5rem;
+  border: 1px solid var(--color-black);
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  padding: 2rem;
+  width: 100%;
+
+  @media (min-width: 600px) {
+    display: none;
+  }
+`;
diff --git a/packages/berlin/src/components/table/Table.tsx b/packages/berlin/src/components/table/Table.tsx
index abb6fd79..aba91d95 100644
--- a/packages/berlin/src/components/table/Table.tsx
+++ b/packages/berlin/src/components/table/Table.tsx
@@ -1,30 +1,43 @@
 import { Body } from '../typography/Body.styled';
-import { TableContainer, TableCell, TableHeader, TableRow } from './Table.styled';
+import { Subtitle } from '../typography/Subtitle.styled';
+import { TableContainer, TableCell, TableHeader, TableRow, Card, Cards } from './Table.styled';
 
 function Table({ columns, rows }: { columns: string[]; rows: (string | React.ReactNode)[][] }) {
   return (
-    <TableContainer>
-      <thead>
-        <TableRow>
-          {columns.map((column) => (
-            <TableHeader key={column}>
-              <Body>{column}</Body>
-            </TableHeader>
+    <>
+      <TableContainer>
+        <thead>
+          <TableRow>
+            {columns.map((column) => (
+              <TableHeader key={column}>
+                <Body>{column}</Body>
+              </TableHeader>
+            ))}
+          </TableRow>
+        </thead>
+        <tbody>
+          {rows.map((row, index) => (
+            <TableRow key={index}>
+              {row.map((data, index) => (
+                <TableCell key={index}>
+                  <Body>{data}</Body>
+                </TableCell>
+              ))}
+            </TableRow>
           ))}
-        </TableRow>
-      </thead>
-      <tbody>
+        </tbody>
+      </TableContainer>
+      <Cards>
+        <Subtitle>{columns.at(0)}</Subtitle>
         {rows.map((row, index) => (
-          <TableRow key={index}>
+          <Card key={index}>
             {row.map((data, index) => (
-              <TableCell key={index}>
-                <Body>{data}</Body>
-              </TableCell>
+              <Body key={index}>{data}</Body>
             ))}
-          </TableRow>
+          </Card>
         ))}
-      </tbody>
-    </TableContainer>
+      </Cards>
+    </>
   );
 }
 
diff --git a/packages/berlin/src/components/tables/groups-table/GroupsTable.tsx b/packages/berlin/src/components/tables/groups-table/GroupsTable.tsx
index 9ba3d51c..192cd47c 100644
--- a/packages/berlin/src/components/tables/groups-table/GroupsTable.tsx
+++ b/packages/berlin/src/components/tables/groups-table/GroupsTable.tsx
@@ -102,11 +102,7 @@ function GroupCard({ userToGroup, theme, onLeaveGroup }: GroupCardProps) {
         <Body>No secret</Body>
       )}
       <Dialog
-        trigger={
-          <Button disabled $alignSelf="flex-start">
-            Leave
-          </Button>
-        }
+        trigger={<Button $alignSelf="flex-start">Leave</Button>}
         title="Are you sure?"
         description={`This action cannot be undone. This will remove you from group ${userToGroup.group.name}.`}
         onActionClick={() => onLeaveGroup(userToGroup.id)}
diff --git a/packages/berlin/src/components/tables/results-table/ResultsTable.styled.tsx b/packages/berlin/src/components/tables/results-table/ResultsTable.styled.tsx
index d7735be8..b3064f04 100644
--- a/packages/berlin/src/components/tables/results-table/ResultsTable.styled.tsx
+++ b/packages/berlin/src/components/tables/results-table/ResultsTable.styled.tsx
@@ -1,19 +1,104 @@
-import styled from 'styled-components';
+import styled, { css } from 'styled-components';
 import { Grid } from '../../containers/Grid.styled';
+import { FlexColumn } from '../../containers/FlexColumn.styled';
+import { FlexRow } from '../../containers/FlexRow.styled';
+
+export const Column = styled(FlexColumn)`
+  gap: 1rem;
+  @media (min-width: 600px) {
+    gap: 0;
+  }
+`;
 
 export const Card = styled(Grid)<{ $expanded: boolean; $showFunding: boolean }>`
-  border-bottom: 1px solid var(--color-black);
-  cursor: pointer;
-  grid-template-columns: ${(props) =>
-    props.$showFunding ? 'auto repeat(3, 48px) 100px' : 'auto repeat(3, 48px)'};
-  overflow: hidden;
-  padding: 1.5rem;
-  position: relative;
-  transition: height 0.3s ease-in-out;
-  width: 100%;
+  border-radius: 0.5rem;
+  border: 1px solid var(--color-black);
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  padding: 2rem;
+
+  @media (min-width: 600px) {
+    border-radius: 0;
+    border: none;
+    border-bottom: 1px solid var(--color-black);
+    cursor: pointer;
+    display: grid;
+    grid-template-columns: ${(props) =>
+      props.$showFunding ? 'auto repeat(3, 48px) 100px' : 'auto repeat(3, 48px)'};
+    overflow: hidden;
+    padding: 0rem;
+    padding: 1.5rem;
+    position: relative;
+    transition: height 0.3s ease-in-out;
+    width: 100%;
+  }
 
   .description {
     display: ${(props) => (props.$expanded ? 'flex' : 'none')};
     grid-column: ${(props) => (props.$showFunding ? '1/6' : '1/5')};
   }
 `;
+
+export const TitleContainer = styled(FlexRow)`
+  :first-child {
+    display: none;
+  }
+  @media (min-width: 600px) {
+    :first-child {
+      display: inline;
+    }
+  }
+`;
+
+export const Icon = styled.div`
+  display: inline;
+
+  @media (min-width: 600px) {
+    display: none;
+  }
+`;
+
+export const Plurality = styled(FlexRow)<{ $showFunding: boolean }>`
+  padding-bottom: 0.75rem;
+  border-bottom: 1px solid var(--color-black);
+
+  :last-child {
+    margin-left: auto;
+  }
+
+  @media (min-width: 600px) {
+    border: none;
+    padding: 0;
+    :last-child {
+      display: none;
+    }
+  }
+
+  ${(props) =>
+    props.$showFunding &&
+    css`
+      border: none;
+      :nth-child(3) {
+        display: none;
+      }
+    `}
+`;
+
+export const Funding = styled(FlexRow)<{ $expanded: boolean; $showFunding: boolean }>`
+  display: ${(props) => (props.$showFunding ? 'flex' : 'none')};
+  padding-bottom: 0.75rem;
+  border-bottom: 1px solid var(--color-black);
+
+  :last-child {
+    margin-left: auto;
+  }
+
+  @media (min-width: 600px) {
+    border: none;
+    padding: 0;
+    :last-child {
+      display: none;
+    }
+  }
+`;
diff --git a/packages/berlin/src/components/tables/results-table/ResultsTable.tsx b/packages/berlin/src/components/tables/results-table/ResultsTable.tsx
index 2fd1a1d8..6e4487fc 100644
--- a/packages/berlin/src/components/tables/results-table/ResultsTable.tsx
+++ b/packages/berlin/src/components/tables/results-table/ResultsTable.tsx
@@ -1,6 +1,6 @@
 // React and third-party libraries
-import { useMemo } from 'react';
 import { useQuery } from '@tanstack/react-query';
+import { useMemo } from 'react';
 
 // API
 import { fetchOptionUsers, fetchRegistrationData, fetchRegistrationFields } from 'api';
@@ -9,15 +9,15 @@ import { fetchOptionUsers, fetchRegistrationData, fetchRegistrationFields } from
 import { useAppStore } from '../../../store';
 
 // Components
-import { Body } from '../../typography/Body.styled';
-import { Bold } from '../../typography/Bold.styled';
 import { FlexColumn } from '../../containers/FlexColumn.styled';
 import { FlexRow } from '../../containers/FlexRow.styled';
 import IconButton from '../../icon-button';
+import { Body } from '../../typography/Body.styled';
+import { Bold } from '../../typography/Bold.styled';
 
 // Styled Components
-import { Card } from './ResultsTable.styled';
 import { useNavigate } from 'react-router-dom';
+import { Card, Funding, Icon, Plurality, TitleContainer } from './ResultsTable.styled';
 
 type ResultsTableProps = {
   $expanded: boolean;
@@ -90,25 +90,74 @@ function ResultsTable({ $expanded, option, onClick, cycleId, eventId }: ResultsT
   };
 
   return (
-    <Card
-      $expanded={$expanded}
-      $showFunding={option.allocatedFunding !== null}
-      onClick={onClick}
-      $rowgap="2rem"
-    >
-      <FlexRow>
+    <Card $expanded={$expanded} $showFunding={option.allocatedFunding !== null} $rowgap="2rem">
+      <TitleContainer>
         <IconButton
           $padding={0}
           $color="secondary"
           icon={{ src: `/icons/arrow-down-${theme}.svg`, alt: '' }}
           $flipVertical={$expanded}
+          onClick={onClick}
         />
         <Body>{option.optionTitle}</Body>
+      </TitleContainer>
+      <FlexRow>
+        <Icon>
+          <IconButton
+            $padding={0}
+            $color="secondary"
+            icon={{ src: `/icons/heart-full.svg`, alt: 'Hearts' }}
+          />
+        </Icon>
+        <Body>{option.allocatedHearts}</Body>
+      </FlexRow>
+      <FlexRow>
+        <Icon>
+          <IconButton
+            $padding={0}
+            $color="secondary"
+            icon={{ src: `/icons/sqrt-${theme}.svg`, alt: 'Quadratic score' }}
+          />
+        </Icon>
+        <Body>{formattedQuadraticScore}</Body>
       </FlexRow>
-      <Body>{option.allocatedHearts}</Body>
-      <Body>{formattedQuadraticScore}</Body>
-      <Body>{formattedPluralityScore}</Body>
-      {option.allocatedFunding !== null && <Body>{option.allocatedFunding} ARB</Body>}
+      <Plurality $showFunding={option.allocatedFunding !== null} onClick={onClick}>
+        <Icon>
+          <IconButton
+            $padding={0}
+            $color="secondary"
+            icon={{ src: `/icons/plurality-score.svg`, alt: 'Plurality score' }}
+          />
+        </Icon>
+        <Body>{formattedPluralityScore}</Body>
+        <IconButton
+          $padding={0}
+          $color="secondary"
+          icon={{ src: `/icons/arrow-down-${theme}.svg`, alt: '' }}
+          $flipVertical={$expanded}
+        />
+      </Plurality>
+      <Funding
+        $expanded={$expanded}
+        $showFunding={option.allocatedFunding !== null}
+        onClick={onClick}
+      >
+        <Icon>
+          <IconButton
+            $padding={0}
+            $color="secondary"
+            icon={{ src: `/logos/arbitrum-${theme}.svg`, alt: 'Arbitrum' }}
+          />
+        </Icon>
+        <Body>{option.allocatedFunding} ARB</Body>
+
+        <IconButton
+          $padding={0}
+          $color="secondary"
+          icon={{ src: `/icons/arrow-down-${theme}.svg`, alt: '' }}
+          $flipVertical={$expanded}
+        />
+      </Funding>
       <FlexColumn className="description">
         <Body>{option.optionSubTitle}</Body>
         <Body>
diff --git a/packages/berlin/src/components/textarea/Textarea.tsx b/packages/berlin/src/components/textarea/Textarea.tsx
index 2c84bb24..47412e3c 100644
--- a/packages/berlin/src/components/textarea/Textarea.tsx
+++ b/packages/berlin/src/components/textarea/Textarea.tsx
@@ -5,14 +5,16 @@ import Label from '../typography/Label';
 
 // Styled Components
 import { StyledTextarea } from './Textarea.styled';
+import { Error } from '../typography/Error.styled';
 
 interface TextareaProps extends React.InputHTMLAttributes<HTMLTextAreaElement> {
   label: string;
   $required?: boolean;
+  errors?: string[];
 }
 
 const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
-  ({ label, $required, ...props }, ref) => {
+  ({ label, $required, errors, ...props }, ref) => {
     return (
       <FlexColumn>
         {label && (
@@ -21,6 +23,13 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
           </Label>
         )}
         <StyledTextarea {...props} name={props.name} ref={ref} />
+        {errors && errors?.length > 0 && errors[0] !== '' && (
+          <FlexColumn $gap="0.25rem">
+            {errors.map((error, i) => (
+              <Error key={i}>{error}</Error>
+            ))}
+          </FlexColumn>
+        )}
       </FlexColumn>
     );
   },
diff --git a/packages/berlin/src/pages/Account.tsx b/packages/berlin/src/pages/Account.tsx
index 99ee3f09..47ea2897 100644
--- a/packages/berlin/src/pages/Account.tsx
+++ b/packages/berlin/src/pages/Account.tsx
@@ -1,92 +1,36 @@
 // React and third-party libraries
-import { Controller, useFieldArray, useForm, useWatch } from 'react-hook-form';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useNavigate } from 'react-router-dom';
+import { useForm } from 'react-hook-form';
 import toast from 'react-hot-toast';
+import { useNavigate } from 'react-router-dom';
 
 // API Calls
-import {
-  type GetUserResponse,
-  fetchEvents,
-  fetchGroups,
-  fetchUserAttributes,
-  fetchUsersToGroups,
-  putUser,
-  putUsersToGroups,
-  postUsersToGroups,
-  GetGroupsResponse,
-  GetEventsResponse,
-} from 'api';
+import { GetEventsResponse, fetchEvents, putUser, type GetUserResponse } from 'api';
 
 // Components
-import { FlexColumn } from '../components/containers/FlexColumn.styled';
-import { FlexRowToColumn } from '../components/containers/FlexRowToColumn.styled';
-import { Title } from '../components/typography/Title.styled';
-import { Subtitle } from '../components/typography/Subtitle.styled';
 import Button from '../components/button';
-import IconButton from '../components/icon-button';
+import { FlexColumn } from '../components/containers/FlexColumn.styled';
 import Input from '../components/input';
-import Label from '../components/typography/Label';
-import Select from '../components/select';
+import { Subtitle } from '../components/typography/Subtitle.styled';
+import { Title } from '../components/typography/Title.styled';
 
 // Hooks
 import useUser from '../hooks/useUser';
 
-import { formatGroups } from '../utils/formatGroups';
-
 // Store
-import { useAppStore } from '../store';
-import { Body } from '../components/typography/Body.styled';
 import { useEffect, useMemo } from 'react';
-
-const ACADEMIC_CREDENTIALS = ['Bachelors', 'Masters', 'PhD', 'JD', 'None'];
-
-type CredentialsGroup = {
-  credential: string;
-  institution: string;
-  field: string;
-}[];
-
-type UserAttributes = {
-  role: string;
-  customGroupName?: string;
-  publications: { value: string }[];
-  contributions: { value: string }[];
-  credentialsGroup: CredentialsGroup;
-};
+import { FlexRowToColumn } from '../components/containers/FlexRowToColumn.styled';
 
 type InitialUser = {
   username: string;
   firstName: string;
   lastName: string;
   email: string;
-  userToGroupId?: string;
-  groupId: string;
-  telegram: string | null;
-  userAttributes: UserAttributes | undefined;
 };
 
 function Account() {
   const { user, isLoading: userIsLoading } = useUser();
 
-  const { data: groups } = useQuery({
-    queryKey: ['group-categories', 'affiliation', 'groups'],
-    queryFn: () => fetchGroups({ groupCategoryName: 'affiliation' }),
-    enabled: !!user?.id,
-  });
-
-  const { data: usersToGroups, isLoading: userGroupsIsLoading } = useQuery({
-    queryKey: ['user', user?.id, 'users-to-groups'],
-    queryFn: () => fetchUsersToGroups(user?.id || ''),
-    enabled: !!user?.id,
-  });
-
-  const { data: userAttributes, isLoading: userAttributesIsLoading } = useQuery({
-    queryKey: ['user', user?.id, 'attributes'],
-    queryFn: () => fetchUserAttributes(user?.id || ''),
-    enabled: !!user?.id,
-  });
-
   const { data: events } = useQuery({
     queryKey: ['events'],
     queryFn: fetchEvents,
@@ -99,69 +43,26 @@ function Account() {
       firstName: user?.firstName || '',
       lastName: user?.lastName || '',
       email: user?.email || '',
-      telegram: user?.telegram || null,
-      userToGroupId: usersToGroups?.find((g) => g.group.groupCategory?.name === 'affiliation')?.id,
-      groupId:
-        usersToGroups?.find((g) => g.group.groupCategory?.name === 'affiliation')?.group.id || '',
-      userAttributes: userAttributes?.reduce(
-        (acc, curr) => {
-          if (curr.attributeKey === 'credentialsGroup') {
-            const json = JSON.parse(curr.attributeValue) as CredentialsGroup;
-            acc.credentialsGroup = json;
-            return acc;
-          } else if (
-            curr.attributeKey === 'publications' ||
-            curr.attributeKey === 'contributions'
-          ) {
-            const json = JSON.parse(curr.attributeValue) as { value: string }[];
-            acc[curr.attributeKey] = json;
-            return acc;
-          } else {
-            acc[
-              curr.attributeKey as keyof Omit<
-                UserAttributes,
-                'credentialsGroup' | 'publications' | 'contributions'
-              >
-            ] = curr.attributeValue;
-            return acc;
-          }
-        },
-        {
-          role: '',
-          publications: [{ value: '' }],
-          contributions: [{ value: '' }],
-          credentialsGroup: [
-            {
-              credential: '',
-              institution: '',
-              field: '',
-            },
-          ],
-        } as UserAttributes,
-      ),
     };
-  }, [user, usersToGroups, userAttributes]);
+  }, [user]);
 
-  if (userIsLoading || userGroupsIsLoading || userAttributesIsLoading) {
+  if (userIsLoading) {
     return <Title>Loading...</Title>;
   }
 
-  return <AccountForm initialUser={initialUser} user={user} groups={groups} events={events} />;
+  return <AccountForm initialUser={initialUser} user={user} events={events} />;
 }
 
 function AccountForm({
   initialUser,
   user,
-  groups,
   events,
 }: {
   initialUser: InitialUser;
   user: GetUserResponse | null | undefined;
-  groups: GetGroupsResponse[] | null | undefined;
   events: GetEventsResponse | null | undefined;
 }) {
   const navigate = useNavigate();
-  const theme = useAppStore((state) => state.theme);
   const queryClient = useQueryClient();
 
   const { mutate: mutateUserData } = useMutation({
@@ -190,46 +91,11 @@ function AccountForm({
     },
   });
 
-  const { mutate: mutatePostUsersToGroups } = useMutation({
-    mutationFn: postUsersToGroups,
-    onSuccess: async (body) => {
-      if (!body) {
-        return;
-      }
-
-      if ('errors' in body) {
-        toast.error(`There was an error: ${body.errors.join(', ')}`);
-        return;
-      }
-
-      await queryClient.invalidateQueries({ queryKey: ['user', user?.id, 'users-to-groups'] });
-    },
-  });
-
-  const { mutate: mutatePutUsersToGroups } = useMutation({
-    mutationFn: putUsersToGroups,
-    onSuccess: async (body) => {
-      if (!body) {
-        return;
-      }
-
-      if ('errors' in body) {
-        toast.error(`There was an error: ${body.errors.join(', ')}`);
-        return;
-      }
-
-      await queryClient.invalidateQueries({ queryKey: ['user', user?.id, 'users-to-groups'] });
-    },
-  });
-
   const {
-    control,
     register,
     formState: { errors, isValid, isSubmitting },
     handleSubmit,
-    setValue,
     reset,
-    trigger,
   } = useForm({
     defaultValues: useMemo(() => initialUser, [initialUser]),
     mode: 'all',
@@ -239,39 +105,6 @@ function AccountForm({
     reset(initialUser);
   }, [initialUser, reset]);
 
-  const {
-    fields: fieldsCredentialsGroup,
-    remove: removeCredentialsGroup,
-    insert: insertCredentialsGroup,
-  } = useFieldArray({
-    name: 'userAttributes.credentialsGroup' as const,
-    control,
-  });
-
-  const {
-    fields: fieldsPublications,
-    remove: removePublications,
-    insert: insertPublications,
-  } = useFieldArray({
-    name: 'userAttributes.publications' as const,
-    control,
-  });
-
-  const {
-    fields: fieldsContributions,
-    remove: removeContributions,
-    insert: insertContributions,
-  } = useFieldArray({
-    name: 'userAttributes.contributions' as const,
-    control,
-  });
-
-  const watchedGroupInputId = useWatch({ control, name: 'groupId' });
-  const customGroupName = 'Custom Affiliation';
-  const customGroup = groups?.find(
-    (group) => group.name.toLocaleLowerCase() === customGroupName.toLocaleLowerCase(),
-  );
-
   const onSubmit = async (value: typeof initialUser) => {
     if (isValid && user && user.id) {
       await mutateUserData({
@@ -280,56 +113,8 @@ function AccountForm({
         email: value.email,
         firstName: value.firstName,
         lastName: value.lastName,
-        telegram: value.telegram?.trim() !== '' ? value.telegram?.trim() : null,
-        userAttributes: {
-          ...value.userAttributes,
-          credentialsGroup: JSON.stringify(value.userAttributes?.credentialsGroup),
-          publications: JSON.stringify(value.userAttributes?.publications),
-          contributions: JSON.stringify(value.userAttributes?.contributions),
-        },
       });
-
-      // Create user to group if it doesn't exist
-      if (!value.userToGroupId) {
-        await mutatePostUsersToGroups({
-          groupId: value.groupId,
-        });
-      } else {
-        await mutatePutUsersToGroups({
-          groupId: value.groupId,
-          userToGroupId: value.userToGroupId,
-        });
-      }
-    }
-  };
-
-  const credentialOnChange = (value: string, i: number) => {
-    if (value === 'None') {
-      setValue(`userAttributes.credentialsGroup.${i}.institution`, 'None');
-      setValue(`userAttributes.credentialsGroup.${i}.field`, 'None');
-      // Manually trigger validation
-      trigger(`userAttributes.credentialsGroup.${i}.institution`);
-      trigger(`userAttributes.credentialsGroup.${i}.field`);
-    }
-  };
-
-  const groupOnCreate = (
-    groups: GetGroupsResponse[] | null | undefined,
-    customGroupName: string,
-    value: string,
-  ) => {
-    const customGroup = groups?.find(
-      (group) => group.name.toLocaleLowerCase() === customGroupName.toLocaleLowerCase(),
-    );
-
-    if (customGroup) {
-      // set group to custom group id
-      setValue('groupId', customGroup?.id);
-      trigger('groupId');
     }
-    // set otherGroupName to value
-    setValue('userAttributes.customGroupName', value);
-    trigger('userAttributes.customGroupName');
   };
 
   return (
@@ -337,6 +122,24 @@ function AccountForm({
       <Subtitle>Complete your registration</Subtitle>
       <form onSubmit={handleSubmit(onSubmit)} style={{ width: '100%' }}>
         <FlexColumn>
+          <FlexRowToColumn>
+            <Input
+              label="First name"
+              autoComplete="off"
+              placeholder="Enter your first name"
+              required
+              {...register('firstName', { required: 'First name is required' })}
+              errors={errors.firstName ? [errors.firstName.message ?? ''] : []}
+            />
+            <Input
+              label="Last name"
+              autoComplete="off"
+              placeholder="Enter your last name"
+              required
+              {...register('lastName', { required: 'Last name is required' })}
+              errors={errors.lastName ? [errors.lastName.message ?? ''] : []}
+            />
+          </FlexRowToColumn>
           <Input
             label="Username"
             placeholder="Enter your Username"
@@ -345,182 +148,8 @@ function AccountForm({
             {...register('username', { required: 'Username is required', minLength: 3 })}
             errors={errors.username ? [errors.username.message ?? ''] : []}
           />
-          <Input
-            label="First name"
-            autoComplete="off"
-            placeholder="Enter your first name"
-            required
-            {...register('firstName', { required: 'First name is required' })}
-            errors={errors.firstName ? [errors.firstName.message ?? ''] : []}
-          />
-          <Input
-            label="Last name"
-            autoComplete="off"
-            placeholder="Enter your last name"
-            required
-            {...register('lastName', { required: 'Last name is required' })}
-            errors={errors.lastName ? [errors.lastName.message ?? ''] : []}
-          />
           <Input label="Email" placeholder="Enter your Email" {...register('email')} />
-          <Input
-            label="Telegram"
-            autoComplete="off"
-            placeholder="Enter your Telegram handle (e.g., @username)"
-            {...register('telegram')}
-          />
-          <Controller
-            name="groupId"
-            control={control}
-            rules={{ required: 'Affiliation is required' }}
-            render={({ field }) => (
-              <FlexColumn $gap="0.5rem">
-                <Select
-                  options={formatGroups(groups).map((group) => ({
-                    name: group.name,
-                    id: group.id,
-                  }))}
-                  label="Affiliation"
-                  placeholder={field.value ? field.value : 'Select or create affiliation'}
-                  required
-                  onChange={field.onChange}
-                  onBlur={field.onBlur}
-                  onOptionCreate={(value) => groupOnCreate(groups, customGroupName, value)}
-                  value={field.value}
-                  errors={[errors.groupId?.message ?? '']}
-                />
-                {watchedGroupInputId === customGroup?.id &&
-                  initialUser.userAttributes?.customGroupName && (
-                    <Body>
-                      Your chosen affiliation, {initialUser.userAttributes?.customGroupName}, is
-                      being processed and will be updated shortly
-                    </Body>
-                  )}
-              </FlexColumn>
-            )}
-          />
-          <Input
-            label="Role"
-            placeholder="Enter your role (e.g., Founder, Researcher)"
-            {...register('userAttributes.role')}
-          />
-          <FlexColumn $gap="0.5rem">
-            <Label $required>Academic Credentials</Label>
-            {fieldsCredentialsGroup.map((field, i) => (
-              <FlexRowToColumn key={field.id}>
-                <Controller
-                  name={
-                    `userAttributes.credentialsGroup.${i}.credential` as `userAttributes.credentialsGroup.${number}.credential`
-                  }
-                  control={control}
-                  rules={{ required: 'Credential is required' }}
-                  render={({ field }) => (
-                    <Select
-                      options={
-                        ACADEMIC_CREDENTIALS.map((credential) => ({
-                          name: credential,
-                          id: credential,
-                        })) || []
-                      }
-                      onChange={(value) => {
-                        field.onChange(value);
-                        // Check if selected credential is 'None' and set default values accordingly
-                        credentialOnChange(value, i);
-                      }}
-                      onBlur={field.onBlur}
-                      value={field.value}
-                      onOptionCreate={field.onChange}
-                      placeholder={field.value ? field.value : 'Select or create credential'}
-                      errors={[
-                        errors.userAttributes?.credentialsGroup?.[i]?.credential?.message ?? '',
-                      ]}
-                      $minWidth="208px"
-                    />
-                  )}
-                />
-                <Input
-                  placeholder="Institution (e.g., MIT)"
-                  {...register(`userAttributes.credentialsGroup.${i}.institution` as const, {
-                    required: 'Institution is required',
-                  })}
-                  errors={[
-                    errors.userAttributes?.credentialsGroup?.[i]?.institution?.message ?? '',
-                  ]}
-                />
-                <Input
-                  placeholder="Field (e.g., Economics)"
-                  {...register(`userAttributes.credentialsGroup.${i}.field` as const, {
-                    required: 'Field is required',
-                  })}
-                  errors={[errors.userAttributes?.credentialsGroup?.[i]?.field?.message ?? '']}
-                />
-                <IconButton
-                  $padding={0}
-                  onClick={() => removeCredentialsGroup(i)}
-                  $color="secondary"
-                  icon={{ src: `/icons/trash-${theme}.svg`, alt: 'Trash icon' }}
-                />
-              </FlexRowToColumn>
-            ))}
-            <IconButton
-              $padding={0}
-              onClick={() => {
-                insertCredentialsGroup(fieldsCredentialsGroup.length, {
-                  credential: '',
-                  institution: '',
-                  field: '',
-                });
-              }}
-              $color="secondary"
-              icon={{ src: `/icons/add-${theme}.svg`, alt: 'Add icon' }}
-            />
-          </FlexColumn>
-          <FlexColumn $gap="0.5rem">
-            <Label>Publications</Label>
-            {fieldsPublications.map((field, i) => (
-              <FlexRowToColumn key={field.id}>
-                <Input
-                  placeholder="Add a relevant paper as a URL"
-                  {...register(`userAttributes.publications.${i}.value` as const)}
-                />
-                <IconButton
-                  $padding={0}
-                  onClick={() => removePublications(i)}
-                  $color="secondary"
-                  icon={{ src: `/icons/trash-${theme}.svg`, alt: 'Trash icon' }}
-                />
-              </FlexRowToColumn>
-            ))}
-            <IconButton
-              $padding={0}
-              onClick={() => insertPublications(fieldsPublications.length, { value: '' })}
-              $color="secondary"
-              icon={{ src: `/icons/add-${theme}.svg`, alt: 'Add icon' }}
-            />
-          </FlexColumn>
-          <FlexColumn $gap="0.5rem">
-            <Label>Contributions to MEV</Label>
-            {fieldsContributions.map((field, i) => (
-              <FlexRowToColumn key={field.id}>
-                <Input
-                  placeholder="Add an MEV contribution as a URL"
-                  {...register(`userAttributes.contributions.${i}.value` as const)}
-                />
-                <IconButton
-                  $padding={0}
-                  onClick={() => removeContributions(i)}
-                  $color="secondary"
-                  icon={{ src: `/icons/trash-${theme}.svg`, alt: 'Trash icon' }}
-                />
-              </FlexRowToColumn>
-            ))}
-            <IconButton
-              $padding={0}
-              onClick={() => insertContributions(fieldsContributions.length, { value: '' })}
-              $color="secondary"
-              icon={{ src: `/icons/add-${theme}.svg`, alt: 'Add icon' }}
-            />
-          </FlexColumn>
-          <Button type="submit" disabled={isSubmitting || true}>
+          <Button type="submit" disabled={isSubmitting}>
             Submit
           </Button>
         </FlexColumn>
diff --git a/packages/berlin/src/pages/Cycle.tsx b/packages/berlin/src/pages/Cycle.tsx
index 2fe0557b..a625aa85 100644
--- a/packages/berlin/src/pages/Cycle.tsx
+++ b/packages/berlin/src/pages/Cycle.tsx
@@ -219,8 +219,8 @@ function Cycle() {
   };
 
   const sortByLead = (a: QuestionOption, b: QuestionOption, order: Order) => {
-    const leadA = (a.user.lastName || a.user.username).toUpperCase();
-    const leadB = (b.user.lastName || b.user.username).toUpperCase();
+    const leadA = (a.user?.lastName || a.user?.username || '').toUpperCase();
+    const leadB = (b.user?.lastName || b.user?.username || '').toUpperCase();
 
     if (leadA === leadB) {
       return sortId(a, b, order);
@@ -230,8 +230,10 @@ function Cycle() {
   };
 
   const sortByAffiliation = (a: QuestionOption, b: QuestionOption, order: Order) => {
-    const affiliationA = a.user.group?.name.toUpperCase();
-    const affiliationB = b.user.group?.name.toUpperCase() ?? '';
+    const affiliationA =
+      a.user?.groups?.find((group) => group.groupCategory?.required)?.name.toUpperCase() ?? '';
+    const affiliationB =
+      b.user?.groups?.find((group) => group.groupCategory?.required)?.name.toUpperCase() ?? '';
 
     if (affiliationA === affiliationB) {
       return sortId(a, b, order);
@@ -324,7 +326,7 @@ function Cycle() {
       </FlexColumn>
       {currentCycle?.questionOptions.length ? (
         <FlexColumn $gap="0">
-          <CycleColumns onColumnClick={handleColumnClick} />
+          <CycleColumns onColumnClick={handleColumnClick} showScore={currentCycle.showScore} />
           {sortedOptions.options.map((option) => {
             const userVote = localUserVotes.find((vote) => vote.optionId === option.id);
             const numOfVotes = userVote ? userVote.numOfVotes : 0;
@@ -334,6 +336,7 @@ function Cycle() {
                 option={option}
                 numOfVotes={numOfVotes}
                 showFundingRequest={currentCycle.questionTitle === FINAL_QUESTION_TITLE}
+                showScore={currentCycle.showScore}
                 onVote={() => handleVoteWrapper(option.id)}
                 onUnVote={() => handleUnVoteWrapper(option.id)}
               />
diff --git a/packages/berlin/src/pages/Event.tsx b/packages/berlin/src/pages/Event.tsx
index cd44ab0d..1930710e 100644
--- a/packages/berlin/src/pages/Event.tsx
+++ b/packages/berlin/src/pages/Event.tsx
@@ -54,7 +54,7 @@ function Event() {
       {/* <BackButton /> */}
       {!!openCycles?.length && <CycleTable cycles={openCycles} status="open" />}
       {!!closedCycles?.length && <CycleTable cycles={closedCycles} status="closed" />}
-      {event && <EventCard event={event} $direction="row" />}
+      {event && <EventCard event={event} />}
       <Body>
         Click to revisit the{' '}
         <Link
@@ -102,22 +102,20 @@ function CycleTable({ cycles, status }: { cycles: GetCycleResponse[]; status: 'o
   };
 
   return (
-    <div>
-      <Table
-        columns={[
-          `${status.charAt(0).toUpperCase() + status.slice(1)} Agendas`,
-          formattedColumnText(),
-          '',
-        ]}
-        rows={cycles.map((cycle) => [
-          cycle.forumQuestions?.[0]?.questionTitle,
-          formatDate(cycle.endAt),
-          <Button onClick={() => handleClick(cycle.id)}>
-            {status === 'open' ? 'Vote' : 'Results'}
-          </Button>,
-        ])}
-      />
-    </div>
+    <Table
+      columns={[
+        `${status.charAt(0).toUpperCase() + status.slice(1)} Agendas`,
+        formattedColumnText(),
+        '',
+      ]}
+      rows={cycles.map((cycle) => [
+        cycle.forumQuestions?.[0]?.questionTitle,
+        formatDate(cycle.endAt),
+        <Button onClick={() => handleClick(cycle.id)}>
+          {status === 'open' ? 'Vote' : 'Results'}
+        </Button>,
+      ])}
+    />
   );
 }
 
diff --git a/packages/berlin/src/pages/Onboarding.tsx b/packages/berlin/src/pages/Onboarding.tsx
index 48e83d52..beb4f67e 100644
--- a/packages/berlin/src/pages/Onboarding.tsx
+++ b/packages/berlin/src/pages/Onboarding.tsx
@@ -56,7 +56,7 @@ function Onboarding() {
       <FlexColumn $gap="3rem">
         <Subtitle>{data[step].title}</Subtitle>
         <BodyContent content={data[step].body} />
-        <Dots dots={data.length} activeDotIndex={step} setStep={setStep} />
+        <Dots dots={data.length} activeDotIndex={step} handleClick={(i) => setStep(i)} />
         <FlexRow>
           <Button onClick={handleSkip} $color="secondary">
             Skip
diff --git a/packages/berlin/src/pages/PublicGroupRegistration.tsx b/packages/berlin/src/pages/PublicGroupRegistration.tsx
index d2a183ff..428681b9 100644
--- a/packages/berlin/src/pages/PublicGroupRegistration.tsx
+++ b/packages/berlin/src/pages/PublicGroupRegistration.tsx
@@ -21,7 +21,7 @@ function PublicGroupRegistration() {
   const { user } = useUser();
   const queryClient = useQueryClient();
   const [searchParams] = useSearchParams();
-  const groupCategoryNameParam = searchParams.get('groupCategory');
+  const groupCategoryIdParam = searchParams.get('groupCategoryId');
 
   const {
     control,
@@ -35,9 +35,9 @@ function PublicGroupRegistration() {
   });
 
   const { data: groups } = useQuery({
-    queryKey: ['group-categories', groupCategoryNameParam, 'groups'],
-    queryFn: () => fetchGroups({ groupCategoryName: groupCategoryNameParam || '' }),
-    enabled: !!user?.id && !!groupCategoryNameParam,
+    queryKey: ['group-categories', groupCategoryIdParam, 'groups'],
+    queryFn: () => fetchGroups({ groupCategoryId: groupCategoryIdParam || '' }),
+    enabled: !!user?.id && !!groupCategoryIdParam,
   });
 
   const { data: usersToGroups } = useQuery({
@@ -63,9 +63,9 @@ function PublicGroupRegistration() {
   const prevUserToGroup = useMemo(
     () =>
       usersToGroups?.find(
-        (userToGroup) => userToGroup.group.groupCategory?.name === groupCategoryNameParam,
+        (userToGroup) => userToGroup.group.groupCategory?.id === groupCategoryIdParam,
       ),
-    [usersToGroups, groupCategoryNameParam],
+    [usersToGroups, groupCategoryIdParam],
   );
 
   const { mutate: postUsersToGroupsMutation } = useMutation({
@@ -143,9 +143,7 @@ function PublicGroupRegistration() {
             />
           )}
         />
-        <Button disabled type="submit">
-          Join group
-        </Button>
+        <Button type="submit">Join group</Button>
       </Form>
     </FlexColumn>
   );
diff --git a/packages/berlin/src/pages/Register.tsx b/packages/berlin/src/pages/Register.tsx
index b7c502a8..d9b39ded 100644
--- a/packages/berlin/src/pages/Register.tsx
+++ b/packages/berlin/src/pages/Register.tsx
@@ -1,87 +1,51 @@
 // React and third-party libraries
-import { Control, Controller, FieldErrors, UseFormRegister, useForm } from 'react-hook-form';
-import { useEffect, useMemo, useState } from 'react';
 import { useMutation, useQueries, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useNavigate, useParams } from 'react-router-dom';
-import { z } from 'zod';
+import { useEffect, useMemo, useState } from 'react';
 import ContentLoader from 'react-content-loader';
+import { useForm } from 'react-hook-form';
 import toast from 'react-hot-toast';
+import { useNavigate, useParams } from 'react-router-dom';
 
 // API
 import {
+  GetEventResponse,
+  GetGroupCategoriesResponse,
+  GetRegistrationsResponseType,
+  GetUsersToGroupsResponse,
   fetchEvent,
+  fetchEventGroupCategories,
+  fetchGroups,
   fetchRegistrationData,
   fetchRegistrationFields,
   fetchRegistrations,
   fetchUsersToGroups,
-  GetEventResponse,
-  GetRegistrationsResponseType,
-  GetUsersToGroupsResponse,
   postRegistration,
+  postUsersToGroups,
   putRegistration,
+  putUsersToGroups,
   type GetRegistrationDataResponse,
   type GetRegistrationFieldsResponse,
   type GetRegistrationResponseType,
   type GetUserResponse,
-  type RegistrationFieldOption,
 } from 'api';
 
 // Hooks
 import useUser from '../hooks/useUser';
 
 // Components
-import { Error } from '../components/typography/Error.styled';
 import { FlexColumn } from '../components/containers/FlexColumn.styled';
+import { FlexRow } from '../components/containers/FlexRow.styled';
 import { Form } from '../components/containers/Form.styled';
+import { FormInput } from '../components/form';
 import { SafeArea } from '../layout/Layout.styled';
 import { Subtitle } from '../components/typography/Subtitle.styled';
 import Button from '../components/button';
-import CharacterCounter from '../components/typography/CharacterCount.styled';
-import Input from '../components/input';
+import Dots from '../components/dots';
 import Label from '../components/typography/Label';
 import Select from '../components/select';
-import Textarea from '../components/textarea';
-
-const sortRegistrationsByCreationDate = (registrations: GetRegistrationResponseType[]) => {
-  return [
-    ...registrations.sort((a, b) => {
-      return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
-    }),
-  ];
-};
-
-const createRegistrationForms = ({
-  registrations,
-  usersToGroups,
-}: {
-  registrations: GetRegistrationsResponseType | undefined | null;
-  usersToGroups: GetUsersToGroupsResponse | undefined | null;
-}) => {
-  const sortedRegistrationsByCreationDate = sortRegistrationsByCreationDate(registrations || []);
-
-  const registrationForms: {
-    key: string | 'create';
-    registration?: GetRegistrationResponseType;
-    group?: GetUsersToGroupsResponse[number]['group'];
-    mode: 'edit' | 'create';
-  }[] = sortedRegistrationsByCreationDate.map((reg) => {
-    return {
-      key: reg.id || '',
-      registration: reg,
-      group: usersToGroups?.find((userToGroup) => userToGroup.group.id === reg.groupId)?.group,
-      mode: 'edit',
-    };
-  });
-
-  registrationForms.push({
-    key: 'create',
-    mode: 'create',
-  });
-
-  return registrationForms;
-};
 
 function Register() {
+  const [step, setStep] = useState<number | null>(null);
   const { user, isLoading } = useUser();
   const { eventId } = useParams();
   const [selectedRegistrationFormKey, setSelectedRegistrationFormKey] = useState<
@@ -107,11 +71,33 @@ function Register() {
   });
 
   const { data: usersToGroups } = useQuery({
-    queryKey: ['user', 'groups', user?.id],
+    queryKey: ['user', user?.id, 'users-to-groups'],
     queryFn: () => fetchUsersToGroups(user?.id || ''),
     enabled: !!user?.id,
   });
 
+  const { data: groupCategories } = useQuery({
+    queryKey: ['event', eventId, 'group-categories'],
+    queryFn: () => fetchEventGroupCategories(eventId || ''),
+    enabled: !!eventId,
+  });
+
+  const defaultStep = useMemo(() => {
+    // check if the user is already in all required groups for the event
+    const requiredCategories = groupCategories?.filter((category) => category.required);
+    const userGroups = usersToGroups?.map((userToGroup) => userToGroup.group.groupCategoryId);
+
+    if (requiredCategories && userGroups) {
+      const userGroupCategories = requiredCategories.map((category) => category.id);
+
+      if (userGroupCategories.every((category) => userGroups.includes(category))) {
+        return 1;
+      }
+    }
+
+    return 0;
+  }, [groupCategories, usersToGroups]);
+
   const multipleRegistrationData = useQueries({
     queries:
       registrations?.map((registration) => ({
@@ -163,47 +149,213 @@ function Register() {
     return <Subtitle>Loading...</Subtitle>;
   }
 
+  const getRecentStep = (step: number | null, defaultStep: number) => {
+    if (step === null) {
+      return defaultStep;
+    }
+
+    return step;
+  };
+
   return (
     <SafeArea>
       <FlexColumn $gap="1.5rem">
-        <SelectRegistrationDropdown
-          onSelectedRegistrationFormKeyChange={setSelectedRegistrationFormKey}
-          registrations={registrations}
-          usersToGroups={usersToGroups}
-          selectedRegistrationFormKey={selectedRegistrationFormKey}
-          multipleRegistrationData={multipleRegistrationData}
-          registrationFields={registrationFields}
-        />
-        {createRegistrationForms({ registrations, usersToGroups }).map((form, idx) => {
-          return (
-            <RegisterForm
-              show={showRegistrationForm({
-                selectedRegistrationFormKey,
-                registrationId: form.registration?.id,
-              })}
+        {getRecentStep(step, defaultStep) === 0 &&
+          groupCategories
+            ?.filter((groupCategory) => groupCategory.required)
+            .map((groupCategory) => (
+              <SelectEventGroup
+                key={groupCategory.id}
+                groupCategory={groupCategory}
+                userToGroups={usersToGroups}
+                user={user}
+                afterSubmit={() => setStep(1)}
+              />
+            ))}
+        {getRecentStep(step, defaultStep) === 1 && (
+          <>
+            <SelectRegistrationDropdown
+              onSelectedRegistrationFormKeyChange={setSelectedRegistrationFormKey}
+              registrations={registrations}
               usersToGroups={usersToGroups}
-              userIsApproved={
-                registrations?.some((registration) => registration.status === 'APPROVED')
-                  ? true
-                  : false
-              }
-              registrationData={multipleRegistrationData[form.registration?.id || '']?.data}
-              key={idx}
-              user={user}
-              groupId={form.group?.id}
+              selectedRegistrationFormKey={selectedRegistrationFormKey}
+              multipleRegistrationData={multipleRegistrationData}
               registrationFields={registrationFields}
-              registrationId={form.registration?.id}
-              mode={form.mode}
-              isLoading={multipleRegistrationData[form.registration?.id || '']?.loading}
-              event={event}
-              onRegistrationFormCreate={onRegistrationFormCreate}
             />
-          );
-        })}
+            {createRegistrationForms({ registrations, usersToGroups }).map((form, idx) => {
+              return (
+                <RegisterForm
+                  show={showRegistrationForm({
+                    selectedRegistrationFormKey,
+                    registrationId: form.registration?.id,
+                  })}
+                  usersToGroups={usersToGroups}
+                  registrationData={multipleRegistrationData[form.registration?.id || '']?.data}
+                  key={idx}
+                  user={user}
+                  groupId={form.group?.id}
+                  registrationFields={registrationFields}
+                  registrationId={form.registration?.id}
+                  mode={form.mode}
+                  isLoading={multipleRegistrationData[form.registration?.id || '']?.loading}
+                  event={event}
+                  onRegistrationFormCreate={onRegistrationFormCreate}
+                />
+              );
+            })}
+          </>
+        )}
+        <Dots
+          dots={2}
+          activeDotIndex={getRecentStep(step, defaultStep)}
+          handleClick={(i) => {
+            // the user is not allowed to go out of the first step
+            if (defaultStep == 0) {
+              return;
+            }
+
+            setStep(i);
+          }}
+        />
       </FlexColumn>
     </SafeArea>
   );
 }
+const sortRegistrationsByCreationDate = (registrations: GetRegistrationResponseType[]) => {
+  return [
+    ...registrations.sort((a, b) => {
+      return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
+    }),
+  ];
+};
+
+const createRegistrationForms = ({
+  registrations,
+  usersToGroups,
+}: {
+  registrations: GetRegistrationsResponseType | undefined | null;
+  usersToGroups: GetUsersToGroupsResponse | undefined | null;
+}) => {
+  const sortedRegistrationsByCreationDate = sortRegistrationsByCreationDate(registrations || []);
+
+  const registrationForms: {
+    key: string | 'create';
+    registration?: GetRegistrationResponseType;
+    group?: GetUsersToGroupsResponse[number]['group'];
+    mode: 'edit' | 'create';
+  }[] = sortedRegistrationsByCreationDate.map((reg) => {
+    return {
+      key: reg.id || '',
+      registration: reg,
+      group: usersToGroups?.find((userToGroup) => userToGroup.group.id === reg.groupId)?.group,
+      mode: 'edit',
+    };
+  });
+
+  registrationForms.push({
+    key: 'create',
+    mode: 'create',
+  });
+
+  return registrationForms;
+};
+
+const SelectEventGroup = ({
+  groupCategory,
+  userToGroups,
+  user,
+  afterSubmit,
+}: {
+  userToGroups: GetUsersToGroupsResponse | null | undefined;
+  groupCategory: GetGroupCategoriesResponse[number] | null | undefined;
+  user: GetUserResponse | null | undefined;
+  afterSubmit?: () => void;
+}) => {
+  // fetch all the groups in the category
+  // show a select with all the groups
+  // if the user is in a group in that category, show that group as selected
+  const [newGroup, setNewGroup] = useState<string | undefined>('');
+  const queryClient = useQueryClient();
+  const { data: groups } = useQuery({
+    queryKey: ['group-category', groupCategory?.id, 'groups'],
+    queryFn: () => fetchGroups({ groupCategoryId: groupCategory?.id ?? '' }),
+    enabled: !!groupCategory?.id,
+  });
+
+  const { mutate: postUsersToGroupsMutation } = useMutation({
+    mutationFn: postUsersToGroups,
+    onSuccess: (body) => {
+      if (!body) {
+        return;
+      }
+      queryClient.invalidateQueries({ queryKey: ['user', user?.id, 'users-to-groups'] });
+      toast.success(`Joined group successfully!`);
+      afterSubmit?.();
+    },
+    onError: () => {
+      toast.error('Something went wrong.');
+    },
+  });
+
+  const { mutate: putUsersToGroupsMutation } = useMutation({
+    mutationFn: putUsersToGroups,
+    onSuccess: (body) => {
+      if (!body) {
+        return;
+      }
+
+      if ('errors' in body) {
+        toast.error(body.errors.join(', '));
+        return;
+      }
+
+      queryClient.invalidateQueries({ queryKey: ['user', user?.id, 'users-to-groups'] });
+      toast.success(`Updated group successfully!`);
+      afterSubmit?.();
+    },
+    onError: () => {
+      toast.error('Something went wrong.');
+    },
+  });
+
+  const userGroup = userToGroups?.find(
+    (userToGroup) => userToGroup.group.groupCategory?.id === groupCategory?.id,
+  );
+
+  const onSubmit = () => {
+    if (userGroup && newGroup) {
+      // update the group
+      putUsersToGroupsMutation({
+        groupId: newGroup,
+        userToGroupId: userGroup.id,
+      });
+      return;
+    }
+
+    // create a new group
+    postUsersToGroupsMutation({ groupId: newGroup });
+  };
+
+  return (
+    <FlexColumn>
+      <Label>Select {groupCategory?.name} group</Label>
+      <Select
+        value={newGroup || userGroup?.group.id || undefined}
+        options={groups?.map((group) => ({ id: group.id, name: group.name })) || []}
+        placeholder="Select a Group"
+        onChange={setNewGroup}
+      />
+      <FlexRow>
+        <Button
+          disabled={!newGroup || (userGroup && userGroup.group.id === newGroup)}
+          onClick={onSubmit}
+        >
+          Save
+        </Button>
+      </FlexRow>
+    </FlexColumn>
+  );
+};
 
 const SelectRegistrationDropdown = ({
   usersToGroups,
@@ -372,7 +524,6 @@ const filterRegistrationFields = (
 
 function RegisterForm(props: {
   user: GetUserResponse | null | undefined;
-  userIsApproved: boolean;
   usersToGroups: GetUsersToGroupsResponse | null | undefined;
   registrationFields: GetRegistrationFieldsResponse | null | undefined;
   registrationId: string | null | undefined;
@@ -386,21 +537,14 @@ function RegisterForm(props: {
 }) {
   const navigate = useNavigate();
   const queryClient = useQueryClient();
-  const [selectedGroupId, setSelectedGroupId] = useState<string>('');
-  const prevSelectGroupId = props.groupId ?? 'none';
 
   // i want to differentiate between when a group is selected and it is not
   // so i can show the correct registration fields
   // i will use the selectedGroupId to do this
+  const [selectedGroupId, setSelectedGroupId] = useState<string>('');
+  const prevSelectGroupId = props.groupId ?? 'none';
 
-  const {
-    register,
-    formState: { errors, isSubmitting },
-    control,
-    handleSubmit,
-    getValues,
-    reset,
-  } = useForm({
+  const form = useForm({
     defaultValues: useMemo(
       () => getDefaultValues(props.registrationData),
       [props.registrationData],
@@ -408,6 +552,12 @@ function RegisterForm(props: {
     mode: 'all',
   });
 
+  const {
+    formState: { isSubmitting },
+    handleSubmit,
+    reset,
+  } = form;
+
   useEffect(() => {
     reset(getDefaultValues(props.registrationData));
   }, [props.registrationData, reset]);
@@ -424,10 +574,12 @@ function RegisterForm(props: {
     return sortedFields;
   }, [props.registrationFields, selectedGroupId, prevSelectGroupId]);
 
-  const redirectToHoldingPage = (isApproved: boolean) => {
+  const redirectToNextPage = (isApproved: boolean) => {
     if (!isApproved) {
       navigate(`/events/${props.event?.id}/holding`);
     }
+
+    navigate(`/events/${props.event?.id}/cycles`);
   };
 
   const { mutate: mutateRegistrationData, isPending } = useMutation({
@@ -442,9 +594,15 @@ function RegisterForm(props: {
           queryKey: ['registrations', body.id, 'registration-data'],
         });
 
+        // invalidate user registrations, this is for the 1 event use case
+        // where the authentication is because you are approved to the event
+        await queryClient.invalidateQueries({
+          queryKey: [props.user?.id, 'registrations'],
+        });
+
         props.onRegistrationFormCreate?.(body.id);
 
-        redirectToHoldingPage(props.userIsApproved);
+        redirectToNextPage(body.status === 'APPROVED');
       } else {
         toast.error('Failed to save registration, please try again');
       }
@@ -468,7 +626,7 @@ function RegisterForm(props: {
           queryKey: ['registrations', props.registrationId, 'registration-data'],
         });
 
-        redirectToHoldingPage(props.userIsApproved);
+        redirectToNextPage(body.status === 'APPROVED');
       } else {
         toast.error('Failed to update registration, please try again');
       }
@@ -567,23 +725,21 @@ function RegisterForm(props: {
       <Subtitle>{props.event?.registrationDescription}</Subtitle>
       <Form>
         {sortedRegistrationFields?.map((regField) => (
-          <FormField
-            key={`${props.registrationId}-${regField.id}`}
-            disabled={false}
-            errors={errors}
+          <FormInput
+            key={regField.id}
+            form={form}
+            name={regField.id}
+            label={regField.name}
             required={regField.required}
-            id={regField.id}
-            name={regField.name}
-            characterLimit={regField.characterLimit}
-            options={regField.registrationFieldOptions}
-            type={regField.type}
-            register={register}
-            control={control}
-            value={getValues()[regField.id] ?? ''} // Current input value
+            type={regField.type.toLocaleUpperCase()}
+            options={regField.registrationFieldOptions?.map((option) => ({
+              name: option.value,
+              value: option.value,
+            }))}
           />
         ))}
       </Form>
-      <Button onClick={handleSubmit(onSubmit)} disabled={isSubmitting || isPending || true}>
+      <Button onClick={handleSubmit(onSubmit)} disabled={isSubmitting || isPending}>
         Save
       </Button>
     </FlexColumn>
@@ -634,300 +790,4 @@ function RegisterGroupSelect({
   );
 }
 
-function FormField({
-  id,
-  name,
-  required,
-  type,
-  errors,
-  options,
-  disabled,
-  register,
-  characterLimit,
-  control,
-  value,
-}: {
-  id: string;
-  name: string;
-  required: boolean | null;
-  type: 'TEXT' | 'SELECT' | 'NUMBER' | 'DATE' | 'BOOLEAN' | 'TEXTAREA';
-  options: RegistrationFieldOption[];
-  disabled: boolean;
-  register: UseFormRegister<Record<string, string>>;
-  errors: FieldErrors<Record<string, string>>;
-  characterLimit: number;
-  control: Control<Record<string, string>>;
-  value: string;
-}) {
-  switch (type) {
-    case 'TEXT':
-      return (
-        <TextInput
-          id={id}
-          name={name}
-          register={register}
-          required={required}
-          disabled={disabled}
-          errors={errors}
-          characterLimit={characterLimit}
-          value={value}
-        />
-      );
-    case 'SELECT':
-      return (
-        <SelectInput
-          id={id}
-          name={name}
-          options={options}
-          required={required}
-          disabled={disabled}
-          errors={errors}
-          control={control}
-        />
-      );
-    case 'TEXTAREA':
-      return (
-        <TextAreaInput
-          id={id}
-          name={name}
-          register={register}
-          required={required}
-          disabled={disabled}
-          errors={errors}
-          characterLimit={characterLimit}
-          value={value}
-        />
-      );
-    case 'NUMBER':
-      return (
-        <NumberInput
-          id={id}
-          name={name}
-          register={register}
-          required={required}
-          disabled={disabled}
-          errors={errors}
-          value={value}
-        />
-      );
-    default:
-      return null;
-  }
-}
-
-function TextInput(props: {
-  id: string;
-  name: string;
-  required: boolean | null;
-  characterLimit: number;
-  disabled: boolean;
-  register: UseFormRegister<Record<string, string>>;
-  errors: FieldErrors<Record<string, string>>;
-  value: string;
-}) {
-  const [charCount, setCharCount] = useState(0);
-
-  useEffect(() => {
-    setCharCount(props.value.length);
-  }, [props.value.length]);
-
-  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const inputValue = event.target.value;
-    setCharCount(inputValue.length);
-    props.register(props.id, {
-      value: inputValue,
-    });
-  };
-
-  return (
-    <FlexColumn $gap="0.5rem">
-      <Input
-        type="text"
-        label={props.name}
-        required={!!props.required}
-        placeholder="Enter a value"
-        {...props.register(props.id, {
-          setValueAs: (value) => value.trim(),
-          validate: (value) => {
-            if (!props.required && value.trim() === '') {
-              return true;
-            }
-
-            // validate character limit (0 character limit is no character limit)
-            if (props.characterLimit > 0 && value.length > props.characterLimit) {
-              return `Character count of ${charCount} exceeds character limit of ${props.characterLimit}`;
-            }
-
-            const v = z.string().min(1, 'Value is required').safeParse(value);
-
-            if (v.success) {
-              return true;
-            }
-
-            return v.error.errors[0].message;
-          },
-        })}
-        disabled={props.disabled}
-        onChange={handleInputChange}
-      />
-      {props.errors?.[props.id] ? (
-        <Error>{props.errors?.[props.id]?.message}</Error>
-      ) : (
-        props.characterLimit > 0 && (
-          <CharacterCounter count={charCount} limit={props.characterLimit} />
-        )
-      )}
-    </FlexColumn>
-  );
-}
-
-function TextAreaInput(props: {
-  id: string;
-  name: string;
-  required: boolean | null;
-  characterLimit: number;
-  disabled: boolean;
-  register: UseFormRegister<Record<string, string>>;
-  errors: FieldErrors<Record<string, string>>;
-  value: string;
-}) {
-  const [charCount, setCharCount] = useState(0);
-
-  useEffect(() => {
-    setCharCount(props.value.length);
-  }, [props.value.length]);
-
-  const handleInputChange = (event: React.ChangeEvent<HTMLTextAreaElement>) => {
-    const inputValue = event.target.value;
-    setCharCount(inputValue.length);
-    props.register(props.id, {
-      value: inputValue,
-    });
-  };
-
-  return (
-    <FlexColumn $gap="0.5rem">
-      <Textarea
-        label={props.name}
-        $required={!!props.required}
-        placeholder="Enter a value"
-        {...props.register(props.id, {
-          setValueAs: (value) => value.trim(),
-          validate: (value) => {
-            if (!props.required && value.trim() === '') {
-              return true;
-            }
-
-            // validate character limit (0 character limit is no character limit)
-            if (props.characterLimit > 0 && value.length > props.characterLimit) {
-              return `Character count of ${charCount} exceeds character limit of ${props.characterLimit}`;
-            }
-
-            const v = z.string().min(1, 'Value is required').safeParse(value);
-
-            if (v.success) {
-              return true;
-            }
-
-            return v.error.errors[0].message;
-          },
-        })}
-        onChange={handleInputChange}
-      />
-      {props.errors?.[props.id] ? (
-        <Error>{props.errors?.[props.id]?.message}</Error>
-      ) : (
-        props.characterLimit > 0 && (
-          <CharacterCounter count={charCount} limit={props.characterLimit} />
-        )
-      )}
-    </FlexColumn>
-  );
-}
-
-function NumberInput(props: {
-  id: string;
-  name: string;
-  required: boolean | null;
-  disabled: boolean;
-  register: UseFormRegister<Record<string, string>>;
-  errors: FieldErrors<Record<string, string>>;
-  value: string;
-}) {
-  return (
-    <FlexColumn $gap="0.5rem">
-      <Input
-        type="number"
-        label={props.name}
-        required={!!props.required}
-        placeholder="Enter a value"
-        min={250}
-        max={10000}
-        {...props.register(props.id, {
-          validate: (value) => {
-            if (!props.required) {
-              return true;
-            }
-
-            if (value.trim() === '') {
-              return 'Value is required';
-            }
-
-            const v = z.coerce
-              .number()
-              .int('Value has to be an integer')
-              .min(250, 'Value must be 250 or higher')
-              .max(10000, 'Value must be 10,000 or lower')
-              .safeParse(value);
-
-            if (v.success) {
-              return true;
-            }
-
-            return v.error.errors[0].message;
-          },
-        })}
-        onChange={(event) => {
-          props.register(props.id, {
-            value: event.target.value,
-          });
-        }}
-      />
-      {props.errors?.[props.id] && <Error>{props.errors?.[props.id]?.message}</Error>}
-    </FlexColumn>
-  );
-}
-
-function SelectInput(props: {
-  id: string;
-  name: string;
-  required: boolean | null;
-  disabled: boolean;
-  options: RegistrationFieldOption[];
-  errors: FieldErrors<Record<string, string>>;
-  control: Control<Record<string, string>>;
-}) {
-  return (
-    <FlexColumn $gap="0.5rem">
-      <Controller
-        name={props.id}
-        control={props.control}
-        rules={{ required: props.required ? 'Value is required' : false }}
-        render={({ field }) => (
-          <Select
-            label={props.name}
-            placeholder="Choose a value"
-            required={!!props.required}
-            options={props.options.map((option) => ({ id: option.value, name: option.value }))}
-            errors={props.errors[props.id] ? [props.errors[props.id]?.message ?? ''] : []}
-            onBlur={field.onBlur}
-            onChange={(val) => field.onChange(val)}
-            value={field.value}
-          />
-        )}
-      />
-    </FlexColumn>
-  );
-}
-
 export default Register;
diff --git a/packages/berlin/src/pages/Results.tsx b/packages/berlin/src/pages/Results.tsx
index 4daeace4..3faa5245 100644
--- a/packages/berlin/src/pages/Results.tsx
+++ b/packages/berlin/src/pages/Results.tsx
@@ -10,6 +10,7 @@ import ResultsTable from '../components/tables/results-table';
 import StatsTable from '../components/tables/stats-table';
 import StatsColumns from '../components/columns/stats-columns';
 import { FINAL_QUESTION_TITLE } from '../utils/constants';
+import { Column } from '../components/tables/results-table/ResultsTable.styled';
 
 function Results() {
   const [expandedIndex, setExpandedIndex] = useState<number | null>(null);
@@ -72,7 +73,7 @@ function Results() {
     <FlexColumn $gap="2rem">
       <BackButton fallbackRoute={`/events/${eventId}/cycles`} />
       <Subtitle>Results for: {cycle?.forumQuestions?.[0].questionTitle}</Subtitle>
-      <FlexColumn $gap="0">
+      <Column>
         <ResultsColumns $showFunding={!!funding} />
         {optionStatsArray.map((option, index) => (
           <ResultsTable
@@ -84,7 +85,7 @@ function Results() {
             onClick={() => setExpandedIndex(expandedIndex === index ? null : index)}
           />
         ))}
-      </FlexColumn>
+      </Column>
       <Subtitle>Overall Statistics</Subtitle>
       <FlexColumn $gap="0">
         <StatsColumns />
diff --git a/packages/berlin/src/pages/SecretGroupRegistration.tsx b/packages/berlin/src/pages/SecretGroupRegistration.tsx
index ae63f8ca..33b85418 100644
--- a/packages/berlin/src/pages/SecretGroupRegistration.tsx
+++ b/packages/berlin/src/pages/SecretGroupRegistration.tsx
@@ -8,7 +8,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import toast from 'react-hot-toast';
 
 // API
-import { postUsersToGroups, fetchGroupCategories, postGroup, fetchUsersToGroups } from 'api';
+import { postUsersToGroups, postGroup, fetchUsersToGroups } from 'api';
 
 // Hooks
 import useUser from '../hooks/useUser';
@@ -38,7 +38,7 @@ function SecretGroupRegistration() {
   const [secretCode, setSecretCode] = useState<string | null>(null);
   const [groupName, setGroupName] = useState<string | null>(null);
   const [searchParams] = useSearchParams();
-  const groupCategoryNameParam = searchParams.get('groupCategory');
+  const groupCategoryIdParam = searchParams.get('groupCategoryId');
 
   const secretGroupRegistrationSchema = z.object({
     secret: z.string().refine((val) => /^(\w{3,})-(\w{3,})-(\w{3,})$/.test(val), {
@@ -66,16 +66,11 @@ function SecretGroupRegistration() {
   const groupsInCategory = useMemo(
     () =>
       usersToGroups?.filter(
-        (userToGroup) => userToGroup.group.groupCategory?.name === groupCategoryNameParam,
+        (userToGroup) => userToGroup.group.groupCategory?.id === groupCategoryIdParam,
       ),
-    [usersToGroups, groupCategoryNameParam],
+    [usersToGroups, groupCategoryIdParam],
   );
 
-  const { data: groupCategories } = useQuery({
-    queryKey: ['group-categories'],
-    queryFn: fetchGroupCategories,
-  });
-
   const { mutate: postGroupMutation } = useMutation({
     mutationFn: postGroup,
     onSuccess: (body) => {
@@ -113,13 +108,6 @@ function SecretGroupRegistration() {
     },
   });
 
-  const groupCategoryId = useMemo(() => {
-    return groupCategories?.find(
-      (groupCategory) =>
-        groupCategory.name?.toLowerCase() === groupCategoryNameParam?.toLowerCase(),
-    )?.id;
-  }, [groupCategoryNameParam, groupCategories]);
-
   const onSubmit = () => {
     if (isValid) {
       postUsersToGroupsMutation({ secret: getValues('secret') });
@@ -128,7 +116,7 @@ function SecretGroupRegistration() {
   };
 
   const handleCreateGroup = (name: string) => {
-    postGroupMutation({ name, groupCategoryId: groupCategoryId || '' });
+    postGroupMutation({ name, groupCategoryId: groupCategoryIdParam || '' });
   };
 
   return (
@@ -144,11 +132,7 @@ function SecretGroupRegistration() {
               open={isDialogOpen}
               onOpenChange={setIsDialogOpen}
               trigger={
-                <Button
-                  disabled
-                  style={{ marginTop: 'auto' }}
-                  onClick={() => setIsDialogOpen(true)}
-                >
+                <Button style={{ marginTop: 'auto' }} onClick={() => setIsDialogOpen(true)}>
                   {groups.create.buttonText}
                 </Button>
               }
@@ -178,9 +162,7 @@ function SecretGroupRegistration() {
               errors={errors?.secret?.message ? [errors.secret.message] : []}
               required
             />
-            <Button disabled type="submit">
-              {groups.join.buttonText}
-            </Button>
+            <Button type="submit">{groups.join.buttonText}</Button>
           </Form>
         </FlexColumn>
       </FlexRowToColumn>
diff --git a/packages/berlin/src/utils/validation.ts b/packages/berlin/src/utils/validation.ts
new file mode 100644
index 00000000..ebcad2aa
--- /dev/null
+++ b/packages/berlin/src/utils/validation.ts
@@ -0,0 +1,12 @@
+import { z } from 'zod';
+
+export function returnZodError(validationFn: () => string): string | undefined {
+  try {
+    validationFn();
+  } catch (error) {
+    // check if zod error
+    if (error instanceof z.ZodError) {
+      return error.errors[0].message;
+    }
+  }
+}
diff --git a/packages/core/.env b/packages/core/.env
deleted file mode 100644
index 00da8815..00000000
--- a/packages/core/.env
+++ /dev/null
@@ -1,3 +0,0 @@
-VITE_ZUPASS_URL=https://staging.zupass.org
-VITE_ZUPASS_SERVER_URL=https://api-staging.zupass.org
-VITE_SERVER_URL=http://localhost:8080
\ No newline at end of file
diff --git a/packages/core/index.html b/packages/core/index.html
deleted file mode 100644
index ed87fe46..00000000
--- a/packages/core/index.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link
-      href="https://fonts.googleapis.com/css2?family=Press+Start+2P&family=Raleway:wght@400;500;600&display=swap"
-      rel="stylesheet"
-    />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Plural Research</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/main.tsx"></script>
-  </body>
-</html>
diff --git a/packages/core/package.json b/packages/core/package.json
deleted file mode 100644
index 2e424c1e..00000000
--- a/packages/core/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "core",
-  "version": "0.0.1",
-  "type": "module",
-  "main": "./src/main.ts",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
-    "format": "npx prettier . --write",
-    "preview": "vite preview"
-  },
-  "dependencies": {
-    "api": "workspace:*"
-  }
-}
diff --git a/packages/core/public/icons/arrow_down.svg b/packages/core/public/icons/arrow_down.svg
deleted file mode 100644
index ad08c23d..00000000
--- a/packages/core/public/icons/arrow_down.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24" fill="#ccc">
-  <path d="M480-345 240-585l56-56 184 184 184-184 56 56-240 240Z"/>
-</svg>
diff --git a/packages/core/public/icons/back_arrow.svg b/packages/core/public/icons/back_arrow.svg
deleted file mode 100644
index c46f430c..00000000
--- a/packages/core/public/icons/back_arrow.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="40" viewBox="0 -960 960 960" width="40">
-  <path d="M332.666-427.667 517-243.333q15.666 15.727 16 37.364.333 21.636-15.334 37.592Q502-152.667 480.121-153q-21.878-.333-37.787-16L169-442.334q-7.606-7.777-11.97-17.796-4.363-10.018-4.363-19.944 0-9.926 4.363-19.893 4.364-9.966 11.97-17.699L443.334-792Q460-807.667 481-807.667q21 0 36.666 15.667 15.667 16.333 15.667 37.622t-15.667 37.044l-185 185.001h443.001q21.916 0 37.458 15.167Q828.667-502 828.667-480q0 22-15.542 37.166-15.542 15.167-37.458 15.167H332.666" fill="#ffffff"/>
-</svg>
diff --git a/packages/core/public/icons/bronze_badge.svg b/packages/core/public/icons/bronze_badge.svg
deleted file mode 100644
index da7b9267..00000000
--- a/packages/core/public/icons/bronze_badge.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_259_8338)">
-<path d="M12.9068 18.2534L16.0002 15.9067L19.0802 18.2534L17.9068 14.4534L21.0002 12.0001H17.2135L16.0002 8.25341L14.7868 12.0001H11.0002L14.0802 14.4534L12.9068 18.2534ZM26.6668 13.3334C26.6668 7.44008 21.8935 2.66675 16.0002 2.66675C10.1068 2.66675 5.3335 7.44008 5.3335 13.3334C5.3335 16.0401 6.34683 18.4934 8.00016 20.3734V30.6667L16.0002 28.0001L24.0002 30.6667V20.3734C25.6535 18.4934 26.6668 16.0401 26.6668 13.3334ZM16.0002 5.33341C20.4135 5.33341 24.0002 8.92008 24.0002 13.3334C24.0002 17.7467 20.4135 21.3334 16.0002 21.3334C11.5868 21.3334 8.00016 17.7467 8.00016 13.3334C8.00016 8.92008 11.5868 5.33341 16.0002 5.33341Z" fill="#BF4500"/>
-</g>
-<defs>
-<clipPath id="clip0_259_8338">
-<rect width="32" height="32" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/packages/core/public/icons/decentralized.svg b/packages/core/public/icons/decentralized.svg
deleted file mode 100644
index 7e2db8d7..00000000
--- a/packages/core/public/icons/decentralized.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17 30.6667C15.1555 30.6667 13.4222 30.3167 11.8 29.6167C10.1777 28.9167 8.76663 27.9667 7.56663 26.7667C6.36663 25.5667 5.41663 24.1556 4.71663 22.5333C4.01663 20.9111 3.66663 19.1778 3.66663 17.3333C3.66663 15.4889 4.01663 13.7556 4.71663 12.1333C5.41663 10.5111 6.36663 9.1 7.56663 7.9C8.76663 6.7 10.1777 5.75 11.8 5.05C13.4222 4.35 15.1555 4 17 4C18.8444 4 20.5777 4.35 22.2 5.05C23.8222 5.75 25.2333 6.7 26.4333 7.9C27.6333 9.1 28.5833 10.5111 29.2833 12.1333C29.9833 13.7556 30.3333 15.4889 30.3333 17.3333C30.3333 19.1778 29.9833 20.9111 29.2833 22.5333C28.5833 24.1556 27.6333 25.5667 26.4333 26.7667C25.2333 27.9667 23.8222 28.9167 22.2 29.6167C20.5777 30.3167 18.8444 30.6667 17 30.6667ZM17 28C19.9777 28 22.5 26.9667 24.5666 24.9C26.6333 22.8333 27.6666 20.3111 27.6666 17.3333C27.6666 17.1778 27.6611 17.0167 27.65 16.85C27.6388 16.6833 27.6333 16.5444 27.6333 16.4333C27.5222 17.0778 27.2222 17.6111 26.7333 18.0333C26.2444 18.4556 25.6666 18.6667 25 18.6667H22.3333C21.6 18.6667 20.9722 18.4056 20.45 17.8833C19.9277 17.3611 19.6666 16.7333 19.6666 16V14.6667H14.3333V12C14.3333 11.2667 14.5944 10.6389 15.1166 10.1167C15.6388 9.59444 16.2666 9.33333 17 9.33333H18.3333C18.3333 8.82222 18.4722 8.37222 18.75 7.98333C19.0277 7.59444 19.3666 7.27778 19.7666 7.03333C19.3222 6.92222 18.8722 6.83333 18.4166 6.76667C17.9611 6.7 17.4888 6.66667 17 6.66667C14.0222 6.66667 11.5 7.7 9.43329 9.76667C7.36663 11.8333 6.33329 14.3556 6.33329 17.3333H13C14.4666 17.3333 15.7222 17.8556 16.7666 18.9C17.8111 19.9444 18.3333 21.2 18.3333 22.6667V24H14.3333V27.6667C14.7777 27.7778 15.2166 27.8611 15.65 27.9167C16.0833 27.9722 16.5333 28 17 28Z" fill="white"/>
-</svg>
diff --git a/packages/core/public/icons/empty_heart.svg b/packages/core/public/icons/empty_heart.svg
deleted file mode 100644
index 1ad3527f..00000000
--- a/packages/core/public/icons/empty_heart.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8 12.8H6.40002V19.2H12.8V12.8Z" fill="white"/>
-<path d="M19.2 12.8H12.8V19.2H19.2V12.8Z" fill="white"/>
-<path d="M25.6 12.8H19.2V19.2H25.6V12.8Z" fill="white"/>
-<path d="M12.8 19.2H6.40002V25.6H12.8V19.2Z" fill="white"/>
-<path d="M19.2 19.2H12.8V25.6H19.2V19.2Z" fill="white"/>
-<path d="M25.6 19.2H19.2V25.6H25.6V19.2Z" fill="white"/>
-<path d="M12.8 25.6H6.40002V32H12.8V25.6Z" fill="white"/>
-<path d="M19.2 25.6H12.8V32H19.2V25.6Z" fill="white"/>
-<path d="M19.7 31.5V26.1H25.1V31.5H19.7Z" fill="white" stroke="white"/>
-<path d="M38.4 38.4H32V44.8H38.4V38.4Z" fill="white"/>
-<path d="M32 32H25.6V38.4H32V32Z" fill="white"/>
-<path d="M38.4 32H32V38.4H38.4V32Z" fill="white"/>
-<path d="M38.4 25.6H32V32H38.4V25.6Z" fill="white"/>
-<path d="M32 25.6H25.6V32H32V25.6Z" fill="white"/>
-<path d="M32 19.2H25.6V25.6H32V19.2Z" fill="white"/>
-<path d="M38.4 19.2H32V25.6H38.4V19.2Z" fill="white"/>
-<path d="M44.8 25.6H38.4V32H44.8V25.6Z" fill="white"/>
-<path d="M51.2 32H44.8V38.4H51.2V32Z" fill="white"/>
-<path d="M44.8 32H38.4V38.4H44.8V32Z" fill="white"/>
-<path d="M44.8 38.4H38.4V44.8H44.8V38.4Z" fill="white"/>
-<path d="M51.2 25.6H44.8V32H51.2V25.6Z" fill="white"/>
-<path d="M57.6 25.6H51.2V32H57.6V25.6Z" fill="white"/>
-<path d="M44.8 19.2H38.4V25.6H44.8V19.2Z" fill="white"/>
-<path d="M51.2 19.2H44.8V25.6H51.2V19.2Z" fill="white"/>
-<path d="M57.6 19.2H51.2V25.6H57.6V19.2Z" fill="white"/>
-<path d="M57.6 12.8H51.2V19.2H57.6V12.8Z" fill="white"/>
-<path d="M51.2 12.8H44.8V19.2H51.2V12.8Z" fill="white"/>
-<path d="M44.8 12.8H38.4V19.2H44.8V12.8Z" fill="white"/>
-<path d="M25.6 6.40002H19.2V12.8H25.6V6.40002Z" fill="black"/>
-<path d="M19.2 6.40002H12.8V12.8H19.2V6.40002Z" fill="black"/>
-<path d="M32 12.8H25.6V19.2H32V12.8Z" fill="black"/>
-<path d="M38.4 12.8H32V19.2H38.4V12.8Z" fill="black"/>
-<path d="M44.8 6.40002H38.4V12.8H44.8V6.40002Z" fill="black"/>
-<path d="M51.2 6.40002H44.8V12.8H51.2V6.40002Z" fill="black"/>
-<path d="M57.6 6.40002H51.2V12.8H57.6V6.40002Z" fill="black"/>
-<path d="M64 12.8H57.6V19.2H64V12.8Z" fill="black"/>
-<path d="M64 19.2H57.6V25.6H64V19.2Z" fill="black"/>
-<path d="M12.8 6.40002H6.40002V12.8H12.8V6.40002Z" fill="black"/>
-<path d="M6.4 12.8H0V19.2H6.4V12.8Z" fill="black"/>
-<path d="M6.4 19.2H0V25.6H6.4V19.2Z" fill="black"/>
-<path d="M6.4 25.6H0V32H6.4V25.6Z" fill="black"/>
-<path d="M64 25.6H57.6V32H64V25.6Z" fill="black"/>
-<path d="M12.8 32H6.40002V38.4H12.8V32Z" fill="black"/>
-<path d="M19.2 38.4H12.8V44.8H19.2V38.4Z" fill="black"/>
-<path d="M25.6 44.8H19.2V51.2001H25.6V44.8Z" fill="black"/>
-<path d="M32 51.2H25.6V57.5999H32V51.2Z" fill="black"/>
-<path d="M38.4 51.2H32V57.5999H38.4V51.2Z" fill="black"/>
-<path d="M44.8 44.8H38.4V51.2001H44.8V44.8Z" fill="black"/>
-<path d="M51.2 38.4H44.8V44.8H51.2V38.4Z" fill="black"/>
-<path d="M57.6 32H51.2V38.4H57.6V32Z" fill="black"/>
-<path d="M19.2 32H12.8V38.4H19.2V32Z" fill="#9D0000"/>
-<path d="M25.6 38.4H19.2V44.8H25.6V38.4Z" fill="#9D0000"/>
-<path d="M25.6 41.6H19.2V44.8H25.6V41.6Z" fill="#9D0000"/>
-<path d="M32 44.8H25.6V51.2001H32V44.8Z" fill="#9D0000"/>
-<path d="M25.6 32H19.2V38.4H25.6V32Z" fill="#FF0000"/>
-<path d="M32 38.4H25.6V44.8H32V38.4Z" fill="#FF0000"/>
-<path d="M38.4 44.8H32V51.2001H38.4V44.8Z" fill="#FF0000"/>
-<path d="M38.4 41.6H32V44.8H38.4V41.6Z" fill="#FF0000"/>
-<path d="M44.8 41.6H38.4V44.8H44.8V41.6Z" fill="#FF0000"/>
-</svg>
diff --git a/packages/core/public/icons/full_heart.svg b/packages/core/public/icons/full_heart.svg
deleted file mode 100644
index 6099f875..00000000
--- a/packages/core/public/icons/full_heart.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M19.2 19.2H12.8V25.6H19.2V19.2Z" fill="white"/>
-<path d="M25.6 6.40002H19.2V12.8H25.6V6.40002Z" fill="black"/>
-<path d="M19.2 6.40002H12.8V12.8H19.2V6.40002Z" fill="black"/>
-<path d="M32 12.8H25.6V19.2H32V12.8Z" fill="black"/>
-<path d="M38.4 12.8H32V19.2H38.4V12.8Z" fill="black"/>
-<path d="M44.8 6.40002H38.4V12.8H44.8V6.40002Z" fill="black"/>
-<path d="M51.2 6.40002H44.8V12.8H51.2V6.40002Z" fill="black"/>
-<path d="M57.6 6.40002H51.2V12.8H57.6V6.40002Z" fill="black"/>
-<path d="M64 12.8H57.6V19.2H64V12.8Z" fill="black"/>
-<path d="M64 19.2H57.6V25.6H64V19.2Z" fill="black"/>
-<path d="M12.8 6.40002H6.40002V12.8H12.8V6.40002Z" fill="black"/>
-<path d="M6.4 12.8H0V19.2H6.4V12.8Z" fill="black"/>
-<path d="M6.4 19.2H0V25.6H6.4V19.2Z" fill="black"/>
-<path d="M6.4 25.6H0V32H6.4V25.6Z" fill="black"/>
-<path d="M64 25.6H57.6V32H64V25.6Z" fill="black"/>
-<path d="M12.8 32H6.40002V38.4H12.8V32Z" fill="black"/>
-<path d="M19.2 38.4H12.8V44.8H19.2V38.4Z" fill="black"/>
-<path d="M25.6 44.8H19.2V51.2001H25.6V44.8Z" fill="black"/>
-<path d="M32 51.2H25.6V57.5999H32V51.2Z" fill="black"/>
-<path d="M38.4 51.2H32V57.5999H38.4V51.2Z" fill="black"/>
-<path d="M44.8 44.8H38.4V51.2001H44.8V44.8Z" fill="black"/>
-<path d="M51.2 38.4H44.8V44.8H51.2V38.4Z" fill="black"/>
-<path d="M57.6 32H51.2V38.4H57.6V32Z" fill="black"/>
-<path d="M12.8 12.8H6.40002V19.2H12.8V12.8Z" fill="#9D0000"/>
-<path d="M19.2 12.8H12.8V19.2H19.2V12.8Z" fill="#FF0000"/>
-<path d="M25.6 12.8H19.2V19.2H25.6V12.8Z" fill="#FF0000"/>
-<path d="M12.8 19.2H6.40002V25.6H12.8V19.2Z" fill="#9D0000"/>
-<path d="M19.2 19.2H12.8V25.6H19.2V19.2Z" fill="#FF0000"/>
-<path d="M25.6 19.2H19.2V25.6H25.6V19.2Z" fill="#FF0000"/>
-<path d="M12.8 25.6H6.40002V32H12.8V25.6Z" fill="#9D0000"/>
-<path d="M19.2 25.6H12.8V32H19.2V25.6Z" fill="#FF0000"/>
-<path d="M25.6 25.6H19.2V32H25.6V25.6Z" fill="#FF0000"/>
-<path d="M19.2 32H12.8V38.4H19.2V32Z" fill="#9D0000"/>
-<path d="M25.6 32H19.2V38.4H25.6V32Z" fill="#FF0000"/>
-<path d="M25.6 38.4H19.2V44.8H25.6V38.4Z" fill="#9D0000"/>
-<path d="M32 38.4H25.6V44.8H32V38.4Z" fill="#FF0000"/>
-<path d="M32 44.8H25.6V51.2001H32V44.8Z" fill="#9D0000"/>
-<path d="M38.4 44.8H32V51.2001H38.4V44.8Z" fill="#FF0000"/>
-<path d="M38.4 38.4H32V44.8H38.4V38.4Z" fill="#FF0000"/>
-<path d="M32 32H25.6V38.4H32V32Z" fill="#FF0000"/>
-<path d="M38.4 32H32V38.4H38.4V32Z" fill="#FF0000"/>
-<path d="M38.4 25.6H32V32H38.4V25.6Z" fill="#FF0000"/>
-<path d="M32 25.6H25.6V32H32V25.6Z" fill="#FF0000"/>
-<path d="M32 19.2H25.6V25.6H32V19.2Z" fill="#FF0000"/>
-<path d="M38.4 19.2H32V25.6H38.4V19.2Z" fill="#FF0000"/>
-<path d="M44.8 25.6H38.4V32H44.8V25.6Z" fill="#FF0000"/>
-<path d="M51.2 32H44.8V38.4H51.2V32Z" fill="#FF0000"/>
-<path d="M44.8 32H38.4V38.4H44.8V32Z" fill="#FF0000"/>
-<path d="M44.8 38.4H38.4V44.8H44.8V38.4Z" fill="#FF0000"/>
-<path d="M51.2 25.6H44.8V32H51.2V25.6Z" fill="#FF0000"/>
-<path d="M57.6 25.6H51.2V32H57.6V25.6Z" fill="#FF5757"/>
-<path d="M44.8 19.2H38.4V25.6H44.8V19.2Z" fill="#FF0000"/>
-<path d="M51.2 19.2H44.8V25.6H51.2V19.2Z" fill="#FF0000"/>
-<path d="M57.6 19.2H51.2V25.6H57.6V19.2Z" fill="#FF5757"/>
-<path d="M57.6 12.8H51.2V19.2H57.6V12.8Z" fill="#FF5757"/>
-<path d="M51.2 12.8H44.8V19.2H51.2V12.8Z" fill="#FF5757"/>
-<path d="M44.8 12.8H38.4V19.2H44.8V12.8Z" fill="#FF5757"/>
-</svg>
diff --git a/packages/core/public/icons/gold_badge.svg b/packages/core/public/icons/gold_badge.svg
deleted file mode 100644
index 26df3ab5..00000000
--- a/packages/core/public/icons/gold_badge.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_259_8332)">
-<path d="M12.9068 18.2534L16.0002 15.9067L19.0802 18.2534L17.9068 14.4534L21.0002 12.0001H17.2135L16.0002 8.25341L14.7868 12.0001H11.0002L14.0802 14.4534L12.9068 18.2534ZM26.6668 13.3334C26.6668 7.44008 21.8935 2.66675 16.0002 2.66675C10.1068 2.66675 5.3335 7.44008 5.3335 13.3334C5.3335 16.0401 6.34683 18.4934 8.00016 20.3734V30.6667L16.0002 28.0001L24.0002 30.6667V20.3734C25.6535 18.4934 26.6668 16.0401 26.6668 13.3334ZM16.0002 5.33341C20.4135 5.33341 24.0002 8.92008 24.0002 13.3334C24.0002 17.7467 20.4135 21.3334 16.0002 21.3334C11.5868 21.3334 8.00016 17.7467 8.00016 13.3334C8.00016 8.92008 11.5868 5.33341 16.0002 5.33341Z" fill="#FFC700"/>
-</g>
-<defs>
-<clipPath id="clip0_259_8332">
-<rect width="32" height="32" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/packages/core/public/icons/plurality.svg b/packages/core/public/icons/plurality.svg
deleted file mode 100644
index bea7c8f7..00000000
--- a/packages/core/public/icons/plurality.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_113_144)">
-<path d="M0.5 25V22.9C0.5 21.9444 0.988889 21.1667 1.96667 20.5667C2.94444 19.9667 4.23333 19.6667 5.83333 19.6667C6.12222 19.6667 6.4 19.6722 6.66667 19.6833C6.93333 19.6944 7.18889 19.7222 7.43333 19.7667C7.12222 20.2333 6.88889 20.7222 6.73333 21.2333C6.57778 21.7444 6.5 22.2778 6.5 22.8333V25H0.5ZM8.5 25V22.8333C8.5 22.1222 8.69444 21.4722 9.08333 20.8833C9.47222 20.2944 10.0222 19.7778 10.7333 19.3333C11.4444 18.8889 12.2944 18.5556 13.2833 18.3333C14.2722 18.1111 15.3444 18 16.5 18C17.6778 18 18.7611 18.1111 19.75 18.3333C20.7389 18.5556 21.5889 18.8889 22.3 19.3333C23.0111 19.7778 23.5556 20.2944 23.9333 20.8833C24.3111 21.4722 24.5 22.1222 24.5 22.8333V25H8.5ZM26.5 25V22.8333C26.5 22.2556 26.4278 21.7111 26.2833 21.2C26.1389 20.6889 25.9222 20.2111 25.6333 19.7667C25.8778 19.7222 26.1278 19.6944 26.3833 19.6833C26.6389 19.6722 26.9 19.6667 27.1667 19.6667C28.7667 19.6667 30.0556 19.9611 31.0333 20.55C32.0111 21.1389 32.5 21.9222 32.5 22.9V25H26.5ZM11.3333 22.3333H21.7C21.4778 21.8889 20.8611 21.5 19.85 21.1667C18.8389 20.8333 17.7222 20.6667 16.5 20.6667C15.2778 20.6667 14.1611 20.8333 13.15 21.1667C12.1389 21.5 11.5333 21.8889 11.3333 22.3333ZM5.83333 18.3333C5.1 18.3333 4.47222 18.0722 3.95 17.55C3.42778 17.0278 3.16667 16.4 3.16667 15.6667C3.16667 14.9111 3.42778 14.2778 3.95 13.7667C4.47222 13.2556 5.1 13 5.83333 13C6.58889 13 7.22222 13.2556 7.73333 13.7667C8.24444 14.2778 8.5 14.9111 8.5 15.6667C8.5 16.4 8.24444 17.0278 7.73333 17.55C7.22222 18.0722 6.58889 18.3333 5.83333 18.3333ZM27.1667 18.3333C26.4333 18.3333 25.8056 18.0722 25.2833 17.55C24.7611 17.0278 24.5 16.4 24.5 15.6667C24.5 14.9111 24.7611 14.2778 25.2833 13.7667C25.8056 13.2556 26.4333 13 27.1667 13C27.9222 13 28.5556 13.2556 29.0667 13.7667C29.5778 14.2778 29.8333 14.9111 29.8333 15.6667C29.8333 16.4 29.5778 17.0278 29.0667 17.55C28.5556 18.0722 27.9222 18.3333 27.1667 18.3333ZM16.5 17C15.3889 17 14.4444 16.6111 13.6667 15.8333C12.8889 15.0556 12.5 14.1111 12.5 13C12.5 11.8667 12.8889 10.9167 13.6667 10.15C14.4444 9.38333 15.3889 9 16.5 9C17.6333 9 18.5833 9.38333 19.35 10.15C20.1167 10.9167 20.5 11.8667 20.5 13C20.5 14.1111 20.1167 15.0556 19.35 15.8333C18.5833 16.6111 17.6333 17 16.5 17ZM16.5 14.3333C16.8778 14.3333 17.1944 14.2056 17.45 13.95C17.7056 13.6944 17.8333 13.3778 17.8333 13C17.8333 12.6222 17.7056 12.3056 17.45 12.05C17.1944 11.7944 16.8778 11.6667 16.5 11.6667C16.1222 11.6667 15.8056 11.7944 15.55 12.05C15.2944 12.3056 15.1667 12.6222 15.1667 13C15.1667 13.3778 15.2944 13.6944 15.55 13.95C15.8056 14.2056 16.1222 14.3333 16.5 14.3333Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0_113_144">
-<rect width="32" height="32" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/packages/core/public/icons/research.svg b/packages/core/public/icons/research.svg
deleted file mode 100644
index 303a31bb..00000000
--- a/packages/core/public/icons/research.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.6667 29.3333C8.82226 29.3333 7.25004 28.6833 5.95004 27.3833C4.65004 26.0833 4.00004 24.5111 4.00004 22.6667V10.6667C3.26671 10.6667 2.63893 10.4056 2.11671 9.88334C1.59449 9.36112 1.33337 8.73334 1.33337 8.00001V5.33334C1.33337 4.60001 1.59449 3.97223 2.11671 3.45001C2.63893 2.92778 3.26671 2.66667 4.00004 2.66667H17.3334C18.0667 2.66667 18.6945 2.92778 19.2167 3.45001C19.7389 3.97223 20 4.60001 20 5.33334V8.00001C20 8.73334 19.7389 9.36112 19.2167 9.88334C18.6945 10.4056 18.0667 10.6667 17.3334 10.6667V14.7C16.4 15.3 15.6056 16.05 14.95 16.95C14.2945 17.85 13.8334 18.8667 13.5667 20H10.6667V17.3333H14.6667V16H10.6667V13.3333H14.6667V10.6667H6.66671V22.6667C6.66671 23.7778 7.0556 24.7222 7.83337 25.5C8.61115 26.2778 9.5556 26.6667 10.6667 26.6667C11.3334 26.6667 11.9445 26.5222 12.5 26.2333C13.0556 25.9445 13.5223 25.5445 13.9 25.0333C14.0778 25.4778 14.2778 25.9 14.5 26.3C14.7223 26.7 14.9889 27.0889 15.3 27.4667C14.7 28.0445 14.0056 28.5 13.2167 28.8333C12.4278 29.1667 11.5778 29.3333 10.6667 29.3333ZM10.6667 24V21.3333H13.3667C13.3223 21.7778 13.3167 22.2222 13.35 22.6667C13.3834 23.1111 13.4556 23.5556 13.5667 24H10.6667ZM4.00004 8.00001H17.3334V5.33334H4.00004V8.00001ZM22 25.3333C22.9334 25.3333 23.7223 25.0111 24.3667 24.3667C25.0112 23.7222 25.3334 22.9333 25.3334 22C25.3334 21.0667 25.0112 20.2778 24.3667 19.6333C23.7223 18.9889 22.9334 18.6667 22 18.6667C21.0667 18.6667 20.2778 18.9889 19.6334 19.6333C18.9889 20.2778 18.6667 21.0667 18.6667 22C18.6667 22.9333 18.9889 23.7222 19.6334 24.3667C20.2778 25.0111 21.0667 25.3333 22 25.3333ZM28.8 30.6667L25.2 27.0667C24.7112 27.3778 24.2 27.6111 23.6667 27.7667C23.1334 27.9222 22.5778 28 22 28C20.3334 28 18.9167 27.4167 17.75 26.25C16.5834 25.0833 16 23.6667 16 22C16 20.3333 16.5834 18.9167 17.75 17.75C18.9167 16.5833 20.3334 16 22 16C23.6667 16 25.0834 16.5833 26.25 17.75C27.4167 18.9167 28 20.3333 28 22C28 22.5778 27.9223 23.1333 27.7667 23.6667C27.6112 24.2 27.3778 24.7111 27.0667 25.2L30.6667 28.8L28.8 30.6667Z" fill="white"/>
-</svg>
diff --git a/packages/core/public/icons/silver_badge.svg b/packages/core/public/icons/silver_badge.svg
deleted file mode 100644
index 1c1c2657..00000000
--- a/packages/core/public/icons/silver_badge.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_259_8335)">
-<path d="M12.9068 18.2534L16.0002 15.9067L19.0802 18.2534L17.9068 14.4534L21.0002 12.0001H17.2135L16.0002 8.25341L14.7868 12.0001H11.0002L14.0802 14.4534L12.9068 18.2534ZM26.6668 13.3334C26.6668 7.44008 21.8935 2.66675 16.0002 2.66675C10.1068 2.66675 5.3335 7.44008 5.3335 13.3334C5.3335 16.0401 6.34683 18.4934 8.00016 20.3734V30.6667L16.0002 28.0001L24.0002 30.6667V20.3734C25.6535 18.4934 26.6668 16.0401 26.6668 13.3334ZM16.0002 5.33341C20.4135 5.33341 24.0002 8.92008 24.0002 13.3334C24.0002 17.7467 20.4135 21.3334 16.0002 21.3334C11.5868 21.3334 8.00016 17.7467 8.00016 13.3334C8.00016 8.92008 11.5868 5.33341 16.0002 5.33341Z" fill="#9F9F9F"/>
-</g>
-<defs>
-<clipPath id="clip0_259_8335">
-<rect width="32" height="32" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/packages/core/public/images/astronaut.png b/packages/core/public/images/astronaut.png
deleted file mode 100644
index d5b90963..00000000
Binary files a/packages/core/public/images/astronaut.png and /dev/null differ
diff --git a/packages/core/public/images/berlin.png b/packages/core/public/images/berlin.png
deleted file mode 100644
index 861fdfd0..00000000
Binary files a/packages/core/public/images/berlin.png and /dev/null differ
diff --git a/packages/core/public/images/taipei.png b/packages/core/public/images/taipei.png
deleted file mode 100644
index 96c54eb2..00000000
Binary files a/packages/core/public/images/taipei.png and /dev/null differ
diff --git a/packages/core/public/logos/arbitrum.svg b/packages/core/public/logos/arbitrum.svg
deleted file mode 100644
index 7be05e4e..00000000
--- a/packages/core/public/logos/arbitrum.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<svg width="156" height="156" viewBox="0 0 156 156" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_150_27)">
-<mask id="mask0_150_27" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="7" y="0" width="142" height="156">
-<path d="M148.375 0H7V156H148.375V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_150_27)">
-<path d="M89.5352 89.8541L81.8005 110.563C81.5724 111.137 81.5724 111.775 81.8005 112.349L95.0829 147.991L110.454 139.312L92.0156 89.8541C91.591 88.7055 89.9593 88.7055 89.5352 89.8541Z" fill="white"/>
-<path d="M105.003 55.01C104.578 53.8614 102.947 53.8614 102.523 55.01L94.7879 75.7185C94.5593 76.2932 94.5593 76.9314 94.7879 77.5057L116.555 135.866L131.927 127.187L105.003 55.01Z" fill="white"/>
-<path d="M77.6875 9.66825C78.079 9.66825 78.4383 9.76394 78.7971 9.95543L137.41 43.0444C138.095 43.4273 138.519 44.1293 138.519 44.8951V111.073C138.519 111.839 138.095 112.541 137.41 112.924L78.7971 146.045C78.4709 146.236 78.079 146.332 77.6875 146.332C77.296 146.332 76.9367 146.236 76.5779 146.045L17.998 112.956C17.3127 112.573 16.8884 111.871 16.8884 111.105V44.8951C16.8884 44.1293 17.3127 43.4273 17.998 43.0444L76.6106 9.95543C76.9368 9.76394 77.3287 9.66825 77.6875 9.66825ZM77.6875 0C75.599 0 73.5101 0.542441 71.6498 1.59542L13.0375 34.6844C9.31709 36.7904 7 40.6832 7 44.8951V111.073C7 115.285 9.31709 119.21 13.0375 121.316L71.6498 154.404C73.5101 155.457 75.599 156 77.6875 156C79.776 156 81.8649 155.457 83.7252 154.404L142.337 121.316C146.091 119.21 148.375 115.317 148.375 111.073V44.8951C148.375 40.6832 146.058 36.7584 142.337 34.6525L83.7579 1.59542C81.8649 0.542441 79.776 0 77.6875 0Z" fill="white"/>
-<path d="M38.9541 135.93L44.3389 121.507L55.1737 130.314L45.0568 139.376L38.9541 135.93Z" fill="white"/>
-<path d="M72.7579 40.1724H57.9091C56.7996 40.1724 55.7875 40.8424 55.4287 41.8635L23.5769 127.25L38.948 135.929L74.0308 41.8954C74.3242 41.0658 73.7041 40.1724 72.7579 40.1724Z" fill="white"/>
-<path d="M98.765 40.1724H83.9163C82.8067 40.1724 81.7947 40.8424 81.4359 41.8635L45.0479 139.375L60.4188 148.055L100.005 41.9273C100.331 41.0658 99.6791 40.1724 98.765 40.1724Z" fill="white"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_150_27">
-<rect width="141.375" height="156" fill="white" transform="translate(7)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/packages/core/public/logos/plurality.svg b/packages/core/public/logos/plurality.svg
deleted file mode 100644
index 6714977b..00000000
--- a/packages/core/public/logos/plurality.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg width="156" height="156" viewBox="0 0 156 156" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M0 0H156V156H0V0Z" fill="url(#pattern0)"/>
-<defs>
-<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image0_150_3" transform="translate(-0.00320513) scale(0.00641026)"/>
-</pattern>
-<image id="image0_150_3" width="157" height="156" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJ0AAACcCAYAAABleqlzAAAACXBIWXMAAAsTAAALEwEAmpwYAAADGklEQVR4nO3dMW4TURiF0f9FQVDGO3ADNSWiweyAVEQ0wA5oQ0MqwhqggC5KBTsAdpA6FGQHSQkFGdbgp+S+sXxOb82V8knP8sTjdnp8+W6a6k1V7RXbodWPu39rf/9ocTXi8jvTVEcluO0y1erPnXo26vI7oy7M9hIdcaIjTnTEiY440REnOuJER5zoiBMdcaIjbrfzdVfV6uxGl9Bnqr2qejh6xjr6omt1dnC4eHrDW+hwcnz5qk31efSOdTheiRMdcaIjTnTEiY440REnOuJ6PxyGevH448Pr67b2l7pER7d//+prVS3Xe1W7cLwSJzriREec6IgTHXGiI24WH5l8qF/fR29Imqp+Htb9o9E7RplFdFW1Gj0gqVW7GL1hJMcrcaIjTnTEiY440REnOuJER5zoiBMdcaIjTnTEiY64Wdzwn2p6PXpDp1Wr9nL0iE0zi+gO68GX0Rt6HNd5VZXo1uR4JU50xImOONERJzriREec6IgTHXGiI050xImOuFnce/1Q579Hb+jRqu1No0dsoFlEV9WWgwd0EVwfxytxoiNOdMSJjjjRESc64kRHnOiIEx1xoiNOdMSJjriZ3PDvs8GPo7gYPWCkjY5uUx9Hse0cr8SJjjjRESc64kRHnOiIEx1xoiNOdMSJjjjRESc64kRHnOiIEx1xoiNOdMSJjjjRESc64kRHnOiIEx1xoiNOdMTN4hv+G/x4CDrMIjqPh9gujlfiREec6IgTHXGiI050xImOONERJzriREec6IgTHXF9N/ynWp4cX7662Sn0aFVPRm9YV+9/mSzbVJ9vdAlbw/FKnOiIEx1xoiNOdMSJjjjRESc64kRHnOiIEx1xO9Xqx+gRxF3Vzri/++7B4eLp6fvLZ9et9kaNIOve3/q2f7S4GnX93aqq528X30YNYPt4T0ec6IgTHXGiI050xImOONERJzriREec6IgTHXGiI050xImOuFv9maaDR59W01TvbvMaDLXsedEt/zbYtKxqq9u9BpvG8Uqc6IgTHXGiI050xImOONERJzriREec6IgTHXGiI+4/Vp1PeVujjRQAAAAASUVORK5CYII="/>
-</defs>
-</svg>
diff --git a/packages/core/src/App.tsx b/packages/core/src/App.tsx
deleted file mode 100644
index a949be46..00000000
--- a/packages/core/src/App.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { ReactNode, useEffect, useMemo } from 'react';
-import { Navigate, Route, Routes } from 'react-router-dom';
-import useUser from './hooks/useUser';
-import Account from './pages/Account';
-import Event from './pages/Event';
-import Events from './pages/Events';
-import Landing from './pages/Landing';
-import PassportPopupRedirect from './pages/Popup';
-import Register from './pages/Register';
-import Vote from './pages/Vote';
-import { useAppStore } from './store';
-import OnboardingPage from './pages/Onboarding';
-import Results from './pages/Results';
-
-function App() {
-  const { user, isLoading } = useUser();
-  const onboardingStatus = useAppStore((state) => state.onboardingStatus);
-  const userStatus = useAppStore((state) => state.userStatus);
-  const setUserStatus = useAppStore((state) => state.setUserStatus);
-
-  useEffect(() => {
-    // check if user has email and name
-    if (user?.username) {
-      setUserStatus('COMPLETE');
-    }
-  }, [user, setUserStatus]);
-
-  const handleHomePage = useMemo((): ReactNode => {
-    if (!user) {
-      return <Landing />;
-    }
-
-    if (onboardingStatus === 'INCOMPLETE') {
-      return <Navigate to="/onboarding" replace />;
-    }
-
-    if (userStatus === 'INCOMPLETE') {
-      return <Navigate to="/account" replace />;
-    }
-
-    if (userStatus === 'COMPLETE') {
-      return <Navigate to="/events" replace />;
-    }
-
-    return <Landing />;
-  }, [user, userStatus, onboardingStatus]);
-
-  // This will be a loading skeleton
-  if (isLoading) {
-    return <h1>Loading...</h1>;
-  }
-
-  return (
-    <Routes>
-      <Route path="/" element={handleHomePage} />
-      <Route path="/onboarding" element={<OnboardingPage />} />
-      <Route path="/events" element={user ? <Events /> : <Navigate to="/" replace />} />
-      <Route path="/events/:eventId" element={user ? <Event /> : <Navigate to="/" replace />} />
-      <Route
-        path="/events/:eventId/register"
-        element={user ? <Register /> : <Navigate to="/" replace />}
-      />
-      <Route
-        path="/events/:eventId/cycles/:cycleId"
-        element={user ? <Vote /> : <Navigate to="/" replace />}
-      />
-      <Route
-        path="/events/:eventId/cycles/:cycleId/results"
-        element={user ? <Results /> : <Navigate to="/" replace />}
-      />
-      <Route path="/account" element={user ? <Account /> : <Navigate to="/" replace />} />
-      <Route path="/popup" element={<PassportPopupRedirect />} />
-    </Routes>
-  );
-}
-
-export default App;
diff --git a/packages/core/src/components/button/Button.styled.tsx b/packages/core/src/components/button/Button.styled.tsx
deleted file mode 100644
index 91884bf8..00000000
--- a/packages/core/src/components/button/Button.styled.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import styled from 'styled-components';
-import { ButtonProps } from '../../types/ButtonType';
-
-export const StyledButton = styled.button<ButtonProps>`
-  align-self: ${(props) => (props.center ? 'center' : 'flex-start')};
-  background-color: var(--color-primary);
-  background-color: ${(props) => props.color === 'secondary' && 'var(--color-secondary)'};
-  background: ${(props) => props.variant === 'text' && 'none'};
-  border-radius: 0.5rem;
-  border: none;
-  padding-block: 0.5rem;
-  padding-inline: 1rem;
-  transition: ease 0.25s;
-
-  &:hover {
-    opacity: 0.8;
-  }
-
-  &:disabled {
-    background-color: var(--color-skeleton-gray);
-    cursor: not-allowed;
-    &:hover {
-      opacity: 1;
-    }
-  }
-`;
diff --git a/packages/core/src/components/button/Button.tsx b/packages/core/src/components/button/Button.tsx
deleted file mode 100644
index 8e560696..00000000
--- a/packages/core/src/components/button/Button.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { StyledButton } from './Button.styled';
-import { ButtonProps } from '../../types/ButtonType';
-import ButtonText from '../typography/ButtonText';
-
-function Button({ children, color, variant, onClick, center, ...props }: ButtonProps) {
-  return (
-    <StyledButton color={color} variant={variant} onClick={onClick} center={center} {...props}>
-      <ButtonText>{children}</ButtonText>
-    </StyledButton>
-  );
-}
-
-export default Button;
diff --git a/packages/core/src/components/button/index.ts b/packages/core/src/components/button/index.ts
deleted file mode 100644
index efe8c800..00000000
--- a/packages/core/src/components/button/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Button';
diff --git a/packages/core/src/components/card/Card.styled.tsx b/packages/core/src/components/card/Card.styled.tsx
deleted file mode 100644
index 023448e0..00000000
--- a/packages/core/src/components/card/Card.styled.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import styled from 'styled-components';
-import Title from '../typography/Title';
-
-export const StyledCard = styled.article`
-  background-color: var(--color-dark-gray);
-  border-radius: 1rem;
-  padding: 2rem;
-  text-align: center;
-`;
-
-export const Icon = styled.div`
-  align-self: center;
-  height: 2rem;
-  width: 2rem;
-`;
-
-export const CardTitle = styled.h3`
-  color: #eee;
-  font-size: 1.25rem;
-  font-weight: 600;
-  line-height: 1.75rem;
-  &::first-letter {
-    text-transform: capitalize;
-  }
-  &::after {
-    content: ':';
-  }
-`;
-
-export const Body = styled.p`
-  color: #ddd;
-  font-size: 1.125rem;
-  font-weight: 400;
-  letter-spacing: 0.35px;
-  &::first-letter {
-    text-transform: capitalize;
-  }
-`;
-
-export const BigNumber = styled(Title)`
-  height: 100%;
-  justify-self: flex-end;
-`;
diff --git a/packages/core/src/components/card/Card.tsx b/packages/core/src/components/card/Card.tsx
deleted file mode 100644
index c9e11430..00000000
--- a/packages/core/src/components/card/Card.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { FlexColumn } from '../../layout/Layout.styled';
-import { StyledCard, CardTitle, Body, Icon, BigNumber } from './Card.styled';
-
-type CardProps = {
-  icon?: string;
-  title: string;
-  body?: string | undefined;
-  bigNumber?: number | undefined;
-};
-
-function Card({ icon, title, body, bigNumber }: CardProps) {
-  return (
-    <StyledCard>
-      <FlexColumn $gap="1.25rem">
-        {icon && (
-          <Icon>
-            <img src={icon} alt="Icon" />
-          </Icon>
-        )}
-        {title && <CardTitle>{title}</CardTitle>}
-        {body && <Body>{body}</Body>}
-        {bigNumber && <BigNumber>{bigNumber}</BigNumber>}
-      </FlexColumn>
-    </StyledCard>
-  );
-}
-
-export default Card;
diff --git a/packages/core/src/components/card/index.ts b/packages/core/src/components/card/index.ts
deleted file mode 100644
index c68311df..00000000
--- a/packages/core/src/components/card/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Card';
diff --git a/packages/core/src/components/chip/Chip.styled.tsx b/packages/core/src/components/chip/Chip.styled.tsx
deleted file mode 100644
index 5548713c..00000000
--- a/packages/core/src/components/chip/Chip.styled.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import styled from 'styled-components';
-
-export const StyledChip = styled.div<{ $status?: 'OPEN' | 'CLOSED' | 'RESULTS' | null }>`
-  align-content: center;
-  align-self: flex-end;
-  background-color: lightcoral;
-  background-color: ${(props) => props.$status === 'OPEN' && '#62B45A'};
-  background-color: ${(props) => props.$status === 'CLOSED' && 'lightcoral'};
-  background-color: ${(props) => props.$status === 'RESULTS' && '#FFA800'};
-  border-radius: 2rem;
-  cursor: default;
-  display: flex;
-  font-weight: 600;
-  justify-content: center;
-  padding-block: 0.5rem;
-  padding-inline: 1rem;
-  user-select: none;
-`;
diff --git a/packages/core/src/components/chip/Chip.tsx b/packages/core/src/components/chip/Chip.tsx
deleted file mode 100644
index 42085ecf..00000000
--- a/packages/core/src/components/chip/Chip.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { StyledChip } from './Chip.styled';
-
-type ChipProps = {
-  children: React.ReactNode;
-  status?: 'OPEN' | 'CLOSED' | 'RESULTS' | null;
-};
-
-function Chip({ children, status }: ChipProps) {
-  return <StyledChip $status={status}>{children}</StyledChip>;
-}
-
-export default Chip;
diff --git a/packages/core/src/components/chip/index.ts b/packages/core/src/components/chip/index.ts
deleted file mode 100644
index fa00616d..00000000
--- a/packages/core/src/components/chip/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Chip';
diff --git a/packages/core/src/components/countdown/Countdown.styled.tsx b/packages/core/src/components/countdown/Countdown.styled.tsx
deleted file mode 100644
index b00e9baf..00000000
--- a/packages/core/src/components/countdown/Countdown.styled.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import styled from 'styled-components';
-import { StyledChip } from '../chip/Chip.styled';
-
-export const StyledCountdown = styled(StyledChip)`
-  align-self: flex-start;
-  background-color: var(--color-silver-blue);
-  font-family: monospace;
-  font-size: 1rem;
-  text-align: center;
-
-  @media (min-width: 600px) {
-    justify-self: flex-end;
-  }
-`;
diff --git a/packages/core/src/components/countdown/Countdown.tsx b/packages/core/src/components/countdown/Countdown.tsx
deleted file mode 100644
index 04ff99c6..00000000
--- a/packages/core/src/components/countdown/Countdown.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { StyledCountdown } from './Countdown.styled';
-
-type CountdownProps = {
-  formattedTime: string;
-};
-
-function Countdown({ formattedTime }: CountdownProps) {
-  return <StyledCountdown>{formattedTime}</StyledCountdown>;
-}
-
-export default Countdown;
diff --git a/packages/core/src/components/countdown/index.ts b/packages/core/src/components/countdown/index.ts
deleted file mode 100644
index 6971c507..00000000
--- a/packages/core/src/components/countdown/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Countdown';
diff --git a/packages/core/src/components/eventCard/EventCard.styled.tsx b/packages/core/src/components/eventCard/EventCard.styled.tsx
deleted file mode 100644
index c8633318..00000000
--- a/packages/core/src/components/eventCard/EventCard.styled.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import styled, { css } from 'styled-components';
-
-export const StyledEventCard = styled.article<{ $direction: 'column' | 'row' }>`
-  background-color: var(--color-dark-gray);
-  border-radius: 1rem;
-  display: flex;
-  flex-direction: ${(props) => props.$direction && props.$direction};
-
-  .content {
-    padding: 2rem;
-  }
-`;
-
-export const ImageContainer = styled.div<{ $direction: 'column' | 'row' }>`
-  background-color: var(--color-skeleton-gray);
-  border-radius: 1rem 1rem 0 0;
-  height: 200px;
-  overflow: hidden;
-
-  img {
-    height: 100%;
-    object-fit: cover;
-    object-position: center;
-    width: 100%;
-  }
-
-  ${(props) =>
-    props.$direction === 'row' &&
-    css`
-      margin-right: 1rem;
-      min-height: 340px;
-      min-width: 50%;
-    `}
-`;
-
-export const Title = styled.h3`
-  font-family: 'Press Start 2P', sans-serif;
-  font-size: 1.25rem;
-  line-height: 1.75rem;
-  /* min-height: 3.5rem; */
-`;
-
-export const Description = styled.p`
-  font-size: 1rem;
-  line-height: 1.375rem;
-  /* min-height: 1.375rem; */
-`;
diff --git a/packages/core/src/components/eventCard/EventCard.tsx b/packages/core/src/components/eventCard/EventCard.tsx
deleted file mode 100644
index 1bba6cc5..00000000
--- a/packages/core/src/components/eventCard/EventCard.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { useNavigate } from 'react-router-dom';
-import { FlexColumn, FlexRow } from '../../layout/Layout.styled';
-import Button from '../button';
-import { Description, ImageContainer, StyledEventCard, Title } from './EventCard.styled';
-
-type EventCardType = {
-  $direction?: 'column' | 'row';
-  eventId?: string;
-  src: string | undefined;
-  title?: string;
-  description?: string | null;
-  buttonText?: string;
-};
-
-function EventCard({
-  $direction = 'column',
-  eventId,
-  src,
-  title,
-  description,
-  buttonText,
-}: EventCardType) {
-  const navigate = useNavigate();
-  const handleClick = (eventId: string) => {
-    navigate(`/events/${eventId}`);
-  };
-
-  return (
-    <StyledEventCard $direction={$direction}>
-      <ImageContainer $direction={$direction}>
-        <img src={src} alt="Event image" />
-      </ImageContainer>
-      <FlexColumn className="content" $gap="2rem">
-        <Title>{title}</Title>
-        {description && <Description>{description}</Description>}
-        <FlexRow $alignSelf="flex-end">
-          {buttonText && eventId && (
-            <Button color="primary" onClick={() => handleClick(eventId)}>
-              {buttonText}
-            </Button>
-          )}
-        </FlexRow>
-      </FlexColumn>
-    </StyledEventCard>
-  );
-}
-
-export default EventCard;
diff --git a/packages/core/src/components/eventCard/index.ts b/packages/core/src/components/eventCard/index.ts
deleted file mode 100644
index 9d0d9030..00000000
--- a/packages/core/src/components/eventCard/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './EventCard';
diff --git a/packages/core/src/components/footer/Footer.styled.tsx b/packages/core/src/components/footer/Footer.styled.tsx
deleted file mode 100644
index 156f8e85..00000000
--- a/packages/core/src/components/footer/Footer.styled.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import styled from 'styled-components';
-
-export const SyledFooter = styled.footer`
-  align-items: center;
-  background-color: var(--color-primary);
-  display: flex;
-  height: 6rem;
-  justify-content: center;
-`;
-
-export const FooterContainer = styled.div`
-  align-items: center;
-  display: flex;
-  justify-content: center;
-  width: min(90%, 1080px);
-`;
diff --git a/packages/core/src/components/footer/Footer.tsx b/packages/core/src/components/footer/Footer.tsx
deleted file mode 100644
index 60a93935..00000000
--- a/packages/core/src/components/footer/Footer.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { FlexColumn, FlexRow } from '../../layout/Layout.styled';
-import { FooterContainer, SyledFooter } from './Footer.styled';
-
-function Header() {
-  return (
-    <SyledFooter>
-      <FooterContainer>
-        <FlexColumn $gap="0.5rem" $alignItems="center">
-          <FlexRow>
-            <img src="logos/arbitrum.svg" height={24} width={24} />
-            <img src="logos/plurality.svg" height={24} width={24} />
-          </FlexRow>
-          <p>Powered by Lexicon</p>
-        </FlexColumn>
-      </FooterContainer>
-    </SyledFooter>
-  );
-}
-
-export default Header;
diff --git a/packages/core/src/components/footer/index.ts b/packages/core/src/components/footer/index.ts
deleted file mode 100644
index be92134c..00000000
--- a/packages/core/src/components/footer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Footer';
diff --git a/packages/core/src/components/form/ErrorText.tsx b/packages/core/src/components/form/ErrorText.tsx
deleted file mode 100644
index 1f61e3a6..00000000
--- a/packages/core/src/components/form/ErrorText.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import styled from 'styled-components';
-
-interface ErrorTextProps {
-  children: React.ReactNode;
-}
-
-const StyledErrorText = styled.div`
-  color: var(--color-error);
-  font-size: 0.875rem;
-  &::first-letter {
-    text-transform: uppercase;
-  }
-`;
-
-function ErrorText({ children }: ErrorTextProps) {
-  return <StyledErrorText>{children}</StyledErrorText>;
-}
-
-export default ErrorText;
diff --git a/packages/core/src/components/form/Input.tsx b/packages/core/src/components/form/Input.tsx
deleted file mode 100644
index b78c1522..00000000
--- a/packages/core/src/components/form/Input.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {}
-
-const StyledInput = styled.input`
-  background-color: #3b3b3b;
-  border-radius: 0.5rem;
-  border: 1px solid #ccc;
-  padding: 0.75rem 1rem;
-  width: 100%;
-
-  &:disabled {
-    background-color: #3b3b3b4d;
-    border: 1px solid #ccc;
-    cursor: not-allowed;
-  }
-`;
-
-const Input = React.forwardRef<HTMLInputElement, InputProps>((props, ref) => {
-  return <StyledInput ref={ref} {...props} />;
-});
-
-export default Input;
diff --git a/packages/core/src/components/form/Select.tsx b/packages/core/src/components/form/Select.tsx
deleted file mode 100644
index 62d4cbfe..00000000
--- a/packages/core/src/components/form/Select.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-interface SelectProps extends React.SelectHTMLAttributes<HTMLSelectElement> {}
-
-const StyledSelect = styled.select`
-  appearance: none;
-  background-color: #3b3b3b;
-  background-image: url('/icons/arrow_down.svg');
-  background-position: right 0.75rem top 50%;
-  background-repeat: no-repeat;
-  background-size: 1.5rem;
-  border-radius: 0.5rem;
-  border: 1px solid #ccc;
-  padding: 0.75rem 1rem;
-  width: 100%;
-
-  &:disabled {
-    background-color: #3b3b3b4d;
-    border: 1px solid #ccc;
-    cursor: not-allowed;
-  }
-`;
-
-const Select = React.forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
-  return <StyledSelect ref={ref} {...props} />;
-});
-
-export default Select;
diff --git a/packages/core/src/components/form/Textarea.tsx b/packages/core/src/components/form/Textarea.tsx
deleted file mode 100644
index 70a0902c..00000000
--- a/packages/core/src/components/form/Textarea.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import styled from 'styled-components';
-
-interface TextareaProps extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
-
-const StyledTextarea = styled.textarea`
-  background-color: #3b3b3b;
-  border-radius: 0.5rem;
-  border: 1px solid #ccc;
-  height: 12rem;
-  padding: 0.75rem 1rem;
-  resize: none;
-  width: 100%;
-
-  &:disabled {
-    background-color: #3b3b3b4d;
-    border: 1px solid #ccc;
-    cursor: not-allowed;
-  }
-`;
-
-function Textarea({ ...props }: TextareaProps) {
-  return <StyledTextarea {...props} />;
-}
-
-export default Textarea;
diff --git a/packages/core/src/components/header/Header.styled.tsx b/packages/core/src/components/header/Header.styled.tsx
deleted file mode 100644
index f4782862..00000000
--- a/packages/core/src/components/header/Header.styled.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { NavLink } from 'react-router-dom';
-import styled from 'styled-components';
-
-export const SyledHeader = styled.header`
-  align-items: center;
-  background-color: var(--color-primary);
-  display: flex;
-  min-height: 6rem;
-  justify-content: center;
-  padding-block: 2rem;
-`;
-
-export const HeaderContainer = styled.div`
-  align-items: center;
-  display: flex;
-  flex-direction: column;
-  gap: 2rem;
-  justify-content: space-between;
-  width: min(90%, 1080px);
-
-  @media (min-width: 600px) {
-    flex-direction: row;
-  }
-`;
-
-export const Logo = styled.h2`
-  cursor: pointer;
-  font-family: 'Press Start 2P', sans-serif;
-  font-size: 1.125rem;
-  line-height: 1.5rem;
-  text-align: center;
-
-  @media (min-width: 600px) {
-    text-align: left;
-  }
-`;
-
-export const NavButtons = styled.ul`
-  display: flex;
-  gap: 1rem;
-  list-style: none;
-`;
-
-export const StyledNavLink = styled(NavLink)`
-  padding-bottom: 0.5rem;
-  border-bottom: 3px solid transparent;
-  &.active {
-    border-bottom: 3px solid var(--color-white);
-  }
-`;
diff --git a/packages/core/src/components/header/Header.tsx b/packages/core/src/components/header/Header.tsx
deleted file mode 100644
index d747f27a..00000000
--- a/packages/core/src/components/header/Header.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { logout } from 'api';
-import Button from '../button';
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-import ZupassLoginButton from '../zupassLoginButton';
-import { HeaderContainer, NavButtons, SyledHeader, StyledNavLink, Logo } from './Header.styled';
-import useUser from '../../hooks/useUser';
-import { useNavigate } from 'react-router-dom';
-import { useAppStore } from '../../store';
-
-function Header() {
-  const queryClient = useQueryClient();
-  const navigate = useNavigate();
-  const { user } = useUser();
-  const resetState = useAppStore((state) => state.reset);
-  const { mutate: mutateLogout } = useMutation({
-    mutationFn: logout,
-    onSuccess: async () => {
-      resetState();
-      await queryClient.invalidateQueries();
-      await queryClient.removeQueries();
-    },
-  });
-
-  return (
-    <SyledHeader>
-      <HeaderContainer>
-        <Logo onClick={() => navigate('/events')}>
-          Plural
-          <br />
-          Research
-        </Logo>
-        <nav>
-          <NavButtons>
-            {user ? (
-              <>
-                <li>
-                  <StyledNavLink to="/events">
-                    <Button variant="text" tabIndex={-1}>
-                      Communities
-                    </Button>
-                  </StyledNavLink>
-                </li>
-                <li>
-                  <StyledNavLink to="/account">
-                    <Button variant="text" tabIndex={-1}>
-                      Account
-                    </Button>
-                  </StyledNavLink>
-                </li>
-                <li>
-                  <Button color="secondary" onClick={mutateLogout}>
-                    Log out
-                  </Button>
-                </li>
-              </>
-            ) : (
-              <>
-                <li>
-                  <ZupassLoginButton color="secondary">Login with Zupass</ZupassLoginButton>
-                </li>
-              </>
-            )}
-          </NavButtons>
-        </nav>
-      </HeaderContainer>
-    </SyledHeader>
-  );
-}
-
-export default Header;
diff --git a/packages/core/src/components/header/index.ts b/packages/core/src/components/header/index.ts
deleted file mode 100644
index 579f1ac2..00000000
--- a/packages/core/src/components/header/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Header';
diff --git a/packages/core/src/components/hero/Hero.styled.tsx b/packages/core/src/components/hero/Hero.styled.tsx
deleted file mode 100644
index 61414679..00000000
--- a/packages/core/src/components/hero/Hero.styled.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import styled from 'styled-components';
-
-export const Section = styled.section`
-  display: grid;
-  grid-template-columns: 1fr;
-  row-gap: 3rem;
-
-  @media (min-width: 600px) {
-    column-gap: 2rem;
-    grid-template-columns: 1fr 1fr;
-    row-gap: 0;
-
-    & div {
-      grid-column: 2/3;
-      grid-row: 1/3;
-    }
-  }
-`;
-
-export const Body = styled.p`
-  font-size: 1.25rem;
-  font-weight: 500;
-  line-height: 2rem;
-`;
-
-export const ImageContainer = styled.div`
-  height: 100%;
-  /* background-color: red; */
-
-  & img {
-    height: 100%;
-    object-fit: contain;
-    /* width: 100%; */
-  }
-`;
diff --git a/packages/core/src/components/hero/Hero.tsx b/packages/core/src/components/hero/Hero.tsx
deleted file mode 100644
index 4e5b1560..00000000
--- a/packages/core/src/components/hero/Hero.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { FlexColumn } from '../../layout/Layout.styled';
-import Heading from '../typography/Heading';
-import ZupassLoginButton from '../zupassLoginButton';
-import { Body, ImageContainer, Section } from './Hero.styled';
-
-type HeroProps = {
-  data: {
-    title: string;
-    body: string;
-    button: string;
-  };
-};
-
-function Hero({ data }: HeroProps) {
-  return (
-    <Section>
-      <ImageContainer>
-        <img src="/images/berlin.png" alt="Berlin graphic" />
-      </ImageContainer>
-      <FlexColumn $gap={'3rem'}>
-        <FlexColumn $gap={'2rem'}>
-          <Heading>{data.title}</Heading>
-          <Body>{data.body}</Body>
-        </FlexColumn>
-        <ZupassLoginButton>{data.button}</ZupassLoginButton>
-      </FlexColumn>
-    </Section>
-  );
-}
-
-export default Hero;
diff --git a/packages/core/src/components/hero/index.ts b/packages/core/src/components/hero/index.ts
deleted file mode 100644
index 9c292bc0..00000000
--- a/packages/core/src/components/hero/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Hero';
diff --git a/packages/core/src/components/onboarding/Onboarding.styled.tsx b/packages/core/src/components/onboarding/Onboarding.styled.tsx
deleted file mode 100644
index 71c9f68f..00000000
--- a/packages/core/src/components/onboarding/Onboarding.styled.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import styled from 'styled-components';
-import { FlexColumn } from '../../layout/Layout.styled';
-
-export const StyledOnboarding = styled(FlexColumn)`
-  align-items: center;
-  margin-inline: auto;
-  max-width: 450px;
-  min-height: 380px;
-  text-align: center;
-`;
-
-export const Dot = styled.div<{ active: boolean }>`
-  background-color: ${(props) => (props.active ? 'var(--color-primary)' : 'gray')};
-  border-radius: 50%;
-  height: 0.5rem;
-  transition: 0.2s ease-in;
-  width: 0.5rem;
-`;
diff --git a/packages/core/src/components/onboarding/Onboarding.tsx b/packages/core/src/components/onboarding/Onboarding.tsx
deleted file mode 100644
index 43b3f094..00000000
--- a/packages/core/src/components/onboarding/Onboarding.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { useState } from 'react';
-import { FlexColumn, FlexRow } from '../../layout/Layout.styled';
-import Button from '../button';
-import Body from '../typography/Body';
-import Title from '../typography/Title';
-import { Dot, StyledOnboarding } from './Onboarding.styled';
-
-type OnboardingProps = {
-  data: {
-    id: number;
-    title: string;
-    body: string;
-  }[];
-  handleSkip: () => void;
-};
-
-function Onboarding({ data, handleSkip }: OnboardingProps) {
-  const [currentStep, setCurrentStep] = useState(0);
-
-  const handleNext = () => {
-    if (currentStep === data.length - 1) {
-      handleSkip();
-    }
-    setCurrentStep((prevStep) => prevStep + 1);
-  };
-
-  return (
-    <StyledOnboarding $gap="2rem" $justifyContent="space-between">
-      <FlexColumn>
-        <Title>{data[currentStep].title}</Title>
-        <Body $align="center">{data[currentStep].body}</Body>
-      </FlexColumn>
-      <FlexColumn $gap="3rem">
-        <FlexRow $alignSelf="center" $gap="0.5rem">
-          {data.map((step) => (
-            <Dot key={step.id} active={step.id === currentStep} />
-          ))}
-        </FlexRow>
-        <FlexRow $alignSelf="center">
-          <Button variant="text" onClick={handleSkip}>
-            Skip
-          </Button>
-          <Button onClick={handleNext}>Next</Button>
-        </FlexRow>
-      </FlexColumn>
-    </StyledOnboarding>
-  );
-}
-
-export default Onboarding;
diff --git a/packages/core/src/components/onboarding/index.ts b/packages/core/src/components/onboarding/index.ts
deleted file mode 100644
index c0ad2b14..00000000
--- a/packages/core/src/components/onboarding/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Onboarding';
diff --git a/packages/core/src/components/option/Option.styled.tsx b/packages/core/src/components/option/Option.styled.tsx
deleted file mode 100644
index 9c17f649..00000000
--- a/packages/core/src/components/option/Option.styled.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import styled from 'styled-components';
-
-export const StyledOption = styled.article`
-  background-color: var(--color-dark-gray);
-  border-radius: 0.75rem;
-  padding: 2.5rem;
-  /* min-height: 500px; */
-`;
-
-export const Title = styled.h3`
-  color: #eee;
-  font-family: 'Press Start 2P', sans-serif;
-  font-size: 1rem;
-  font-weight: 600;
-  line-height: 1.25rem;
-
-  &::first-letter {
-    text-transform: capitalize;
-  }
-
-  @media (min-width: 600px) {
-    /* min-height: 4rem; */
-  }
-`;
-
-export const Body = styled.p`
-  color: #ddd;
-  font-size: 1.125rem;
-  line-height: 1.75rem;
-
-  &::first-letter {
-    text-transform: capitalize;
-  }
-`;
diff --git a/packages/core/src/components/option/Option.tsx b/packages/core/src/components/option/Option.tsx
deleted file mode 100644
index fcd7e6ea..00000000
--- a/packages/core/src/components/option/Option.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { useEffect, useState } from 'react';
-import { FlexColumn, FlexRow } from '../../layout/Layout.styled';
-import Button from '../button';
-import { Body, StyledOption, Title } from './Option.styled';
-
-type OptionProps = {
-  title: string;
-  body?: string;
-  availableHearts: number;
-  numOfVotes: number;
-  onVote: () => void;
-  onUnvote: () => void;
-};
-
-function Option({ title, body, availableHearts, numOfVotes, onVote, onUnvote }: OptionProps) {
-  const [localOptionHearts, setLocalOptionHearts] = useState(numOfVotes);
-
-  useEffect(() => {
-    setLocalOptionHearts(numOfVotes);
-  }, [numOfVotes]);
-
-  const handleVoteClick = () => {
-    if (availableHearts) {
-      setLocalOptionHearts((prevLocalOptionHearts) => prevLocalOptionHearts + 1);
-      onVote();
-    }
-  };
-
-  const handleUnvoteClick = () => {
-    setLocalOptionHearts((prevLocalOptionHearts) => Math.max(0, prevLocalOptionHearts - 1));
-    onUnvote();
-  };
-
-  return (
-    <StyledOption>
-      <FlexColumn $justifyContent="space-between" $gap="2rem">
-        <FlexColumn $gap="2rem">
-          <Title>{title}</Title>
-          {body && <Body>{body}</Body>}
-          <FlexRow $gap="0.25rem" $wrap>
-            {localOptionHearts > 0 ? (
-              Array.from({ length: localOptionHearts }).map((_, id) => (
-                <img key={id} src="/icons/full_heart.svg" height={32} width={32} alt="Full Heart" />
-              ))
-            ) : (
-              <img src="/icons/empty_heart.svg" height={32} width={32} alt="Empty Heart" />
-            )}
-          </FlexRow>
-        </FlexColumn>
-        <FlexRow $alignSelf="flex-end" $justifyContent="space-between">
-          <FlexRow $gap="0.5rem">
-            <Button
-              color="secondary"
-              onClick={handleUnvoteClick}
-              disabled={localOptionHearts === 0}
-            >
-              Unvote
-            </Button>
-            <Button color="primary" onClick={handleVoteClick} disabled={availableHearts === 0}>
-              Vote
-            </Button>
-          </FlexRow>
-        </FlexRow>
-      </FlexColumn>
-    </StyledOption>
-  );
-}
-
-export default Option;
diff --git a/packages/core/src/components/option/index.ts b/packages/core/src/components/option/index.ts
deleted file mode 100644
index 0d128782..00000000
--- a/packages/core/src/components/option/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Option';
diff --git a/packages/core/src/components/select/Select.styled.tsx b/packages/core/src/components/select/Select.styled.tsx
deleted file mode 100644
index 4aa8c18b..00000000
--- a/packages/core/src/components/select/Select.styled.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-export const SelectContainer = styled.div`
-  position: relative;
-  width: 100%;
-`;
-
-export const SearchInput = styled.input`
-  appearance: none;
-  background-color: #3b3b3b;
-  background-image: url('/icons/arrow_down.svg');
-  background-position: right 0.75rem top 50%;
-  background-repeat: no-repeat;
-  background-size: 1.5rem;
-  border-radius: 0.5rem;
-  border: 1px solid #ccc;
-  cursor: default;
-  padding: 0.75rem 1rem;
-  width: 100%;
-
-  &::placeholder {
-    color: var(--color-white);
-  }
-
-  &:disabled {
-    background-color: #3b3b3b4d;
-    border: 1px solid #ccc;
-    cursor: not-allowed;
-  }
-`;
-
-export const ForwardedSearchInput = React.forwardRef<
-  HTMLInputElement,
-  React.InputHTMLAttributes<HTMLInputElement>
->((props, ref) => {
-  return <SearchInput ref={ref} {...props} />;
-});
-
-export const Dropdown = styled.div`
-  position: absolute;
-  background-color: #3b3b3b;
-  width: 100%;
-  border-radius: 0.5rem;
-  overflow: hidden;
-  margin-top: 0.2rem;
-  /* border: 1px solid #ccc; */
-  z-index: 2;
-`;
-
-export const Option = styled.option`
-  padding: 0.5rem 1rem;
-
-  &:hover {
-    background-color: var(--color-primary);
-    cursor: pointer;
-  }
-`;
diff --git a/packages/core/src/components/select/Select.tsx b/packages/core/src/components/select/Select.tsx
deleted file mode 100644
index ae57991e..00000000
--- a/packages/core/src/components/select/Select.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { useState } from 'react';
-import { Dropdown, ForwardedSearchInput, Option, SelectContainer } from './Select.styled';
-
-type SelectProps = {
-  options: { name: string; id: string }[];
-  placeholder: string;
-  onChange?: (option: string) => void;
-  onBlur?: () => void;
-  onOptionCreate?: (option: string) => void;
-  // value can be either the id of the option or the name of the option
-  value?: string;
-};
-
-function Select({ options, placeholder, onChange, onOptionCreate, value, onBlur }: SelectProps) {
-  const [isDropdownOpen, setIsDropdownOpen] = useState(false);
-  const [searchTerm, setSearchTerm] = useState(options.find((o) => o.name === value)?.name ?? '');
-  const [selectedOption, setSelectedOption] = useState<string | undefined>(
-    options.find((o) => o.id === value)?.name,
-  );
-  const [creatableOption, setCreatableOption] = useState<string>('');
-
-  const handleSearchChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const inputText = event.target.value;
-    setSearchTerm(inputText);
-
-    if (!options.find((option) => option.name.toLowerCase() === inputText.toLowerCase())) {
-      setCreatableOption(inputText);
-    } else {
-      setCreatableOption('');
-    }
-  };
-
-  const handleInputFocus = () => {
-    setSearchTerm('');
-    setIsDropdownOpen(true);
-  };
-
-  const handleInputBlur = () => {
-    setTimeout(() => {
-      setIsDropdownOpen(false);
-    }, 200);
-    onBlur?.();
-  };
-
-  const handleOptionClick = (option: { id: string; name: string }) => {
-    setSearchTerm('');
-    setCreatableOption('');
-    setSelectedOption(option.name);
-    setIsDropdownOpen(false);
-    onChange?.(option.id);
-  };
-
-  const handleOptionCreate = (option: { id: string; name: string }) => {
-    setSearchTerm('');
-    setCreatableOption('');
-    setSelectedOption(option.name);
-    setIsDropdownOpen(false);
-    onOptionCreate?.(option.id);
-  };
-
-  return (
-    <SelectContainer>
-      <ForwardedSearchInput
-        type="text"
-        placeholder={selectedOption || placeholder}
-        value={searchTerm}
-        onFocus={handleInputFocus}
-        onChange={handleSearchChange}
-        onBlur={handleInputBlur}
-      />
-      {isDropdownOpen && (
-        <Dropdown>
-          {options
-            .filter((option) => option.name.toLowerCase().includes(searchTerm.toLowerCase()))
-            .map((option, idx) => (
-              <Option key={idx} onClick={() => handleOptionClick(option)}>
-                {option.name}
-              </Option>
-            ))}
-          {creatableOption && onOptionCreate && (
-            <Option
-              onClick={() => handleOptionCreate({ name: creatableOption, id: creatableOption })}
-            >
-              Create "{creatableOption}"
-            </Option>
-          )}
-        </Dropdown>
-      )}
-    </SelectContainer>
-  );
-}
-
-export default Select;
diff --git a/packages/core/src/components/select/index.ts b/packages/core/src/components/select/index.ts
deleted file mode 100644
index 22ae8193..00000000
--- a/packages/core/src/components/select/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Select';
diff --git a/packages/core/src/components/typography/Body.tsx b/packages/core/src/components/typography/Body.tsx
deleted file mode 100644
index 53f4e5d1..00000000
--- a/packages/core/src/components/typography/Body.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import styled from 'styled-components';
-
-const StyledBody = styled.p<{ $align?: 'left' | 'center' | 'right' }>`
-  font-size: 1.25rem;
-  line-height: 2rem;
-  text-align: ${(props) => props.$align && props.$align};
-`;
-
-type BodyProps = {
-  children: React.ReactNode;
-  $align?: 'left' | 'center' | 'right';
-} & React.ComponentProps<typeof StyledBody>;
-
-function Body({ children, $align = 'left', ...props }: BodyProps) {
-  return (
-    <StyledBody {...props} $align={$align}>
-      {children}
-    </StyledBody>
-  );
-}
-
-export default Body;
diff --git a/packages/core/src/components/typography/ButtonText.tsx b/packages/core/src/components/typography/ButtonText.tsx
deleted file mode 100644
index 708b4d74..00000000
--- a/packages/core/src/components/typography/ButtonText.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import styled from 'styled-components';
-
-const StyledButtonText = styled.p`
-  font-size: 1rem;
-  font-weight: 600;
-  line-height: 1.25rem;
-  text-transform: uppercase;
-`;
-
-type ButtonTextProps = {
-  children: React.ReactNode;
-} & React.ComponentProps<typeof StyledButtonText>;
-
-function ButtonText({ children, ...props }: ButtonTextProps) {
-  return <StyledButtonText {...props}>{children}</StyledButtonText>;
-}
-
-export default ButtonText;
diff --git a/packages/core/src/components/typography/Error.tsx b/packages/core/src/components/typography/Error.tsx
deleted file mode 100644
index ba615600..00000000
--- a/packages/core/src/components/typography/Error.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import styled from 'styled-components';
-
-const StyledError = styled.p`
-  color: var(--color-error);
-  font-size: 0.875rem;
-  line-height: 1rem;
-`;
-
-type ErrorProps = {
-  children: React.ReactNode;
-} & React.ComponentProps<typeof StyledError>;
-
-function Error({ children, ...props }: ErrorProps) {
-  return <StyledError {...props}>{children}</StyledError>;
-}
-
-export default Error;
diff --git a/packages/core/src/components/typography/Heading.tsx b/packages/core/src/components/typography/Heading.tsx
deleted file mode 100644
index 7b670943..00000000
--- a/packages/core/src/components/typography/Heading.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import styled from 'styled-components';
-
-const StyledHeading = styled.h1`
-  font-family: var(--font-family-secondary);
-  font-size: 2rem;
-  font-weight: 600;
-  line-height: 2.875rem;
-`;
-
-type HeadingProps = {
-  children: React.ReactNode;
-} & React.ComponentProps<typeof StyledHeading>;
-
-function Heading({ children, ...props }: HeadingProps) {
-  return <StyledHeading {...props}>{children}</StyledHeading>;
-}
-
-export default Heading;
diff --git a/packages/core/src/components/typography/Label.tsx b/packages/core/src/components/typography/Label.tsx
deleted file mode 100644
index 7a5463f4..00000000
--- a/packages/core/src/components/typography/Label.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import styled, { css } from 'styled-components';
-
-const StyledLabel = styled.label<{ $required?: boolean }>`
-  font-size: 1rem;
-  font-weight: 500;
-  line-height: 1.375rem;
-
-  ${(props) =>
-    props.$required &&
-    css`
-      &:after {
-        content: ' *';
-        color: var(--color-error);
-      }
-    `}
-`;
-
-type LabelProps = {
-  children: React.ReactNode;
-  $required?: boolean;
-} & React.ComponentProps<typeof StyledLabel>;
-
-function Label({ children, $required = false, ...props }: LabelProps) {
-  return (
-    <StyledLabel {...props} $required={$required} title={$required ? 'Required' : ''}>
-      {children}
-    </StyledLabel>
-  );
-}
-
-export default Label;
diff --git a/packages/core/src/components/typography/Subtext.tsx b/packages/core/src/components/typography/Subtext.tsx
deleted file mode 100644
index 99192d3d..00000000
--- a/packages/core/src/components/typography/Subtext.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import styled from 'styled-components';
-
-const StyledSubtext = styled.p<{ $weight?: 400 | 500 }>`
-  font-size: 1rem;
-  line-height: 1.375rem;
-  font-weight: ${(props) => props.$weight && props.$weight};
-`;
-
-type SubtextProps = {
-  children: React.ReactNode;
-  $weight?: 400 | 500;
-} & React.ComponentProps<typeof StyledSubtext>;
-
-function Subtext({ children, $weight = 400, ...props }: SubtextProps) {
-  return (
-    <StyledSubtext {...props} $weight={$weight}>
-      {children}
-    </StyledSubtext>
-  );
-}
-
-export default Subtext;
diff --git a/packages/core/src/components/typography/Subtitle.tsx b/packages/core/src/components/typography/Subtitle.tsx
deleted file mode 100644
index 0b10f8bf..00000000
--- a/packages/core/src/components/typography/Subtitle.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import styled from 'styled-components';
-
-const StyledSubtitle = styled.h3<{ $align?: 'left' | 'center' | 'right' }>`
-  font-weight: bold;
-  line-height: 1.75rem;
-  font-size: 1.25rem;
-  text-align: ${(props) => props.$align && props.$align};
-`;
-
-type SubtitleProps = {
-  children: React.ReactNode;
-  $align?: 'left' | 'center' | 'right';
-} & React.ComponentProps<typeof StyledSubtitle>;
-
-function Subtitle({ children, $align = 'left', ...props }: SubtitleProps) {
-  return (
-    <StyledSubtitle {...props} $align={$align}>
-      {children}
-    </StyledSubtitle>
-  );
-}
-
-export default Subtitle;
diff --git a/packages/core/src/components/typography/Title.tsx b/packages/core/src/components/typography/Title.tsx
deleted file mode 100644
index 48ee7871..00000000
--- a/packages/core/src/components/typography/Title.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import styled from 'styled-components';
-
-const StyledTitle = styled.h2`
-  font-family: 'Press Start 2P', sans-serif;
-  font-size: 1.25rem;
-  line-height: 1.75rem;
-`;
-
-type TitleProps = {
-  children: React.ReactNode;
-} & React.ComponentProps<typeof StyledTitle>;
-
-function Title({ children, ...props }: TitleProps) {
-  return <StyledTitle {...props}>{children}</StyledTitle>;
-}
-
-export default Title;
diff --git a/packages/core/src/components/zupassLoginButton/ZupassLoginButton.tsx b/packages/core/src/components/zupassLoginButton/ZupassLoginButton.tsx
deleted file mode 100644
index c0d2829b..00000000
--- a/packages/core/src/components/zupassLoginButton/ZupassLoginButton.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import {
-  openSignedZuzaluSignInPopup,
-  usePCDMultiplexer,
-  usePendingPCD,
-  useSemaphoreSignatureProof,
-  useZupassPopupMessages,
-  SignInMessagePayload,
-  requestUser,
-} from '@pcd/passport-interface';
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
-import { postPcdStr } from 'api';
-import Button from '../button';
-
-type ZupassLoginButtonProps = {
-  children: React.ReactNode;
-};
-
-const POPUP_URL = window.location.origin + '/popup';
-
-function ZupassLoginButton({ children, ...props }: ZupassLoginButtonProps) {
-  const queryClient = useQueryClient();
-  const navigate = useNavigate();
-
-  const { mutate: mutateVerify } = useMutation({
-    mutationFn: postPcdStr,
-    onSuccess: (body) => {
-      if (body) {
-        queryClient.invalidateQueries({ queryKey: ['user'] });
-        navigate('/');
-      }
-    },
-  });
-
-  // State for Zupass proof verification
-  const [signatureProofValid, setSignatureProofValid] = useState<boolean | undefined>();
-
-  // Zupass-specific hooks for managing PCDs and proof verification
-  const [zupassPCDStr, zupassPendingPCDStr] = useZupassPopupMessages();
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const [_, __, serverPCDStr] = usePendingPCD(
-    zupassPendingPCDStr,
-    import.meta.env.VITE_ZUPASS_SERVER_URL,
-  );
-  const pcdStr = usePCDMultiplexer(zupassPCDStr, serverPCDStr);
-
-  // Callback for proof verification
-  const onProofVerified = (valid: boolean) => {
-    setSignatureProofValid(valid);
-  };
-  // Hook for getting the signature proof
-  // TODO: Do we need this?
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const { signatureProof } = useSemaphoreSignatureProof(pcdStr, onProofVerified);
-
-  useEffect(() => {
-    if (signatureProofValid && signatureProof && pcdStr) {
-      // get user from zupass server
-      const signInPayload = JSON.parse(signatureProof?.claim.signedMessage) as SignInMessagePayload;
-
-      requestUser(import.meta.env.VITE_ZUPASS_SERVER_URL, signInPayload.uuid).then((user) => {
-        if (user.success) {
-          mutateVerify({
-            email: user.value.email,
-            uuid: user.value.uuid,
-            pcdStr: JSON.parse(pcdStr).pcd,
-          });
-        }
-      });
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [signatureProofValid, pcdStr, signatureProof]);
-
-  const handleLoginClick = () => {
-    openSignedZuzaluSignInPopup(import.meta.env.VITE_ZUPASS_URL, POPUP_URL, 'Lexicon');
-  };
-
-  return (
-    <>
-      <Button onClick={handleLoginClick} {...props}>
-        {children}
-      </Button>
-    </>
-  );
-}
-
-export default ZupassLoginButton;
diff --git a/packages/core/src/components/zupassLoginButton/index.ts b/packages/core/src/components/zupassLoginButton/index.ts
deleted file mode 100644
index a03d0c42..00000000
--- a/packages/core/src/components/zupassLoginButton/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './ZupassLoginButton';
diff --git a/packages/core/src/data/landing.ts b/packages/core/src/data/landing.ts
deleted file mode 100644
index ee15b2f5..00000000
--- a/packages/core/src/data/landing.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-const landing = {
-  hero: {
-    title: 'Put Your Hearts to the Test',
-    body: 'This is the test page for the plural voting and agenda setting tool',
-    button: 'Get Started',
-  },
-};
-
-export default landing;
diff --git a/packages/core/src/data/onboarding.ts b/packages/core/src/data/onboarding.ts
deleted file mode 100644
index 2e47043e..00000000
--- a/packages/core/src/data/onboarding.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-const onboarding = {
-  data: [
-    {
-      id: 0,
-      title: `Welcome`,
-      body: `Welcome to the test version of the plurality tool!`,
-    },
-    {
-      id: 1,
-      title: `Voting`,
-      body: `After completing registration on the next page, please visit the Communities page to see running votes. To create a vote, connect to the test database and insert a vote and options. It will then appear under the relevant community`,
-    },
-  ],
-};
-
-export default onboarding;
diff --git a/packages/core/src/data/register.ts b/packages/core/src/data/register.ts
deleted file mode 100644
index 1b322127..00000000
--- a/packages/core/src/data/register.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-const register = {
-  onboarding: [
-    {
-      id: 0,
-      title: `Privacy Ambitions`,
-      body: `A number of our mechanisms (plural voting, peer prediction, your hearts)  require certain social information (e.g., organizational affiliation, academic credentials) to function.`,
-    },
-    {
-      id: 1,
-      title: `ZuPass Registration`,
-      body: `When you register for the community or an in-person event, a PCD (proof-carrying data) will be added to your Zupass which records your attendance and current affiliation.`,
-    },
-    {
-      id: 2,
-      title: `Incremental Privacy`,
-      body: `We will use these Zupass PCDs to progressively upgrade the forum and voting tool until it works in a purely zero-knowledge fashion. Then, all identifying data will be eliminated from our database. Plurality scores will be calculated with all identities, affiliations and other groupings fully anonymized.`,
-    },
-    {
-      id: 3,
-      title: `Initial Trust Assumptions`,
-      body: `However, since this requires parallel development on Zupass, some of this information will initially be stored in the community’s secure database (managed by Lexicon) , and used solely for the purposes of calculating plurality scores, implementing votes and managing event attendance.`,
-    },
-    {
-      id: 4,
-      title: `The Future`,
-      body: `With time, we hope that these PCDs can serve as a source of verified affiliations and credentials for gatherings outside of the Plural Research Society.`,
-    },
-  ],
-  form: {
-    title: 'Register Page',
-  },
-};
-
-export default register;
diff --git a/packages/core/src/hooks/useCountdown.tsx b/packages/core/src/hooks/useCountdown.tsx
deleted file mode 100644
index 17ab904e..00000000
--- a/packages/core/src/hooks/useCountdown.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { useState, useEffect } from 'react';
-
-interface Countdown {
-  formattedTime: string;
-}
-
-const useCountdown = (startAt: string | null, endAt: string | null): Countdown => {
-  const [time, setTime] = useState<number | null>(null);
-
-  useEffect(() => {
-    if (startAt && endAt) {
-      const endTimestamp = new Date(endAt).getTime() / 1000;
-      const initialTime = Math.max(0, endTimestamp - Math.floor(Date.now() / 1000));
-      setTime(initialTime);
-
-      const now = Math.floor(Date.now() / 1000);
-      const startTimePassed = now >= new Date(startAt).getTime() / 1000;
-
-      if (startTimePassed) {
-        const timer = setInterval(() => {
-          setTime((prevTime) => (prevTime && prevTime > 0 ? prevTime - 1 : 0));
-        }, 1000);
-
-        return () => clearInterval(timer);
-      }
-    }
-  }, [startAt, endAt]);
-
-  const pluralize = (value: number, unit: string): string => {
-    return `${value} ${unit}${value !== 1 ? 's' : ''}`;
-  };
-
-  const calculateTime = (): string => {
-    if (time === null || time <= 0) {
-      return 'Cycle has expired';
-    }
-
-    const days = Math.floor(time / 86400);
-    const hours = Math.floor((time % 86400) / 3600);
-    const minutes = Math.floor((time % 3600) / 60);
-    const seconds = time % 60;
-
-    if (days > 0) {
-      return `${pluralize(days, 'day')} ${pluralize(hours, 'hour')} ${pluralize(
-        minutes,
-        'minute',
-      )} ${pluralize(seconds, 'second')}`;
-    }
-
-    return `${pluralize(hours, 'hour')} ${pluralize(minutes, 'minute')} ${pluralize(
-      seconds,
-      'second',
-    )}`;
-  };
-
-  return { formattedTime: calculateTime() };
-};
-
-export default useCountdown;
diff --git a/packages/core/src/hooks/useUser.tsx b/packages/core/src/hooks/useUser.tsx
deleted file mode 100644
index 42d81329..00000000
--- a/packages/core/src/hooks/useUser.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-import { fetchUser } from 'api/';
-
-function useUser() {
-  const {
-    data: user,
-    isLoading,
-    isError,
-  } = useQuery({
-    queryKey: ['user'],
-    queryFn: fetchUser,
-    retry: false,
-    staleTime: 10000,
-  });
-
-  return { user, isLoading, isError };
-}
-
-export default useUser;
diff --git a/packages/core/src/index.css b/packages/core/src/index.css
deleted file mode 100644
index c7285124..00000000
--- a/packages/core/src/index.css
+++ /dev/null
@@ -1,51 +0,0 @@
-*,
-*::after,
-*::before {
-  box-sizing: border-box;
-  margin: 0;
-  padding: 0;
-}
-
-:root {
-  --color-primary: #759de9;
-  --color-secondary: #121212;
-  --color-dark-gray: #1f2021;
-  --color-white: #ffffff;
-  --color-silver-blue: #3d4f61;
-  --color-skeleton-gray: #404040;
-  --color-success: #86c04c;
-  --color-warning: #d99d28;
-  --color-error: #db4545;
-  --font-family-main: 'Raleway', sans-serif;
-  --font-family-secondary: 'Press Start 2P', sans-serif;
-}
-
-body {
-  background-color: var(--color-secondary);
-  color: var(--color-white);
-  font-family: var(--font-family-main);
-  line-height: 1.6;
-}
-
-img {
-  display: block;
-  max-width: 100%;
-}
-
-input,
-textarea,
-button,
-select {
-  color: inherit;
-  font: inherit;
-}
-
-button {
-  cursor: pointer;
-  padding-inline: 1rem;
-}
-
-a {
-  color: inherit;
-  text-decoration: inherit;
-}
diff --git a/packages/core/src/layout/Layout.styled.tsx b/packages/core/src/layout/Layout.styled.tsx
deleted file mode 100644
index 6854b17f..00000000
--- a/packages/core/src/layout/Layout.styled.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import styled from 'styled-components';
-
-type FlexProps = {
-  $alignItems?: 'center';
-  $alignSelf?: 'flex-start' | 'center' | 'flex-end';
-  $justifySelf?: 'flex-start' | 'center' | 'flex-end';
-  $gap?: string;
-  $justifyContent?: 'space-between' | 'flex-end';
-  $reverse?: boolean;
-  $wrap?: boolean;
-};
-
-export const Main = styled.main`
-  margin-inline: auto;
-  min-height: calc(100vh - 13rem);
-  padding-block: min(15vh, 4rem);
-  width: min(90%, 1080px);
-
-  @media (min-width: 600px) {
-    padding-block: min(15vh, 7rem);
-  }
-`;
-
-export const Grid = styled.section<{
-  $columns?: number;
-  $rows?: number;
-  $gap?: string;
-  $colgap?: string;
-  $rowgap?: string;
-}>`
-  display: grid;
-  gap: ${(props) => props.$gap || '1rem'};
-  column-gap: ${(props) => props.$colgap || '1rem'};
-  row-gap: ${(props) => props.$rowgap || '1rem'};
-  grid-template-columns: repeat(1, 1fr);
-  grid-template-rows: repeat(auto, 1fr);
-
-  @media (min-width: 600px) {
-    grid-template-columns: ${(props) => props.$columns && `repeat(${props.$columns || 1}, 1fr)`};
-    grid-template-rows: ${(props) => props.$rows && `repeat(${props.$rows || 1}, 1fr)`};
-  }
-`;
-
-export const FlexRow = styled.section<FlexProps>`
-  align-items: ${(props) => props.$alignItems && props.$alignItems};
-  align-self: ${(props) => props.$alignSelf && props.$alignSelf};
-  justify-self: ${(props) => props.$justifySelf && props.$justifySelf};
-  display: flex;
-  gap: ${(props) => props.$gap || '1rem'};
-  justify-content: ${(props) => props.$justifyContent && props.$justifyContent};
-  flex-wrap: ${(props) => props.$wrap && 'wrap'};
-  flex-direction: ${(props) => props.$reverse && 'row-reverse'};
-`;
-
-export const FlexColumn = styled(FlexRow)`
-  flex-direction: column;
-  /* height: 100%; */
-`;
-
-export const MobileColumn = styled(FlexColumn)`
-  max-width: 70ch;
-  /* background-color: red; */
-  margin: 0 auto;
-`;
diff --git a/packages/core/src/layout/Layout.tsx b/packages/core/src/layout/Layout.tsx
deleted file mode 100644
index c49e1409..00000000
--- a/packages/core/src/layout/Layout.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Toaster } from 'react-hot-toast';
-import Footer from '../components/footer';
-import Header from '../components/header';
-import { Main } from './Layout.styled';
-
-type LayoutProps = {
-  children: React.ReactNode;
-};
-
-function Layout({ children }: LayoutProps) {
-  return (
-    <>
-      <Toaster position="top-center" />
-      <Header />
-      <Main>{children}</Main>
-      <Footer />
-    </>
-  );
-}
-
-export default Layout;
diff --git a/packages/core/src/layout/index.ts b/packages/core/src/layout/index.ts
deleted file mode 100644
index 9592f298..00000000
--- a/packages/core/src/layout/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Layout';
diff --git a/packages/core/src/main.tsx b/packages/core/src/main.tsx
deleted file mode 100644
index 85265d5c..00000000
--- a/packages/core/src/main.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
-import React from 'react';
-import ReactDOM from 'react-dom/client';
-import { BrowserRouter } from 'react-router-dom';
-import App from './App.tsx';
-import './index.css';
-import Layout from './layout/index.ts';
-
-const queryClient = new QueryClient();
-
-ReactDOM.createRoot(document.getElementById('root')!).render(
-  <React.StrictMode>
-    <BrowserRouter>
-      <QueryClientProvider client={queryClient}>
-        <Layout>
-          <App />
-        </Layout>
-        <ReactQueryDevtools initialIsOpen={false} />
-      </QueryClientProvider>
-    </BrowserRouter>
-  </React.StrictMode>,
-);
diff --git a/packages/core/src/pages/Account.tsx b/packages/core/src/pages/Account.tsx
deleted file mode 100644
index 6196e7eb..00000000
--- a/packages/core/src/pages/Account.tsx
+++ /dev/null
@@ -1,198 +0,0 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { fetchEvents, fetchGroups, fetchUsersToGroups, putUser } from 'api';
-import { Controller, useForm } from 'react-hook-form';
-import toast from 'react-hot-toast';
-import { useNavigate } from 'react-router-dom';
-import Button from '../components/button';
-import Chip from '../components/chip';
-import ErrorText from '../components/form/ErrorText';
-import Input from '../components/form/Input';
-import Select from '../components/select';
-import Label from '../components/typography/Label';
-import Title from '../components/typography/Title';
-import useUser from '../hooks/useUser';
-import { FlexColumn, FlexRow } from '../layout/Layout.styled';
-import { useAppStore } from '../store';
-import { AuthUser } from '../types/AuthUserType';
-import { DBEvent } from '../types/DBEventType';
-import { GetGroupsResponse } from '../types/GroupType';
-import { formatGroups } from '../utils/formatGroups';
-
-type InitialUser = {
-  username: string;
-  name: string;
-  email: string;
-  group: string;
-};
-
-function Account() {
-  const { user, isLoading: userIsLoading } = useUser();
-
-  const { data: events } = useQuery({
-    queryKey: ['events'],
-    queryFn: fetchEvents,
-    enabled: !!user?.id,
-  });
-
-  const { data: groups } = useQuery({
-    queryKey: ['groups'],
-    queryFn: () =>
-      fetchGroups({
-        groupCategoryName: 'affiliation',
-      }),
-    enabled: !!user?.id,
-  });
-
-  const { data: userGroups, isLoading: userGroupsIsLoading } = useQuery({
-    queryKey: ['user', user?.id, 'groups'],
-    queryFn: () => fetchUsersToGroups(user?.id || ''),
-    enabled: !!user?.id,
-  });
-
-  const initialUser = {
-    username: user?.username || '',
-    name: user?.firstName || '',
-    email: user?.email || '',
-    group: (userGroups && userGroups[0]?.id) || '',
-  };
-
-  if (userIsLoading || userGroupsIsLoading) {
-    return <Title>Loading...</Title>;
-  }
-
-  return (
-    <AccountForm
-      initialUser={initialUser}
-      user={user}
-      groups={groups}
-      userGroups={[]}
-      events={events}
-    />
-  );
-}
-
-function AccountForm({
-  initialUser,
-  user,
-  groups,
-  userGroups,
-  events,
-}: {
-  initialUser: InitialUser;
-  user: AuthUser | null | undefined;
-  groups: GetGroupsResponse[] | null | undefined;
-  userGroups: GetGroupsResponse[] | null | undefined;
-  events: DBEvent[] | null | undefined;
-}) {
-  const navigate = useNavigate();
-  const queryClient = useQueryClient();
-  const userStatus = useAppStore((state) => state.userStatus);
-  const setUserStatus = useAppStore((state) => state.setUserStatus);
-
-  const { mutate: mutateUserData } = useMutation({
-    mutationFn: putUser,
-    onSuccess: (body) => {
-      if (body) {
-        queryClient.invalidateQueries({ queryKey: ['user'] });
-        queryClient.invalidateQueries({ queryKey: ['user-groups'] });
-      }
-    },
-    onError: () => {
-      toast.error('There was an error, please try again.');
-    },
-  });
-
-  const {
-    control,
-    register,
-    formState: { errors, isValid },
-    handleSubmit,
-  } = useForm({
-    defaultValues: initialUser,
-    mode: 'all',
-  });
-
-  const onSubmit = (value: typeof initialUser) => {
-    if (user && user.id) {
-      mutateUserData({
-        userId: user.id,
-        username: value.username,
-        email: value.email,
-        firstName: '',
-        lastName: '',
-        userAttributes: {
-          name: value.name,
-        },
-      });
-
-      toast.success('User data updated!');
-
-      if (userStatus === 'INCOMPLETE') {
-        setUserStatus('COMPLETE');
-        if (events?.length === 1) {
-          navigate(`/events/${events[0].id}/register`);
-        } else {
-          navigate('/events');
-        }
-      }
-    }
-  };
-
-  const userRegistered = userGroups && userGroups?.length > 0;
-
-  return (
-    <FlexColumn>
-      <FlexRow $justifyContent="space-between">
-        <Title>{userRegistered ? 'Your Account' : 'Complete your profile'}</Title>
-        {userRegistered && <Chip>Registered</Chip>}
-      </FlexRow>
-      <form onSubmit={handleSubmit(onSubmit)}>
-        <FlexColumn>
-          <FlexColumn $gap="0.5rem">
-            <Label $required>Username</Label>
-            <Input {...register('username', { required: 'Username is required', minLength: 3 })} />
-            <ErrorText>{errors.username?.message}</ErrorText>
-          </FlexColumn>
-          <FlexColumn $gap="0.5rem">
-            <Label>Name</Label>
-            <Input {...register('name')} />
-            <ErrorText>{errors.name?.message}</ErrorText>
-          </FlexColumn>
-          <FlexColumn $gap="0.5rem">
-            <Label>Email</Label>
-            <Input {...register('email')} />
-            <ErrorText>{errors.email?.message}</ErrorText>
-          </FlexColumn>
-          <FlexColumn $gap="0.5rem">
-            <Label $required>Affiliation</Label>
-            <Controller
-              name="group"
-              control={control}
-              rules={{ required: 'Group is required' }}
-              render={({ field }) => (
-                <Select
-                  options={formatGroups(groups).map((group) => ({
-                    name: group.name,
-                    id: group.id,
-                  }))}
-                  placeholder="Select group"
-                  onChange={field.onChange}
-                  onBlur={field.onBlur}
-                  value={field.value}
-                />
-              )}
-            />
-            <ErrorText>{errors.group?.message}</ErrorText>
-          </FlexColumn>
-          <FlexRow $alignSelf="flex-end">
-            <Button type="submit" disabled={!isValid}>
-              Submit
-            </Button>
-          </FlexRow>
-        </FlexColumn>
-      </form>
-    </FlexColumn>
-  );
-}
-
-export default Account;
diff --git a/packages/core/src/pages/Event.tsx b/packages/core/src/pages/Event.tsx
deleted file mode 100644
index beffd459..00000000
--- a/packages/core/src/pages/Event.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-import { useEffect } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
-import styled from 'styled-components';
-import { fetchRegistrations, fetchEvent, fetchEventCycles } from 'api';
-import Button from '../components/button';
-import Chip from '../components/chip';
-import EventCard from '../components/eventCard';
-import Subtext from '../components/typography/Subtext';
-import Subtitle from '../components/typography/Subtitle';
-import Title from '../components/typography/Title';
-import { FlexColumn, Grid } from '../layout/Layout.styled';
-
-const Card = styled.article`
-  background-color: var(--color-dark-gray);
-  border-radius: 1rem;
-  padding: 2rem;
-`;
-
-const BackArrow = styled.div`
-  cursor: pointer;
-  height: 1.75rem;
-  width: 1.75rem;
-`;
-
-function Event() {
-  const { eventId } = useParams();
-  const navigate = useNavigate();
-
-  const handleGoBack = () => {
-    navigate(-1); // Navigate back one step in the history stack
-  };
-
-  const { data: event } = useQuery({
-    queryKey: ['events', eventId],
-    queryFn: () => fetchEvent(eventId || ''),
-    enabled: !!eventId,
-  });
-
-  const { data: eventCycles } = useQuery({
-    queryKey: ['events', eventId, 'cycles'],
-    queryFn: () => fetchEventCycles(eventId || ''),
-    enabled: !!eventId,
-  });
-
-  const { data: registration } = useQuery({
-    queryKey: ['events', eventId, 'registration'],
-    queryFn: () => fetchRegistrations(eventId || ''),
-    enabled: !!eventId,
-  });
-
-  useEffect(() => {
-    if (registration === null) {
-      navigate(`/events/${eventId}/register`);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [eventId, registration]);
-
-  const handleClick = (cycleId: string) => {
-    navigate(`/events/${eventId}/cycles/${cycleId}`);
-  };
-
-  return (
-    <FlexColumn $gap="2rem">
-      <BackArrow onClick={handleGoBack}>
-        <img src="/icons/back_arrow.svg" alt="Back arrow" />
-      </BackArrow>
-      <EventCard
-        $direction="row"
-        src={event?.imageUrl}
-        title={event?.name}
-        description={event?.description}
-      />
-      <FlexColumn>
-        <Title>Votes</Title>
-        {eventCycles && eventCycles?.length > 0 ? (
-          <Grid $columns={3}>
-            {eventCycles?.map((eventCycles) => {
-              const { questionTitle } = eventCycles.forumQuestions[0];
-              const eventEndDate = new Date(eventCycles.endAt);
-              const formattedDate = eventEndDate.toLocaleDateString();
-
-              return (
-                <Card key={eventCycles.id}>
-                  <FlexColumn $gap="1.5rem">
-                    <Chip status={eventCycles.status}>{eventCycles.status}</Chip>
-                    <FlexColumn $gap="0.5rem">
-                      <Subtitle>{questionTitle}</Subtitle>
-                      <Subtext>Closes on {formattedDate}</Subtext>
-                    </FlexColumn>
-                    <Button onClick={() => handleClick(eventCycles.id)}>Go to vote</Button>
-                  </FlexColumn>
-                </Card>
-              );
-            })}
-          </Grid>
-        ) : (
-          <Subtext>No cycles found</Subtext>
-        )}
-      </FlexColumn>
-    </FlexColumn>
-  );
-}
-
-export default Event;
diff --git a/packages/core/src/pages/Events.tsx b/packages/core/src/pages/Events.tsx
deleted file mode 100644
index 1833b77e..00000000
--- a/packages/core/src/pages/Events.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-import { fetchEvents } from 'api';
-import EventCard from '../components/eventCard';
-import Title from '../components/typography/Title';
-import useUser from '../hooks/useUser';
-import { FlexColumn, Grid } from '../layout/Layout.styled';
-
-function Events() {
-  const { user } = useUser();
-  const { data: events } = useQuery({
-    queryKey: ['events'],
-    queryFn: () => fetchEvents(),
-    staleTime: 3000,
-    retry: false,
-  });
-
-  return (
-    <FlexColumn $gap="4rem">
-      <Title>Welcome, {user?.username}</Title>
-      <Grid $columns={2} $gap="2rem">
-        {events?.map((event) => (
-          <EventCard
-            key={event.id}
-            src={event.imageUrl}
-            title={event.name}
-            eventId={event.id}
-            buttonText="Go"
-          />
-        ))}
-      </Grid>
-    </FlexColumn>
-  );
-}
-
-export default Events;
diff --git a/packages/core/src/pages/Landing.tsx b/packages/core/src/pages/Landing.tsx
deleted file mode 100644
index 012ff6a1..00000000
--- a/packages/core/src/pages/Landing.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import Hero from '../components/hero';
-import ZupassLoginButton from '../components/zupassLoginButton';
-import landing from '../data/landing';
-import { FlexColumn, MobileColumn } from '../layout/Layout.styled';
-import Body from '../components/typography/Body';
-import Subtitle from '../components/typography/Subtitle';
-
-function Landing() {
-  return (
-    <FlexColumn $gap="8rem">
-      <Hero data={landing.hero} />
-      <MobileColumn $gap="2rem">
-        <Subtitle $align="center">{landing.innovation.title}</Subtitle>
-        <Body $align="center">{landing.innovation.body}</Body>
-      </MobileColumn>
-      <MobileColumn $gap="2rem">
-        <Subtitle $align="center">{landing.when.title}</Subtitle>
-        <Body $align="center">{landing.when.body}</Body>
-      </MobileColumn>
-      <MobileColumn $gap="2rem">
-        <Subtitle $align="center">{landing.what.title}</Subtitle>
-        <Body $align="center">{landing.what.body}</Body>
-      </MobileColumn>
-      <MobileColumn $gap="2rem">
-        <Subtitle $align="center">{landing.how.title}</Subtitle>
-        <Body $align="center">{landing.how.body}</Body>
-        <ZupassLoginButton center>{landing.how.button}</ZupassLoginButton>
-      </MobileColumn>
-    </FlexColumn>
-  );
-}
-
-export default Landing;
diff --git a/packages/core/src/pages/Onboarding.tsx b/packages/core/src/pages/Onboarding.tsx
deleted file mode 100644
index 13c5d3dc..00000000
--- a/packages/core/src/pages/Onboarding.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { useNavigate } from 'react-router-dom';
-import { default as Onboarding } from '../components/onboarding';
-import onboarding from '../data/onboarding';
-import { useAppStore } from '../store';
-
-function OnboardingPage() {
-  const navigate = useNavigate();
-  const setOnboardingStatus = useAppStore((state) => state.setOnboardingStatus);
-  const handleSkip = () => {
-    setOnboardingStatus('COMPLETE');
-    navigate('/account');
-  };
-  return <Onboarding data={onboarding.data} handleSkip={handleSkip} />;
-}
-
-export default OnboardingPage;
diff --git a/packages/core/src/pages/Popup.tsx b/packages/core/src/pages/Popup.tsx
deleted file mode 100644
index ab3acdd1..00000000
--- a/packages/core/src/pages/Popup.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { useZupassPopupSetup } from '@pcd/passport-interface';
-
-/**  This popup sends requests and receives PCDs from the passport. */
-export default function PassportPopupRedirect() {
-  const error = useZupassPopupSetup();
-  return <div>{error}</div>;
-}
diff --git a/packages/core/src/pages/Register.tsx b/packages/core/src/pages/Register.tsx
deleted file mode 100644
index abe42b60..00000000
--- a/packages/core/src/pages/Register.tsx
+++ /dev/null
@@ -1,341 +0,0 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import toast from 'react-hot-toast';
-import { useNavigate, useParams } from 'react-router-dom';
-import {
-  fetchEvent,
-  fetchRegistrations,
-  fetchRegistrationData,
-  fetchRegistrationFields,
-  postRegistration,
-} from 'api';
-import Button from '../components/button';
-import Chip from '../components/chip';
-import ErrorText from '../components/form/ErrorText';
-import Input from '../components/form/Input';
-import Label from '../components/typography/Label';
-import Select from '../components/form/Select';
-import Title from '../components/typography/Title';
-import useUser from '../hooks/useUser';
-import { FlexColumn, FlexRow } from '../layout/Layout.styled';
-import { AuthUser } from '../types/AuthUserType';
-import { DBEvent } from '../types/DBEventType';
-import { GetRegistrationDataResponse } from '../types/RegistrationDataType';
-import { RegistrationFieldOption } from '../types/RegistrationFieldOptionType';
-import { GetRegistrationFieldsResponse } from '../types/RegistrationFieldType';
-import { GetRegistrationResponseType } from '../types/RegistrationType';
-import { useForm, FieldErrors, UseFormRegister } from 'react-hook-form';
-import { z } from 'zod';
-import Subtitle from '../components/typography/Subtitle';
-import { useMemo, useState } from 'react';
-
-function Register() {
-  const { user, isLoading } = useUser();
-  const { eventId } = useParams();
-
-  const { data: event } = useQuery({
-    queryKey: ['event', eventId],
-    queryFn: () => fetchEvent(eventId || ''),
-    enabled: !!eventId,
-  });
-
-  const { data: registration } = useQuery({
-    queryKey: ['event', eventId, 'registration'],
-    queryFn: () => fetchRegistrations(eventId || ''),
-    enabled: !!eventId,
-  });
-
-  const { data: registrationFields } = useQuery({
-    queryKey: ['event', eventId, 'registration', 'fields'],
-    queryFn: () => fetchRegistrationFields(eventId || ''),
-    enabled: !!eventId,
-  });
-
-  const { data: registrationData, isLoading: registrationDataIsLoading } = useQuery({
-    queryKey: ['event', eventId, 'registration', 'data'],
-    queryFn: () => fetchRegistrationData(eventId || ''),
-    enabled: !!eventId,
-  });
-
-  if (isLoading || registrationDataIsLoading) {
-    return <h1>Loading...</h1>;
-  }
-
-  return (
-    <RegisterForm
-      event={event}
-      user={user}
-      registration={registration}
-      registrationFields={registrationFields}
-      registrationData={registrationData}
-    />
-  );
-}
-
-function RegisterForm(props: {
-  user: AuthUser | null | undefined;
-  registrationFields?: GetRegistrationFieldsResponse | null | undefined;
-  registration?: GetRegistrationResponseType | null | undefined;
-  registrationData?: GetRegistrationDataResponse | null | undefined;
-  event: DBEvent | null | undefined;
-}) {
-  const navigate = useNavigate();
-
-  const queryClient = useQueryClient();
-
-  const {
-    register,
-    formState: { errors, isValid },
-    handleSubmit,
-  } = useForm({
-    defaultValues: props.registrationData?.reduce(
-      (acc, curr) => {
-        acc[curr.registrationFieldId] = curr.value;
-        return acc;
-      },
-      {} as Record<string, string>,
-    ),
-    mode: 'onBlur',
-  });
-
-  const sortedRegistrationFields = useMemo(() => {
-    const sortedFields = [...(props.registrationFields || [])];
-
-    // Sort by field_display_rank in ascending order
-    sortedFields.sort((a, b) => (a.fieldDisplayRank || 0) - (b.fieldDisplayRank || 0));
-
-    return sortedFields;
-  }, [props.registrationFields]);
-
-  const { mutate: mutateRegistrationData } = useMutation({
-    mutationFn: postRegistration,
-    onSuccess: async (body) => {
-      if (body) {
-        toast.success('Registration saved successfully!');
-        await queryClient.invalidateQueries({
-          queryKey: ['event', props.event?.id, 'registration'],
-        });
-        await queryClient.invalidateQueries({
-          queryKey: ['event', props.event?.id, 'registration', 'data'],
-        });
-        navigate(`/events/${props.event?.id}`);
-      }
-    },
-    onError: (error) => {
-      console.error('Error saving registration:', error);
-      toast.error('Failed to save registration, please try again');
-    },
-  });
-
-  const onSubmit = (values: Record<string, string>) => {
-    mutateRegistrationData({
-      body: {
-        status: 'DRAFT',
-        registrationData: Object.entries(values).map(([key, value]) => ({
-          registrationFieldId: key,
-          value,
-        })),
-      },
-    });
-  };
-
-  return (
-    <>
-      {props.user ? (
-        <FlexColumn>
-          <FlexRow $justifyContent="space-between">
-            <Title>Register for {props.event?.name}</Title>
-            {props.registration?.status && <Chip>{props.registration.status}</Chip>}
-          </FlexRow>
-          <Subtitle>{props.event?.registrationDescription}</Subtitle>
-          <form>
-            <FlexColumn $gap="0.75rem">
-              {sortedRegistrationFields.map((regField) => (
-                <FormField
-                  key={regField.id}
-                  disabled={props.registration?.status === 'PUBLISHED'}
-                  errors={errors}
-                  required={regField.required}
-                  id={regField.id}
-                  name={regField.name}
-                  characterLimit={regField.characterLimit}
-                  options={regField.registrationFieldOptions}
-                  type={regField.type}
-                  register={register}
-                />
-              ))}
-            </FlexColumn>
-          </form>
-          <FlexRow $alignSelf="flex-end">
-            <Button disabled={!isValid} onClick={handleSubmit(onSubmit)}>
-              Save
-            </Button>
-          </FlexRow>
-        </FlexColumn>
-      ) : (
-        <h2>Please login</h2>
-      )}
-    </>
-  );
-}
-
-function FormField({
-  id,
-  name,
-  required,
-  type,
-  errors,
-  options,
-  disabled,
-  register,
-  characterLimit,
-}: {
-  id: string;
-  name: string;
-  required: boolean | null;
-  type: 'TEXT' | 'SELECT' | 'NUMBER' | 'DATE' | 'BOOLEAN';
-  options: RegistrationFieldOption[];
-  disabled: boolean;
-  register: UseFormRegister<Record<string, string>>;
-  errors: FieldErrors<Record<string, string>>;
-  characterLimit: number;
-}) {
-  switch (type) {
-    case 'TEXT':
-      return (
-        <TextInput
-          id={id}
-          name={name}
-          register={register}
-          required={required}
-          disabled={disabled}
-          errors={errors}
-          characterLimit={characterLimit}
-        />
-      );
-    case 'SELECT':
-      return (
-        <SelectInput
-          id={id}
-          name={name}
-          register={register}
-          options={options}
-          required={required}
-          disabled={disabled}
-          errors={errors}
-        />
-      );
-    default:
-      return null;
-  }
-}
-
-function TextInput(props: {
-  id: string;
-  name: string;
-  required: boolean | null;
-  characterLimit: number;
-  disabled: boolean;
-  register: UseFormRegister<Record<string, string>>;
-  errors: FieldErrors<Record<string, string>>;
-}) {
-  const [charCount, setCharCount] = useState(0);
-
-  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const inputValue = event.target.value;
-    setCharCount(inputValue.length);
-    props.register(props.id, {
-      value: inputValue,
-    });
-  };
-
-  return (
-    <FlexColumn $gap="0.5rem">
-      <Label htmlFor={props.name} $required={!!props.required}>
-        {props.name}
-      </Label>
-      <Input
-        type="text"
-        {...props.register(props.id, {
-          validate: (value) => {
-            // validate character limit (0 character limit is no character limit)
-            if (props.characterLimit > 0 && value.length > props.characterLimit) {
-              return `Character count of ${charCount} exceeds character limit of ${props.characterLimit}`;
-            }
-            // validate required
-            if (!props.required) {
-              return true;
-            }
-
-            const v = z.string().min(1, 'Value is required').safeParse(value);
-
-            if (v.success) {
-              return true;
-            }
-
-            return v.error.errors[0].message;
-          },
-        })}
-        disabled={props.disabled}
-        onChange={handleInputChange}
-      />
-      {props.errors?.[props.id] ? (
-        <ErrorText>{props.errors?.[props.id]?.message}</ErrorText>
-      ) : (
-        props.characterLimit > 0 && (
-          <p style={{ color: '#999999', fontSize: '14px' }}>
-            {charCount}/{props.characterLimit} characters
-          </p>
-        )
-      )}
-    </FlexColumn>
-  );
-}
-
-function SelectInput(props: {
-  id: string;
-  name: string;
-  required: boolean | null;
-  disabled: boolean;
-  options: RegistrationFieldOption[];
-  register: UseFormRegister<Record<string, string>>;
-  errors: FieldErrors<Record<string, string>>;
-}) {
-  return (
-    <FlexColumn $gap="0.5rem">
-      <Label htmlFor={props.name} $required={!!props.required}>
-        {props.name}
-      </Label>
-      <Select
-        id={props.id}
-        {...props.register(props.id, {
-          validate: (value) => {
-            if (!props.required) {
-              return true;
-            }
-
-            const v = z.string().safeParse(value);
-
-            if (v.success) {
-              return true;
-            }
-
-            return v.error.message;
-          },
-        })}
-        defaultValue={''}
-        disabled={props.disabled}
-      >
-        <option value={''} disabled>
-          Choose a value
-        </option>
-        {props.options.map((option) => (
-          <option key={option.id} value={option.value}>
-            {option.value}
-          </option>
-        ))}
-      </Select>
-      {props.errors?.[props.id] && <ErrorText>{props.errors?.[props.id]?.message}</ErrorText>}
-    </FlexColumn>
-  );
-}
-export default Register;
diff --git a/packages/core/src/pages/Results.tsx b/packages/core/src/pages/Results.tsx
deleted file mode 100644
index fccb1493..00000000
--- a/packages/core/src/pages/Results.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-import { useState } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
-import styled from 'styled-components';
-import { fetchForumQuestionStatistics } from 'api';
-import { fetchCycle } from 'api';
-import Card from '../components/card';
-import Subtitle from '../components/typography/Subtitle';
-import Title from '../components/typography/Title';
-import { FlexColumn, FlexRow, Grid } from '../layout/Layout.styled';
-
-const ResultsCard = styled.article<{ $expanded: boolean }>`
-  background-color: var(--color-dark-gray);
-  border-radius: 1rem;
-  cursor: pointer;
-  padding: 2rem;
-  position: relative;
-  transition: height 0.3s ease-in-out;
-
-  .arrow {
-    transform: rotate(${(props) => (props.$expanded ? '180deg' : '0deg')});
-    transition: transform 0.3s ease-in-out;
-  }
-
-  .statistics {
-    display: ${(props) => (props.$expanded ? 'flex' : 'none')};
-  }
-`;
-const Badge = styled.div<{ $type: 'gold' | 'silver' | 'bronze' }>`
-  align-items: center;
-  background-image: ${(props) => props.$type && `url('/icons/${props.$type}_badge.svg')`};
-  background-position: center center;
-  background-repeat: no-repeat;
-  background-size: contain;
-  display: flex;
-  height: 2.5rem;
-  justify-content: center;
-  left: -1rem;
-  position: absolute;
-  top: -0.75rem;
-  width: 2.5rem;
-`;
-
-const BackArrow = styled.div`
-  cursor: pointer;
-  height: 1.75rem;
-  width: 1.75rem;
-`;
-
-function Results() {
-  const navigate = useNavigate();
-
-  const handleGoBack = () => {
-    navigate(-1); // Navigate back one step in the history stack
-  };
-
-  const [expandedIndex, setExpandedIndex] = useState<number | null>(null);
-
-  const { cycleId } = useParams();
-
-  const { data: cycle } = useQuery({
-    queryKey: ['cycles', cycleId],
-    queryFn: () => fetchCycle(cycleId || ''),
-    enabled: !!cycleId,
-    retry: false,
-  });
-
-  const { data: statistics } = useQuery({
-    queryKey: ['cycles', cycleId, 'forumQuestions', 0, 'statistics'],
-    queryFn: () => fetchForumQuestionStatistics(cycle?.forumQuestions[0].id || ''),
-    enabled: !!cycle?.id,
-    retry: false,
-  });
-
-  const stats = [
-    {
-      id: 0,
-      title: 'Number of proposals',
-      data: statistics?.numProposals,
-    },
-    {
-      id: 1,
-      title: 'Allocated Hearts',
-      data: statistics?.sumNumOfHearts,
-    },
-    {
-      id: 2,
-      title: 'Number of participants',
-      data: statistics?.numOfParticipants,
-    },
-    {
-      id: 3,
-      title: 'Number of groups',
-      data: statistics?.numOfGroups,
-    },
-  ];
-
-  const optionStatsArray = Object.entries(statistics?.optionStats || {})
-    .map(([id, stats]) => ({
-      id,
-      ...stats,
-    }))
-    .sort((a, b) => parseFloat(b.pluralityScore) - parseFloat(a.pluralityScore));
-
-  return (
-    <FlexColumn $gap="4rem">
-      <BackArrow onClick={handleGoBack}>
-        <img src="/icons/back_arrow.svg" alt="Back arrow" />
-      </BackArrow>
-      <FlexColumn $gap="3rem">
-        <Title>Results for: {cycle?.forumQuestions?.[0].questionTitle}</Title>
-        <Grid $columns={4}>
-          {stats.map((stat) => (
-            <Card key={stat.id} title={stat.title} bigNumber={stat.data} />
-          ))}
-        </Grid>
-      </FlexColumn>
-      <FlexColumn $gap="3rem">
-        <Title>Leaderboard</Title>
-        <FlexColumn $gap="2rem">
-          {optionStatsArray.map((option, index) => {
-            const formattedPluralityScore =
-              parseFloat(option.pluralityScore) % 1 === 0
-                ? parseFloat(option.pluralityScore).toFixed(0)
-                : parseFloat(option.pluralityScore).toFixed(3);
-
-            return (
-              <ResultsCard
-                key={option.id}
-                $expanded={expandedIndex === index}
-                onClick={() => setExpandedIndex(expandedIndex === index ? null : index)}
-              >
-                <FlexColumn $gap="1rem">
-                  <FlexRow $justifyContent="space-between">
-                    <FlexRow $gap="0.5rem">
-                      {index === 0 && <Badge $type="gold" />}
-                      {index === 1 && <Badge $type="silver" />}
-                      {index === 2 && <Badge $type="bronze" />}
-                      <Title>{option.optionTitle}</Title>
-                    </FlexRow>
-                    <img className="arrow" src="/arrow_down.svg" alt="Arrow icon" />
-                  </FlexRow>
-                  <FlexRow>
-                    <Subtitle>Plurality score:</Subtitle>
-                    <span>{formattedPluralityScore}</span>
-                  </FlexRow>
-                  <FlexColumn className="statistics">
-                    <FlexRow>
-                      <Subtitle>Distinct voters:</Subtitle>
-                      <span>{option.distinctUsers}</span>
-                    </FlexRow>
-                    <FlexRow>
-                      <Subtitle>Allocated hearts:</Subtitle>
-                      <span>{option.allocatedHearts}</span>
-                    </FlexRow>
-                  </FlexColumn>
-                </FlexColumn>
-              </ResultsCard>
-            );
-          })}
-        </FlexColumn>
-      </FlexColumn>
-    </FlexColumn>
-  );
-}
-
-export default Results;
diff --git a/packages/core/src/pages/Vote.tsx b/packages/core/src/pages/Vote.tsx
deleted file mode 100644
index a74d6895..00000000
--- a/packages/core/src/pages/Vote.tsx
+++ /dev/null
@@ -1,247 +0,0 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useEffect, useMemo, useState } from 'react';
-import toast from 'react-hot-toast';
-import { useNavigate, useParams } from 'react-router-dom';
-import styled from 'styled-components';
-import { PostVotesRequest, fetchCycle, fetchUserVotes, postVotes } from 'api';
-import Button from '../components/button';
-import Countdown from '../components/countdown';
-import Option from '../components/option';
-import Title from '../components/typography/Title';
-import useCountdown from '../hooks/useCountdown';
-import useUser from '../hooks/useUser';
-import { FlexColumn, FlexRow, Grid } from '../layout/Layout.styled';
-import { ResponseUserVotesType } from '../types/CycleType';
-
-const BackArrow = styled.div`
-  cursor: pointer;
-  height: 1.75rem;
-  width: 1.75rem;
-`;
-
-function Vote() {
-  const queryClient = useQueryClient();
-  const navigate = useNavigate();
-  const { cycleId, eventId } = useParams();
-
-  const handleGoBack = () => {
-    navigate(-1); // Navigate back one step in the history stack
-  };
-
-  const { user } = useUser();
-  const [startAt, setStartAt] = useState<string | null>(null);
-  const [endAt, setEndAt] = useState<string | null>(null);
-  const initialHearts = 20;
-  const [availableHearts, setAvailableHearts] = useState(initialHearts);
-  const [localUserVotes, setLocalUserVotes] = useState<
-    ResponseUserVotesType | { optionId: string; numOfVotes: number }[]
-  >([]);
-
-  const { data: cycle } = useQuery({
-    queryKey: ['cycles', cycleId],
-    queryFn: () => fetchCycle(cycleId || ''),
-    enabled: !!cycleId,
-    retry: false,
-  });
-
-  const {
-    data: userVotes,
-    isLoading: isLoadingUserVotes,
-    isError: isErrorUserVotes,
-  } = useQuery({
-    queryKey: ['votes', cycleId],
-    queryFn: () => fetchUserVotes(cycleId || ''),
-    enabled: !!user?.id && !!cycleId,
-    retry: false,
-  });
-
-  const { mutate: mutateVotes } = useMutation({
-    mutationFn: postVotes,
-    onSuccess: (body) => {
-      if (body?.data) {
-        queryClient.invalidateQueries({ queryKey: ['votes', cycleId] });
-        queryClient.invalidateQueries({ queryKey: ['cycles', cycleId] });
-        toast.success('Votes saved successfully!');
-      } else {
-        toast.error('Failed to save votes, please try again');
-      }
-    },
-  });
-
-  useEffect(() => {
-    if (cycle && cycle.startAt && cycle.endAt) {
-      setStartAt(cycle.startAt);
-      setEndAt(cycle.endAt);
-    }
-  }, [cycle]);
-
-  const { formattedTime } = useCountdown(startAt, endAt);
-
-  const updateVotesAndHearts = (votes: ResponseUserVotesType) => {
-    const givenVotes = votes
-      .map((option) => option.numOfVotes)
-      .reduce((prev, curr) => prev + curr, 0);
-
-    setAvailableHearts(initialHearts - givenVotes);
-    setLocalUserVotes(votes);
-  };
-
-  const votesAreDifferent = useMemo(() => {
-    return (
-      JSON.stringify(
-        localUserVotes.map((vote) => ({
-          optionId: vote.optionId,
-          numOfVotes: vote.numOfVotes,
-        })),
-      ) !==
-      JSON.stringify(
-        userVotes?.map((vote) => ({
-          optionId: vote.optionId,
-          numOfVotes: vote.numOfVotes,
-        })),
-      )
-    );
-  }, [localUserVotes, userVotes]);
-
-  useEffect(() => {
-    if (userVotes?.length) {
-      updateVotesAndHearts(userVotes);
-    }
-  }, [userVotes]);
-
-  const handleVote = (optionId: string) => {
-    if (availableHearts > 0) {
-      setLocalUserVotes((prevLocalUserVotes) => {
-        const temp = prevLocalUserVotes.find((x) => x.optionId === optionId);
-        if (!temp) {
-          return [...prevLocalUserVotes, { optionId, numOfVotes: 1 }];
-        }
-        const updatedLocalVotes = prevLocalUserVotes.map((prevLocalUserVote) => {
-          if (prevLocalUserVote.optionId === optionId) {
-            return { ...prevLocalUserVote, numOfVotes: prevLocalUserVote.numOfVotes + 1 };
-          }
-          return prevLocalUserVote;
-        });
-        return updatedLocalVotes;
-      });
-      setAvailableHearts((prevavailableHearts) => Math.max(0, prevavailableHearts - 1));
-    }
-  };
-
-  const handleUnvote = (optionId: string) => {
-    setLocalUserVotes((prevLocalUserVotes) => {
-      const updatedLocalVotes = prevLocalUserVotes.map((prevLocalUserVote) => {
-        if (prevLocalUserVote.optionId === optionId) {
-          const newNumOfVotes = Math.max(0, prevLocalUserVote.numOfVotes - 1);
-          return { ...prevLocalUserVote, numOfVotes: newNumOfVotes };
-        }
-        return prevLocalUserVote;
-      });
-
-      return updatedLocalVotes;
-    });
-
-    setAvailableHearts((prevavailableHearts) => Math.min(initialHearts, prevavailableHearts + 1));
-  };
-
-  const handleSaveVotes = () => {
-    try {
-      if (userVotes) {
-        const serverVotesMap = new Map(userVotes.map((vote) => [vote.optionId, vote]));
-        const mutateVotesReq: PostVotesRequest = {
-          votes: [],
-        };
-
-        for (const localVote of localUserVotes) {
-          const matchingServerVote = serverVotesMap.get(localVote.optionId);
-
-          if (!matchingServerVote) {
-            mutateVotesReq.votes.push({
-              optionId: localVote.optionId,
-              numOfVotes: localVote.numOfVotes,
-            });
-          } else if (matchingServerVote.numOfVotes !== localVote.numOfVotes) {
-            mutateVotesReq.votes.push({
-              optionId: localVote.optionId,
-              numOfVotes: localVote.numOfVotes,
-            });
-          }
-        }
-
-        mutateVotes(mutateVotesReq);
-      }
-    } catch (error) {
-      console.error('Error saving votes:', error);
-    }
-  };
-
-  if (isLoadingUserVotes) {
-    return <p>Fetching user votes...</p>;
-  }
-
-  if (isErrorUserVotes) {
-    return <p>Fetching user votes...</p>;
-  }
-
-  return (
-    <FlexColumn $gap="3rem">
-      <BackArrow onClick={handleGoBack}>
-        <img src="/icons/back_arrow.svg" alt="Back arrow" />
-      </BackArrow>
-      <FlexColumn>
-        <Grid $columns={2} $gap="2rem">
-          <Title className="title">{cycle?.forumQuestions?.[0].questionTitle}</Title>
-          <Countdown formattedTime={formattedTime} />
-          <FlexRow $gap="0.25rem" $wrap>
-            {Array.from({ length: initialHearts }).map((_, id) => (
-              <img
-                key={id}
-                src={id < availableHearts ? '/icons/full_heart.svg' : '/icons/empty_heart.svg'}
-                height={32}
-                width={32}
-                alt={id < availableHearts ? 'Full Heart' : 'Empty Heart'}
-              />
-            ))}
-          </FlexRow>
-          <FlexRow $justifySelf="flex-end">
-            <Button color="primary" onClick={handleSaveVotes} disabled={!votesAreDifferent}>
-              Save all votes
-            </Button>
-          </FlexRow>
-        </Grid>
-      </FlexColumn>
-      <Grid $columns={2} $gap="2rem">
-        {cycle &&
-          cycle.forumQuestions?.map((forumQuestion) => {
-            forumQuestion.questionOptions.sort((a, b) => b.voteScore - a.voteScore);
-            return forumQuestion.questionOptions.map((questionOption) => {
-              const userVote = localUserVotes.find((vote) => vote.optionId === questionOption.id);
-              const numOfVotes = userVote ? userVote.numOfVotes : 0;
-              return (
-                <Option
-                  key={questionOption.id}
-                  title={questionOption.optionTitle}
-                  body={questionOption.optionSubTitle}
-                  availableHearts={availableHearts}
-                  numOfVotes={numOfVotes}
-                  onVote={() => handleVote(questionOption.id)}
-                  onUnvote={() => handleUnvote(questionOption.id)}
-                />
-              );
-            });
-          })}
-      </Grid>
-      <FlexRow $alignSelf="center">
-        <Button
-          color="secondary"
-          variant="text"
-          onClick={() => navigate(`/events/${eventId}/cycles/${cycleId}/results`)}
-        >
-          see results
-        </Button>
-      </FlexRow>
-    </FlexColumn>
-  );
-}
-
-export default Vote;
diff --git a/packages/core/src/store.ts b/packages/core/src/store.ts
deleted file mode 100644
index 3dd8c43c..00000000
--- a/packages/core/src/store.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { create } from 'zustand';
-import { devtools, persist } from 'zustand/middleware';
-
-type COMPLETION_STATUS = 'COMPLETE' | 'INCOMPLETE';
-
-interface AppState {
-  onboardingStatus: COMPLETION_STATUS;
-  userStatus: COMPLETION_STATUS;
-  setUserStatus: (status: COMPLETION_STATUS) => void;
-  setOnboardingStatus: (status: COMPLETION_STATUS) => void;
-  reset: () => void;
-}
-
-export const useAppStore = create<AppState>()(
-  devtools(
-    persist(
-      (set) => ({
-        onboardingStatus: 'INCOMPLETE',
-        userStatus: 'INCOMPLETE',
-        setUserStatus: (status: COMPLETION_STATUS) => set(() => ({ userStatus: status })),
-        setOnboardingStatus: (status: COMPLETION_STATUS) =>
-          set(() => ({ onboardingStatus: status })),
-        reset: () => set(() => ({ userStatus: 'INCOMPLETE' })),
-      }),
-      { name: 'lexicon-store' },
-    ),
-  ),
-);
diff --git a/packages/core/src/types/ButtonType.ts b/packages/core/src/types/ButtonType.ts
deleted file mode 100644
index 2a72f69f..00000000
--- a/packages/core/src/types/ButtonType.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
-  children: React.ReactNode;
-  color?: 'primary' | 'secondary';
-  variant?: 'text' | 'contained';
-  center?: boolean;
-  onClick?: () => void;
-}
diff --git a/packages/core/src/types/CycleType.ts b/packages/core/src/types/CycleType.ts
deleted file mode 100644
index 39830108..00000000
--- a/packages/core/src/types/CycleType.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-export type Question = {
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  description: string | null;
-  cycleId: string;
-  title: string;
-};
-
-export type Option = {
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  questionId: string;
-  text: string;
-  voteScore: number;
-};
-
-export type Cycle = {
-  id: string;
-  eventId: string | null;
-  createdAt: string;
-  updatedAt: string;
-  status: 'OPEN' | 'CLOSED' | 'RESULTS' | null;
-  startAt: string;
-  endAt: string;
-};
-
-export type ResponseUserVotesType = {
-  id: string;
-  userId: string;
-  optionId: string;
-  numOfVotes: number;
-  createdAt: string;
-  updatedAt: string;
-}[];
-
-export type ResponseCycleType = {
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  status: 'OPEN' | 'CLOSED' | 'RESULTS' | null;
-  startAt: string;
-  endAt: string;
-  forumQuestions: {
-    id: string;
-    createdAt: string;
-    updatedAt: string;
-    questionSubTitle: string | null;
-    cycleId: string;
-    questionTitle: string;
-    questionOptions: {
-      id: string;
-      createdAt: string;
-      updatedAt: string;
-      questionId: string;
-      optionTitle: string;
-      optionSubTitle?: string;
-      accepted: boolean;
-      voteScore: number;
-    }[];
-  }[];
-}[];
diff --git a/packages/core/src/types/DBEventType.ts b/packages/core/src/types/DBEventType.ts
deleted file mode 100644
index 30743ef2..00000000
--- a/packages/core/src/types/DBEventType.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export type DBEvent = {
-  id: string;
-  name: string;
-  imageUrl: string;
-  registrationDescription: string | null;
-  createdAt: string;
-  updatedAt: string;
-  description: string | null;
-};
diff --git a/packages/core/src/types/ForumQuestionType.ts b/packages/core/src/types/ForumQuestionType.ts
deleted file mode 100644
index 99e2e818..00000000
--- a/packages/core/src/types/ForumQuestionType.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export type GetForumQuestionStatisticsResponse = {
-  numProposals: number;
-  sumNumOfHearts: number;
-  numOfParticipants: number;
-  numOfGroups: number;
-  optionStats: Record<
-    string,
-    {
-      optionTitle: string;
-      pluralityScore: string;
-      distinctUsers: string;
-      allocatedHearts: string;
-    }
-  >;
-};
diff --git a/packages/core/src/types/GroupType.ts b/packages/core/src/types/GroupType.ts
deleted file mode 100644
index 72ee81de..00000000
--- a/packages/core/src/types/GroupType.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export type GetGroupsResponse = {
-  id: string;
-  name: string;
-  description: string;
-  createdAt: string;
-  updatedAt: string;
-};
diff --git a/packages/core/src/types/RegistrationDataType.ts b/packages/core/src/types/RegistrationDataType.ts
deleted file mode 100644
index 90290559..00000000
--- a/packages/core/src/types/RegistrationDataType.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { RegistrationStatus } from './RegistrationType';
-
-export type GetRegistrationDataResponse = {
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  registrationId: string;
-  registrationFieldId: string;
-  value: string;
-}[];
-
-export type PostRegistrationDataRequest = {
-  status: RegistrationStatus;
-  registrationData: {
-    registrationFieldId: string;
-    value: string;
-  }[];
-};
-
-export type PostRegistrationDataResponse = {
-  registrationData:
-    | {
-        id: string;
-        createdAt: string;
-        updatedAt: string;
-        registrationId: string;
-        registrationFieldId: string;
-        value: string;
-      }[]
-    | null;
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  userId: string;
-  eventId: string;
-  status: RegistrationStatus;
-};
diff --git a/packages/core/src/types/RegistrationFieldOptionType.ts b/packages/core/src/types/RegistrationFieldOptionType.ts
deleted file mode 100644
index 032853c4..00000000
--- a/packages/core/src/types/RegistrationFieldOptionType.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export type RegistrationFieldOption = {
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  registrationFieldId: string;
-  value: string;
-};
diff --git a/packages/core/src/types/RegistrationFieldType.ts b/packages/core/src/types/RegistrationFieldType.ts
deleted file mode 100644
index d11741d4..00000000
--- a/packages/core/src/types/RegistrationFieldType.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { RegistrationFieldOption } from './RegistrationFieldOptionType';
-
-export type GetRegistrationFieldsResponse = {
-  id: string;
-  name: string;
-  createdAt: string;
-  updatedAt: string;
-  description: string | null;
-  eventId: string;
-  type: 'SELECT' | 'TEXT' | 'NUMBER' | 'DATE' | 'BOOLEAN';
-  required: boolean | null;
-  fieldDisplayRank: number | null;
-  characterLimit: number;
-  registrationFieldOptions: RegistrationFieldOption[];
-}[];
diff --git a/packages/core/src/types/RegistrationType.ts b/packages/core/src/types/RegistrationType.ts
deleted file mode 100644
index 9ba88368..00000000
--- a/packages/core/src/types/RegistrationType.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export type RegistrationStatus = 'DRAFT' | 'APPROVED' | 'PUBLISHED' | null;
-export type GetRegistrationResponseType = {
-  userId: string;
-  id?: string | undefined;
-  eventId?: string | undefined;
-  status: RegistrationStatus;
-};
diff --git a/packages/core/src/types/UserAttributesType.ts b/packages/core/src/types/UserAttributesType.ts
deleted file mode 100644
index 71e29a3a..00000000
--- a/packages/core/src/types/UserAttributesType.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export type GetUserAttributesResponse = {
-  id: string;
-  createdAt: Date;
-  updatedAt: Date;
-  userId: string;
-  attributeKey: string;
-  attributeValue: string;
-}[];
diff --git a/packages/core/src/utils/formatGroups.ts b/packages/core/src/utils/formatGroups.ts
deleted file mode 100644
index 84740c96..00000000
--- a/packages/core/src/utils/formatGroups.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { GetGroupsResponse } from '../types/GroupType';
-
-/**
- * Formats an array of group objects by sorting alphabetically and placing "Other" and "None" at the beginning.
- * @param groups An array of group objects.
- * @returns An array of formatted group objects with "Other" and "None" placed at the beginning.
- */
-export const formatGroups = (groups: GetGroupsResponse[] | null | undefined) => {
-  return (
-    groups
-      ?.sort((a, b) => a.name.localeCompare(b.name))
-      ?.reduce((acc: { name: string; id: string }[], group) => {
-        if (group.name === 'Other' || group.name === 'None') {
-          acc.unshift({ name: group.name, id: group.id });
-        } else {
-          acc.push({ name: group.name, id: group.id });
-        }
-        return acc;
-      }, []) || []
-  );
-};
diff --git a/packages/core/src/utils/handleSignatureRequest.ts b/packages/core/src/utils/handleSignatureRequest.ts
deleted file mode 100644
index 41ce2f19..00000000
--- a/packages/core/src/utils/handleSignatureRequest.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { constructZupassPcdGetRequestUrl, openZupassPopup } from '@pcd/passport-interface';
-import { ArgumentTypeName } from '@pcd/pcd-types';
-import {
-  SemaphoreSignaturePCDPackage,
-  SemaphoreSignaturePCDArgs,
-} from '@pcd/semaphore-signature-pcd';
-import { SemaphoreIdentityPCDPackage } from '@pcd/semaphore-identity-pcd';
-
-const POPUP_URL = window.location.origin + '/popup';
-
-const handleSignatureRequest = (nonce: string | null) => {
-  const args: SemaphoreSignaturePCDArgs = {
-    identity: {
-      argumentType: ArgumentTypeName.PCD,
-      pcdType: SemaphoreIdentityPCDPackage.name,
-      value: undefined,
-      userProvided: true,
-    },
-    signedMessage: {
-      argumentType: ArgumentTypeName.String,
-      value: nonce ? nonce : undefined,
-      userProvided: false,
-    },
-  };
-
-  const constructProofUrl = constructZupassPcdGetRequestUrl(
-    import.meta.env.VITE_ZUPASS_URL,
-    POPUP_URL,
-    SemaphoreSignaturePCDPackage.name,
-    args,
-    {
-      genericProveScreen: true,
-    },
-  );
-
-  openZupassPopup(POPUP_URL, constructProofUrl);
-};
-
-export default handleSignatureRequest;
diff --git a/packages/core/src/vite-env.d.ts b/packages/core/src/vite-env.d.ts
deleted file mode 100644
index 11f02fe2..00000000
--- a/packages/core/src/vite-env.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference types="vite/client" />
diff --git a/packages/core/vercel.json b/packages/core/vercel.json
deleted file mode 100644
index 1323cdac..00000000
--- a/packages/core/vercel.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "rewrites": [
-    {
-      "source": "/(.*)",
-      "destination": "/index.html"
-    }
-  ]
-}
diff --git a/packages/core/vite.config.ts b/packages/core/vite.config.ts
deleted file mode 100644
index 5724869f..00000000
--- a/packages/core/vite.config.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { defineConfig } from 'vite';
-import react from '@vitejs/plugin-react';
-import { nodePolyfills } from 'vite-plugin-node-polyfills';
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  // This is needed because qr-image relies on it being here
-  // https://github.com/alexeyten/qr-image/issues/13#issuecomment-421289572
-  plugins: [
-    react(),
-    nodePolyfills({
-      include: ['process'],
-      globals: {
-        process: true,
-      },
-    }),
-  ],
-});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0006054c..342af50f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -68,7 +68,7 @@ importers:
         version: 4.3.1(@types/react@18.2.42)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@tanstack/eslint-plugin-query':
         specifier: ^5.18.0
-        version: 5.18.1(eslint@8.56.0)(typescript@5.3.3)
+        version: 5.18.1(eslint@8.56.0)(typescript@5.5.2)
       '@types/react':
         specifier: ^18.2.37
         version: 18.2.42
@@ -77,10 +77,10 @@ importers:
         version: 18.2.17
       '@typescript-eslint/eslint-plugin':
         specifier: ^6.19.0
-        version: 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3)
+        version: 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.5.2))(eslint@8.56.0)(typescript@5.5.2)
       '@typescript-eslint/parser':
         specifier: ^6.19.0
-        version: 6.21.0(eslint@8.56.0)(typescript@5.3.3)
+        version: 6.21.0(eslint@8.56.0)(typescript@5.5.2)
       '@vitejs/plugin-react':
         specifier: ^4.2.0
         version: 4.2.1(vite@5.0.6(@types/node@20.12.4))
@@ -100,8 +100,8 @@ importers:
         specifier: ^3.1.1
         version: 3.2.5
       typescript:
-        specifier: ^5.2.2
-        version: 5.3.3
+        specifier: ^5.5.2
+        version: 5.5.2
       vite:
         specifier: ^5.0.0
         version: 5.0.6(@types/node@20.12.4)
@@ -120,12 +120,6 @@ importers:
         specifier: workspace:*
         version: link:../ui
 
-  packages/core:
-    dependencies:
-      api:
-        specifier: workspace:*
-        version: link:../api
-
   packages/ui:
     dependencies:
       '@radix-ui/react-dialog':
@@ -3461,6 +3455,11 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
+  typescript@5.5.2:
+    resolution: {integrity: sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
   undici-types@5.26.5:
     resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
 
@@ -4862,7 +4861,7 @@ snapshots:
 
   '@radix-ui/react-dialog@1.0.5(@types/react-dom@18.2.24)(@types/react@18.2.74)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.23.9
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.74)(react@18.2.0)
       '@radix-ui/react-context': 1.0.1(@types/react@18.2.74)(react@18.2.0)
@@ -5329,9 +5328,9 @@ snapshots:
 
   '@sindresorhus/merge-streams@2.3.0': {}
 
-  '@tanstack/eslint-plugin-query@5.18.1(eslint@8.56.0)(typescript@5.3.3)':
+  '@tanstack/eslint-plugin-query@5.18.1(eslint@8.56.0)(typescript@5.5.2)':
     dependencies:
-      '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.5.2)
       eslint: 8.56.0
     transitivePeerDependencies:
       - supports-color
@@ -5436,13 +5435,13 @@ snapshots:
 
   '@types/unist@3.0.2': {}
 
-  '@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3)':
+  '@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.5.2))(eslint@8.56.0)(typescript@5.5.2)':
     dependencies:
       '@eslint-community/regexpp': 4.10.0
-      '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.5.2)
       '@typescript-eslint/scope-manager': 6.21.0
-      '@typescript-eslint/type-utils': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
-      '@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/type-utils': 6.21.0(eslint@8.56.0)(typescript@5.5.2)
+      '@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.5.2)
       '@typescript-eslint/visitor-keys': 6.21.0
       debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.56.0
@@ -5450,9 +5449,9 @@ snapshots:
       ignore: 5.3.0
       natural-compare: 1.4.0
       semver: 7.5.4
-      ts-api-utils: 1.0.3(typescript@5.3.3)
+      ts-api-utils: 1.0.3(typescript@5.5.2)
     optionalDependencies:
-      typescript: 5.3.3
+      typescript: 5.5.2
     transitivePeerDependencies:
       - supports-color
 
@@ -5476,16 +5475,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3)':
+  '@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.5.2)':
     dependencies:
       '@typescript-eslint/scope-manager': 6.21.0
       '@typescript-eslint/types': 6.21.0
-      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.3.3)
+      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.2)
       '@typescript-eslint/visitor-keys': 6.21.0
       debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.56.0
     optionalDependencies:
-      typescript: 5.3.3
+      typescript: 5.5.2
     transitivePeerDependencies:
       - supports-color
 
@@ -5517,15 +5516,15 @@ snapshots:
       '@typescript-eslint/types': 7.5.0
       '@typescript-eslint/visitor-keys': 7.5.0
 
-  '@typescript-eslint/type-utils@6.21.0(eslint@8.56.0)(typescript@5.3.3)':
+  '@typescript-eslint/type-utils@6.21.0(eslint@8.56.0)(typescript@5.5.2)':
     dependencies:
-      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.3.3)
-      '@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.2)
+      '@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.5.2)
       debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.56.0
-      ts-api-utils: 1.0.3(typescript@5.3.3)
+      ts-api-utils: 1.0.3(typescript@5.5.2)
     optionalDependencies:
-      typescript: 5.3.3
+      typescript: 5.5.2
     transitivePeerDependencies:
       - supports-color
 
@@ -5547,7 +5546,7 @@ snapshots:
 
   '@typescript-eslint/types@7.5.0': {}
 
-  '@typescript-eslint/typescript-estree@5.62.0(typescript@5.3.3)':
+  '@typescript-eslint/typescript-estree@5.62.0(typescript@5.5.2)':
     dependencies:
       '@typescript-eslint/types': 5.62.0
       '@typescript-eslint/visitor-keys': 5.62.0
@@ -5555,13 +5554,13 @@ snapshots:
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.4
-      tsutils: 3.21.0(typescript@5.3.3)
+      tsutils: 3.21.0(typescript@5.5.2)
     optionalDependencies:
-      typescript: 5.3.3
+      typescript: 5.5.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@6.21.0(typescript@5.3.3)':
+  '@typescript-eslint/typescript-estree@6.21.0(typescript@5.5.2)':
     dependencies:
       '@typescript-eslint/types': 6.21.0
       '@typescript-eslint/visitor-keys': 6.21.0
@@ -5570,9 +5569,9 @@ snapshots:
       is-glob: 4.0.3
       minimatch: 9.0.3
       semver: 7.5.4
-      ts-api-utils: 1.0.3(typescript@5.3.3)
+      ts-api-utils: 1.0.3(typescript@5.5.2)
     optionalDependencies:
-      typescript: 5.3.3
+      typescript: 5.5.2
     transitivePeerDependencies:
       - supports-color
 
@@ -5591,14 +5590,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@5.62.0(eslint@8.56.0)(typescript@5.3.3)':
+  '@typescript-eslint/utils@5.62.0(eslint@8.56.0)(typescript@5.5.2)':
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
       '@types/json-schema': 7.0.15
       '@types/semver': 7.5.6
       '@typescript-eslint/scope-manager': 5.62.0
       '@typescript-eslint/types': 5.62.0
-      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3)
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.5.2)
       eslint: 8.56.0
       eslint-scope: 5.1.1
       semver: 7.5.4
@@ -5606,14 +5605,14 @@ snapshots:
       - supports-color
       - typescript
 
-  '@typescript-eslint/utils@6.21.0(eslint@8.56.0)(typescript@5.3.3)':
+  '@typescript-eslint/utils@6.21.0(eslint@8.56.0)(typescript@5.5.2)':
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
       '@types/json-schema': 7.0.15
       '@types/semver': 7.5.6
       '@typescript-eslint/scope-manager': 6.21.0
       '@typescript-eslint/types': 6.21.0
-      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.3.3)
+      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.2)
       eslint: 8.56.0
       semver: 7.5.4
     transitivePeerDependencies:
@@ -7928,16 +7927,20 @@ snapshots:
     dependencies:
       typescript: 5.3.3
 
+  ts-api-utils@1.0.3(typescript@5.5.2):
+    dependencies:
+      typescript: 5.5.2
+
   ts-interface-checker@0.1.13: {}
 
   tslib@1.14.1: {}
 
   tslib@2.6.2: {}
 
-  tsutils@3.21.0(typescript@5.3.3):
+  tsutils@3.21.0(typescript@5.5.2):
     dependencies:
       tslib: 1.14.1
-      typescript: 5.3.3
+      typescript: 5.5.2
 
   tty-browserify@0.0.1: {}
 
@@ -7955,6 +7958,8 @@ snapshots:
 
   typescript@5.4.2: {}
 
+  typescript@5.5.2: {}
+
   undici-types@5.26.5: {}
 
   unicorn-magic@0.1.0: {}