diff --git a/app/page.tsx b/app/page.tsx
index 7b745378..8b7b5837 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,34 +1,19 @@
 import React from "react";
 import styles from "./page.module.scss";
-// import Olympian from "@/components/Home/Olympian/Olympian";
-// import Footer from "@/components/Home/Footer/Footer";
-// import FAQJoinUs from "@/components/Home/FAQJoinUs/FAQJoinUs";
-// import Sponsors from "@/components/Home/Sponsors/Sponsors";
-// import FAQSection from "@/components/Home/FAQ/FAQ";
-import Accepted from "@/components/Profile/RSVP/ModalViews/Accepted";
-import Rejected from "@/components/Profile/RSVP/ModalViews/Rejected";
-import ConfirmReject from "@/components/Profile/RSVP/ModalViews/ConfirmReject";
+import Olympian from "@/components/Home/Olympian/Olympian";
+import Footer from "@/components/Home/Footer/Footer";
+import FAQJoinUs from "@/components/Home/FAQJoinUs/FAQJoinUs";
+import Sponsors from "@/components/Home/Sponsors/Sponsors";
+import FAQSection from "@/components/Home/FAQ/FAQ";
 
 const Home: React.FC = () => {
     return (
         <main className={styles.main}>
-            <ConfirmReject
-                handleAPIDecline={() => {}}
-                handleGoBack={() => {}}
-            />
-            <Accepted
-                reimburse={120.23}
-                handleConfirm={() => {}}
-                handleDecline={() => {}}
-            >
-                <b>Congrats, stuff is happening</b>
-            </Accepted>
-            <Rejected handleCancel={() => {}} />
-            {/* <Olympian />
+            <Olympian />
             <FAQJoinUs />
             <FAQSection />
             <Sponsors />
-            <Footer /> */}
+            <Footer />
         </main>
     );
 };
diff --git a/app/profile/page.tsx b/app/profile/page.tsx
index b14c38b1..9485cdf5 100644
--- a/app/profile/page.tsx
+++ b/app/profile/page.tsx
@@ -21,10 +21,11 @@ import { QRCodeSVG } from "qrcode.react";
 import Modal from "react-modal";
 import OlympianButton from "@/components/OlympianButton/OlympianButton";
 import useWindowSize from "@/hooks/use-window-size";
-import UserRejected from "@/components/RSVPContent/UserRejected";
-import UserGeneralAcceptedToGeneral from "@/components/RSVPContent/UserGeneralAcceptedToGeneral";
-import UserProAcceptedToGeneral from "@/components/RSVPContent/UserProAcceptedToGeneral";
-import UserProAcceptedToPro from "@/components/RSVPContent/UserProAcceptedToPro";
+import {
+    Rejected,
+    Waitlisted
+} from "@/components/Profile/RSVP/ModalViews/Rejected";
+import Accepted from "@/components/Profile/RSVP/ModalViews/Accepted";
 
 type ValueItemProps = {
     label: string;
@@ -47,6 +48,7 @@ const ValueItem: React.FC<ValueItemProps> = ({ label, isHighlighted }) => {
 const Profile: React.FC = () => {
     const pathname = usePathname();
     const router = useRouter();
+    const windowSizeHook = useWindowSize();
 
     const [registration, setRegistration] = useState<RegistrationData | null>(
         null
@@ -56,24 +58,31 @@ const Profile: React.FC = () => {
     const [isLoading, setIsLoading] = useState(true);
 
     const [qrCodeURL, setQRCodeURL] = useState<string | null>(null);
-    const [qrCodeOpen, setQRCodeOpen] = useState(false);
-    const [detailsOpen, setDetailsOpen] = useState(false);
 
-    const handleOpenQRCode = async () => {
-        const qrCode = await getQRCode();
-        setQRCodeURL(qrCode);
-        setQRCodeOpen(true);
-    };
+    const [modalOpen, setModalOpen] = useState(false);
 
-    const handleSetDetailsOpen = () => {
-        setDetailsOpen(true);
-    };
+    const getButtonText = () => {
+        if (RSVP?.status === "REJECTED" || RSVP?.status === "WAITLISTED") {
+            return "Details";
+        }
 
-    const handleCloseQRCode = () => {
-        setQRCodeOpen(false);
+        if (RSVP?.response === "ACCEPTED") {
+            return "View QR Code";
+        }
+
+        return "Congrats! Click here to RSVP";
     };
 
     useEffect(() => {
+        // setRSVP({
+        //     admittedPro: false,
+        //     reimbursementValue: 0.01,
+        //     response: "PENDING",
+        //     status: "ACCEPTED",
+        //     userId: "0"
+        // });
+        // setIsLoading(false);
+
         if (!isAuthenticated()) {
             authenticate(pathname);
             return;
@@ -86,35 +95,60 @@ const Profile: React.FC = () => {
 
             setRegistration(registrationFromAPI(registration));
             Promise.all([getChallenge(), getRSVP()]).then(
-                ([challenge, RSVP]) => {
+                async ([challenge, RSVP]) => {
                     setIsProApplicant(challenge.complete);
                     setRSVP(RSVP);
+                    if (
+                        RSVP.status === "ACCEPTED" &&
+                        RSVP.response === "ACCEPTED"
+                    ) {
+                        const qrCodeUrl = await getQRCode();
+                        setQRCodeURL(qrCodeUrl);
+                    }
                     setIsLoading(false);
                 }
             );
         });
-    }, []);
+    }, [pathname, router]);
 
     return (
         <>
+            {isLoading && <Loading />}
             <Head>
                 <title>HackIllinois | Profile</title>
             </Head>
-            <QRModal
-                qrCodeOpen={qrCodeOpen}
-                qrCodeURL={qrCodeURL}
-                handleCloseQRCode={handleCloseQRCode}
-            />
-            {RSVP && (
-                <DetailsModal
-                    isProApplicant={isProApplicant}
-                    rsvp={RSVP}
-                    detailsOpen={detailsOpen}
-                    handleCloseDetails={() => setDetailsOpen(false)}
-                />
+            {RSVP && RSVP.status !== "TBD" && RSVP.response !== "DECLINED" && (
+                <Modal
+                    className={styles.modal}
+                    style={{
+                        overlay: { zIndex: 1000 },
+                        content: {
+                            inset:
+                                windowSizeHook?.width &&
+                                windowSizeHook?.width < 768
+                                    ? "10px"
+                                    : "40px"
+                        }
+                    }}
+                    isOpen={modalOpen}
+                    onRequestClose={() => {
+                        setModalOpen(false);
+                    }}
+                    ariaHideApp={false}
+                >
+                    <div className={styles.modalContent}>
+                        {/* TODO: close button */}
+                        <ModalContent
+                            status={RSVP.status}
+                            response={RSVP.response}
+                            isPro={RSVP.admittedPro}
+                            isProApplicant={isProApplicant}
+                            qrUrl={qrCodeURL}
+                            reimburse={RSVP.reimbursementValue}
+                        />
+                    </div>
+                </Modal>
             )}
-
-            {isLoading && <Loading />}
             <div
                 style={{
                     backgroundImage: `url(${APPLICATION_STATUS_BACKGROUND?.src})`
@@ -128,10 +162,14 @@ const Profile: React.FC = () => {
                     className={styles.container}
                 >
                     <h2>
-                        {registration?.preferredName
-                            ? `${registration?.preferredName.trim()}'s `
-                            : " "}
-                        Application Status
+                        {registration
+                            ? `${
+                                  registration?.preferredName
+                                      ? `${registration?.preferredName.trim()}'s `
+                                      : " "
+                              }
+                        Application Status`
+                            : "Loading..."}
                     </h2>
                     <div className={styles.content}>
                         <div className={styles.info}>
@@ -196,24 +234,14 @@ const Profile: React.FC = () => {
                         </div>
                         <div className={clsx(styles.col, styles.qrCodeCol)}>
                             {RSVP &&
-                                (RSVP.status === "ACCEPTED" &&
-                                RSVP.response === "ACCEPTED" ? (
+                                RSVP.status !== "TBD" &&
+                                RSVP.response !== "DECLINED" && (
                                     <OlympianButton
-                                        text="View QR Code"
-                                        onClick={handleOpenQRCode}
+                                        text={getButtonText()}
+                                        onClick={() => setModalOpen(true)}
                                         medium
                                     />
-                                ) : ["ACCEPTED", "REJECTED"].includes(
-                                      RSVP.status
-                                  ) ? (
-                                    <OlympianButton
-                                        text="Details"
-                                        onClick={handleSetDetailsOpen}
-                                        medium
-                                    />
-                                ) : (
-                                    <></>
-                                ))}
+                                )}
                         </div>
                     </div>
                 </div>
@@ -222,92 +250,57 @@ const Profile: React.FC = () => {
     );
 };
 
-const QRModal: React.FC<{
-    qrCodeOpen: boolean;
-    handleCloseQRCode: () => void;
-    qrCodeURL: string | null;
-}> = ({ qrCodeOpen, handleCloseQRCode, qrCodeURL }) => {
-    const windowSizeHook = useWindowSize();
-
+const QR: React.FC<{ qrUrl: string | null }> = ({ qrUrl }) => {
     return (
-        <Modal
-            className={styles.modal}
-            style={{
-                overlay: { zIndex: 1000 },
-                content: {
-                    inset:
-                        windowSizeHook?.width && windowSizeHook?.width < 768
-                            ? "10px"
-                            : "40px"
-                }
-            }}
-            isOpen={qrCodeOpen}
-            onRequestClose={handleCloseQRCode}
-            ariaHideApp={false}
-        >
-            <div className={styles.modalContent}>
-                <h2>Your QR Code</h2>
-                {qrCodeURL && <QRCodeSVG value={qrCodeURL} />}
-                <button className={styles.link} onClick={handleCloseQRCode}>
-                    Close
-                </button>
-            </div>
-        </Modal>
+        <>
+            <h2>Your QR Code</h2>
+            {qrUrl && <QRCodeSVG value={qrUrl} />}
+        </>
     );
 };
 
-const DetailsModal: React.FC<{
+type ModalContentProps = {
+    status: "ACCEPTED" | "REJECTED" | "WAITLISTED";
+    response: "ACCEPTED" | "PENDING";
+    isPro: boolean;
     isProApplicant: boolean;
-    rsvp: RSVPType;
-    detailsOpen: boolean;
-    handleCloseDetails: () => void;
-}> = ({ isProApplicant, rsvp, detailsOpen, handleCloseDetails }) => {
-    const pages = {
-        user_rejected: UserRejected,
-        user_pro_accepted_to_pro: UserProAcceptedToPro,
-        user_pro_accepted_to_general: UserProAcceptedToGeneral,
-        user_general_accepted_to_general: UserGeneralAcceptedToGeneral
-    };
+    qrUrl: string | null;
+    reimburse: number;
+};
 
-    const [displayedPage, setDisplayedPage] = useState<
-        keyof typeof pages | undefined
-    >(undefined);
+const ModalContent: React.FC<ModalContentProps> = ({
+    status,
+    response,
+    isPro,
+    isProApplicant,
+    qrUrl,
+    reimburse
+}) => {
+    switch (status) {
+        case "ACCEPTED":
+            if (response === "ACCEPTED") {
+                return <QR qrUrl={qrUrl} />;
+            }
 
-    const handleLoadDisplayedPage = () => {
-        if (rsvp.response === "DECLINED") {
-            setDisplayedPage("user_rejected");
-            return;
-        }
-        if (isProApplicant) {
-            if (rsvp.admittedPro) {
-                setDisplayedPage("user_pro_accepted_to_pro");
-            } else {
-                setDisplayedPage("user_pro_accepted_to_general");
+            if (isPro) {
+                return <Accepted acceptedType={"PRO"} reimburse={reimburse} />;
             }
-        } else {
-            setDisplayedPage("user_general_accepted_to_general");
-        }
-    };
 
-    useEffect(() => {
-        handleLoadDisplayedPage();
-    }, [rsvp?.response, rsvp?.status, rsvp?.admittedPro]);
+            if (isProApplicant) {
+                return (
+                    <Accepted
+                        acceptedType={"PRO_TO_GENERAL"}
+                        reimburse={reimburse}
+                    />
+                );
+            }
 
-    return (
-        <Modal
-            className={styles.modal}
-            style={{
-                overlay: { zIndex: 1000 }
-            }}
-            isOpen={detailsOpen}
-            onRequestClose={handleCloseDetails}
-            ariaHideApp={false}
-        >
-            <div className={styles.modalContent}>
-                {displayedPage && React.createElement(pages[displayedPage])}
-            </div>
-        </Modal>
-    );
+            return <Accepted acceptedType={"GENERAL"} reimburse={reimburse} />;
+        case "REJECTED":
+            return <Rejected />;
+        case "WAITLISTED":
+            return <Waitlisted />;
+    }
 };
 
 export default Profile;
diff --git a/components/Profile/RSVP/ModalViews/Accepted.tsx b/components/Profile/RSVP/ModalViews/Accepted.tsx
index 21b60113..9a286cb0 100644
--- a/components/Profile/RSVP/ModalViews/Accepted.tsx
+++ b/components/Profile/RSVP/ModalViews/Accepted.tsx
@@ -1,20 +1,38 @@
 import React from "react";
 import styles from "./styles.module.scss";
 
-type Accepted = {
-    children: React.ReactNode;
+type AcceptedType = "PRO" | "PRO_TO_GENERAL" | "GENERAL";
+
+type AcceptedProps = {
+    acceptedType: AcceptedType;
+    reimburse: number;
+};
+
+export default function Accepted({ acceptedType, reimburse }: AcceptedProps) {
+    return (
+        <ChooseRSVP
+            acceptedType={acceptedType}
+            reimburse={reimburse}
+            handleConfirm={() => {}}
+            handleDecline={() => {}}
+        />
+    );
+}
+
+type ChooseRSVPProps = {
+    acceptedType: AcceptedType;
     reimburse: number;
     handleConfirm: () => void;
     handleDecline: () => void;
 };
 
-export default function Accepted({ children, reimburse }: Accepted) {
+export function ChooseRSVP({ reimburse, acceptedType }: ChooseRSVPProps) {
     return (
         <div className={styles.container}>
             <div className={styles.textBlock}>
-                {children}
+                <AcceptedVerbage acceptedType={acceptedType} />
                 <p>
-                    If you would like to attend HackIllinois 2024, click Confirm
+                    If you would like to attend HackIllinois 2025, click Confirm
                     to finish the RSVP process. If you won&apos;t be attending
                     please click Decline. This cannot be reversed.
                 </p>
@@ -31,24 +49,42 @@ export default function Accepted({ children, reimburse }: Accepted) {
                 {/* <ConfirmButton onClick={handleConfirm} />
                 <DeclineButton onClick={handleDecline} /> */}
             </div>
-            {/* <div className={styles.mobileButtonGroup}>
-                <button onClick={handleConfirm}>
-                    <Image
-                        alt="confirm button"
-                        src={MobileConfirmButton}
-                        width={309}
-                        height={54}
-                    />
-                </button>
-                <button onClick={handleDecline}>
-                    <Image
-                        alt="decline button"
-                        src={MobileDeclineButton}
-                        width={309}
-                        height={54}
-                    />
-                </button>
-            </div> */}
         </div>
     );
 }
+
+type AcceptedVerbageProps = {
+    acceptedType: AcceptedType;
+};
+
+function AcceptedVerbage({ acceptedType }: AcceptedVerbageProps) {
+    switch (acceptedType) {
+        case "GENERAL":
+            return (
+                <>
+                    <b>Congratulations! You&apos;ve been accepted as a</b>
+                    <b> </b>
+                    <b className={styles.shiny}>General Attendee</b>
+                </>
+            );
+        case "PRO_TO_GENERAL":
+            return (
+                <>
+                    <b>
+                        Unfortunately, we couldn&apos;t offer you a spot as a
+                        HackKnight, but you&apos;ve been accepted as a
+                    </b>
+                    <b> </b>
+                    <b className={styles.shiny}>General Attendee</b>
+                </>
+            );
+        case "PRO":
+            return (
+                <>
+                    <b>Congratulations! You&apos;ve been accepted as a</b>
+                    <b> </b>
+                    <b className={styles.shiny}>HackOlympian</b>
+                </>
+            );
+    }
+}
diff --git a/components/Profile/RSVP/ModalViews/Rejected.tsx b/components/Profile/RSVP/ModalViews/Rejected.tsx
index 2d4062a2..d5473bf8 100644
--- a/components/Profile/RSVP/ModalViews/Rejected.tsx
+++ b/components/Profile/RSVP/ModalViews/Rejected.tsx
@@ -1,10 +1,6 @@
 import styles from "./styles.module.scss";
 
-type RejectedProps = {
-    handleCancel: () => void;
-};
-
-export default function Rejected({}: RejectedProps) {
+export function Rejected() {
     return (
         <div className={styles.container}>
             <b>
@@ -18,7 +14,25 @@ export default function Rejected({}: RejectedProps) {
                 </a>{" "}
                 if you have any questions!
             </b>
-            {/* <OkButton onClick={handleCancel} /> */}
+        </div>
+    );
+}
+
+// TODO: update this wording
+export function Waitlisted() {
+    return (
+        <div className={styles.container}>
+            <b>
+                Unfortunately, we have deferred your application decision at
+                this time.
+            </b>
+            <b>
+                Email us at{" "}
+                <a href="mailto:contact@hackillinois.org">
+                    contact@hackillinois.org
+                </a>{" "}
+                if you have any questions!
+            </b>
         </div>
     );
 }
diff --git a/components/RSVPContent/UserGeneralAcceptedToGeneral.tsx b/components/RSVPContent/UserGeneralAcceptedToGeneral.tsx
deleted file mode 100644
index eddc4e4b..00000000
--- a/components/RSVPContent/UserGeneralAcceptedToGeneral.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-const UserGeneralAcceptedToGeneral: React.FC = () => {
-    return <p>User pro accepted to general</p>;
-};
-
-export default UserGeneralAcceptedToGeneral;
diff --git a/components/RSVPContent/UserProAcceptedToGeneral.tsx b/components/RSVPContent/UserProAcceptedToGeneral.tsx
deleted file mode 100644
index 32e219d4..00000000
--- a/components/RSVPContent/UserProAcceptedToGeneral.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-const UserProAcceptedToGeneral: React.FC = () => {
-    return <p>User pro accepted to general</p>;
-};
-
-export default UserProAcceptedToGeneral;
diff --git a/components/RSVPContent/UserProAcceptedToPro.tsx b/components/RSVPContent/UserProAcceptedToPro.tsx
deleted file mode 100644
index df80cd11..00000000
--- a/components/RSVPContent/UserProAcceptedToPro.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-const UserProAcceptedToPro: React.FC = () => {
-    return <p>Pro user accepted to pro</p>;
-};
-
-export default UserProAcceptedToPro;
diff --git a/components/RSVPContent/UserRejected.tsx b/components/RSVPContent/UserRejected.tsx
deleted file mode 100644
index c3681de1..00000000
--- a/components/RSVPContent/UserRejected.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-const UserRejected: React.FC = () => {
-    return <p>User rejected</p>;
-};
-
-export default UserRejected;
diff --git a/util/api.ts b/util/api.ts
index 88ebc972..ba7c65d3 100644
--- a/util/api.ts
+++ b/util/api.ts
@@ -59,8 +59,8 @@ export async function requestv2(
 }
 
 export async function getChallenge(): Promise<ChallengeStatus> {
-    const res = await requestv2("GET", "/registration/challenge/").catch(body =>
-        handleError(body)
+    const res = await requestv2("GET", "/registration/challenge/").catch(
+        handleError
     );
     return res;
 }
@@ -106,7 +106,7 @@ export async function registerUpdate(
     registration: RegistrationType
 ): Promise<WithId<RegistrationType>> {
     const res = await requestv2("POST", `/registration`, registration).catch(
-        body => handleError(body)
+        handleError
     );
     return res;
 }
@@ -118,34 +118,32 @@ export async function registerSubmit(
         "POST",
         `/registration/submit`,
         registration
-    ).catch(body => handleError(body));
+    ).catch(handleError);
     return res;
 }
 
 export async function getRegistrationStatus(): Promise<{ alive: boolean }> {
-    const res = await requestv2("GET", "/registration/status").catch(body =>
-        handleError(body)
+    const res = await requestv2("GET", "/registration/status").catch(
+        handleError
     );
     return res;
 }
 
 export async function getRSVP(): Promise<RSVPType> {
-    const res = await requestv2("GET", "/admission/rsvp").catch(body =>
-        handleError(body)
-    );
+    const res = await requestv2("GET", "/admission/rsvp").catch(handleError);
     return res;
 }
 
 export async function RSVPDecideAccept() {
-    const res = await requestv2("PUT", "/admission/rsvp/accept").catch(body =>
-        handleError(body)
+    const res = await requestv2("PUT", "/admission/rsvp/accept").catch(
+        handleError
     );
     return res;
 }
 
 export async function RSVPDecideDecline() {
-    const res = await requestv2("PUT", "/admission/rsvp/decline").catch(body =>
-        handleError(body)
+    const res = await requestv2("PUT", "/admission/rsvp/decline").catch(
+        handleError
     );
     return res;
 }
@@ -174,17 +172,15 @@ export async function unsubscribe(listName: string, emailAddress: string) {
     const res = await requestv2("DELETE", "/newsletter/subscribe/", {
         listName,
         emailAddress
-    }).catch(body => handleError(body));
+    }).catch(handleError);
     return res;
 }
 
 export async function getQRCode(): Promise<string> {
-    const res = await requestv2("GET", "/user/qr").catch(body =>
-        handleError(body)
-    );
+    const res = await requestv2("GET", "/user/qr").catch(handleError);
     return res.qrInfo;
 }
 
 export function setProfile(body: ProfileBodyType): Promise<ProfileType> {
-    return requestv2("POST", "/profile", body);
+    return requestv2("POST", "/profile", body).catch(handleError);
 }