diff --git a/package-lock.json b/package-lock.json
index 8b9f229..8f96ea3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,6 +22,7 @@
         "@trpc/next": "10.37.1",
         "@trpc/react-query": "10.37.1",
         "@trpc/server": "10.37.1",
+        "@uidotdev/usehooks": "2.4.1",
         "@uzh-bf/design-system": "2.4.3",
         "axios": "1.5.1",
         "cross-fetch": "3.1.5",
@@ -2225,6 +2226,18 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@uidotdev/usehooks": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@uidotdev/usehooks/-/usehooks-2.4.1.tgz",
+      "integrity": "sha512-1I+RwWyS+kdv3Mv0Vmc+p0dPYH0DTRAo04HLyXReYBL9AeseDWUJyi4THuksBJcu9F0Pih69Ak150VDnqbVnXg==",
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "react": ">=18.0.0",
+        "react-dom": ">=18.0.0"
+      }
+    },
     "node_modules/@uzh-bf/design-system": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/@uzh-bf/design-system/-/design-system-2.4.3.tgz",
diff --git a/package.json b/package.json
index aa75058..90f9af6 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "@trpc/next": "10.37.1",
     "@trpc/react-query": "10.37.1",
     "@trpc/server": "10.37.1",
+    "@uidotdev/usehooks": "2.4.1",
     "@uzh-bf/design-system": "2.4.3",
     "axios": "1.5.1",
     "cross-fetch": "3.1.5",
diff --git a/src/components/AcceptProposalForm.tsx b/src/components/AcceptProposalForm.tsx
index dccbd3c..1ccdb60 100644
--- a/src/components/AcceptProposalForm.tsx
+++ b/src/components/AcceptProposalForm.tsx
@@ -12,12 +12,14 @@ interface AcceptProposalFormProps {
   proposalName: string
   proposalId: string
   supervisorEmail: string
+  setProvidedFeedback: (value: string) => void
 }
 
 export default function AcceptProposalForm({
   proposalName,
   proposalId,
   supervisorEmail,
+  setProvidedFeedback,
 }: AcceptProposalFormProps) {
   const SignupSchema = Yup.object().shape({
     comment: Yup.string().required('Required'),
@@ -36,9 +38,9 @@ export default function AcceptProposalForm({
       }}
       validationSchema={SignupSchema}
       onSubmit={async (values, { resetForm }) => {
-        await submitFeedback.mutateAsync(values)
-
+        setProvidedFeedback('ACCEPT')
         resetForm()
+        await submitFeedback.mutateAsync(values)
         toast.success('Proposal accepted successfully!')
       }}
     >
@@ -49,7 +51,7 @@ export default function AcceptProposalForm({
           assigned to you for supervision. You will work directly with the
           student to finalize the proposal and get the thesis process started.
         </div>
-        <div className="grid mt-4 place-items-lef">
+        <div className="flex flex-col gap-3 mt-4">
           <FormikTextField
             disabled={true}
             name="proposalName"
@@ -68,7 +70,7 @@ export default function AcceptProposalForm({
               field: 'flex-col',
             }}
           />
-          <div className="mt-2 italic">
+          <div className="italic">
             Your message will be sent to the student alongside your acceptance
             notification.
           </div>
diff --git a/src/components/DeclineProposalForm.tsx b/src/components/DeclineProposalForm.tsx
index f9264ba..18dbcd8 100644
--- a/src/components/DeclineProposalForm.tsx
+++ b/src/components/DeclineProposalForm.tsx
@@ -13,12 +13,14 @@ interface DeclineProposalFormProps {
   proposalName: string
   proposalId: string
   supervisorEmail: string
+  setProvidedFeedback: (value: string) => void
 }
 
 export default function DeclineProposalForm({
   proposalName,
   proposalId,
   supervisorEmail,
+  setProvidedFeedback,
 }: DeclineProposalFormProps) {
   const SignupSchema = Yup.object().shape({
     reason: Yup.string().required('Required'),
@@ -31,7 +33,7 @@ export default function DeclineProposalForm({
     <Formik
       initialValues={{
         proposalName: proposalName,
-        reason: '',
+        reason: undefined,
         comment: '',
         proposalId: proposalId,
         supervisorEmail: supervisorEmail,
@@ -39,9 +41,9 @@ export default function DeclineProposalForm({
       }}
       validationSchema={SignupSchema}
       onSubmit={async (values, { resetForm }) => {
-        await submitFeedback.mutateAsync(values)
-
         resetForm()
+        setProvidedFeedback('DECLINE')
+        await submitFeedback.mutateAsync(values)
         toast.success('Proposal declined successfully!')
       }}
     >
@@ -50,7 +52,7 @@ export default function DeclineProposalForm({
           Declining this proposal because of a mismatch of interests or a high
           workload on your side will keep it available for other supervisors.
         </div>
-        <div className="grid mt-4 place-items-lef">
+        <div className="flex flex-col gap-3 mt-4">
           <FormikTextField
             disabled={true}
             name="proposalName"
@@ -78,7 +80,7 @@ export default function DeclineProposalForm({
               },
             ]}
             label="Reason"
-            placeholder="Select a name"
+            placeholder="Select a reason..."
             className={{
               label: 'font-sans text-lg',
               root: 'flex-col',
@@ -93,7 +95,7 @@ export default function DeclineProposalForm({
               field: 'flex-col',
             }}
           />
-          <div className="mt-2 italic">
+          <div className="italic">
             Why do you decline this proposal specifically? Your comment will not
             be shown to the student.
           </div>
diff --git a/src/components/ProposalMeta.tsx b/src/components/ProposalMeta.tsx
index 6de6bc1..3543b20 100644
--- a/src/components/ProposalMeta.tsx
+++ b/src/components/ProposalMeta.tsx
@@ -68,7 +68,7 @@ export default function ProposalMeta({ proposalDetails }: ProposalMetaProps) {
       </div>
 
       {proposalDetails.typeKey === 'STUDENT' && (
-        <div className="text-sm">
+        <div className="text-sm flex flex-row gap-6 mt-4">
           {proposalDetails.attachments.map((attachment: any) => (
             <Link
               key={attachment.id}
diff --git a/src/components/ProposalStatusForm.tsx b/src/components/ProposalStatusForm.tsx
index 7f503c9..eb86f95 100644
--- a/src/components/ProposalStatusForm.tsx
+++ b/src/components/ProposalStatusForm.tsx
@@ -1,4 +1,5 @@
-import { Tabs } from '@uzh-bf/design-system'
+import { useSessionStorage } from '@uidotdev/usehooks'
+import { Tabs, UserNotification } from '@uzh-bf/design-system'
 import type { Session } from 'next-auth'
 import { ProposalDetails } from 'src/types/app'
 import AcceptProposalForm from './AcceptProposalForm' // Import AcceptProposalForm and other form components
@@ -14,18 +15,20 @@ export default function ProposalStatusForm({
   proposalDetails,
   session,
 }: ProposalStatusFormProps) {
+  const [providedFeedback, setProvidedFeedback] = useSessionStorage<
+    null | string
+  >(proposalDetails.id, null)
   if (
-    proposalDetails?.typeKey === 'STUDENT' &&
-    proposalDetails?.statusKey === 'MATCHED_TENTATIVE'
+    (proposalDetails?.typeKey === 'STUDENT' &&
+      proposalDetails?.statusKey === 'MATCHED_TENTATIVE') ||
+    providedFeedback === 'ACCEPT_TENTATIVE'
   ) {
     return (
       <>
-        <div className="pl-4 bg-red-100">
-          <b>
-            This proposal is tentatively matched with a student. Please accept
-            or reject the proposal.
-          </b>
-        </div>
+        <UserNotification type="info" className={{ root: 'rounded-none' }}>
+          This proposal is tentatively matched with a student. Please accept or
+          reject the proposal.
+        </UserNotification>
         <div className="">
           <Tabs defaultValue="accept">
             <Tabs.TabList className={{ root: 'md:flex-row border' }}>
@@ -44,6 +47,7 @@ export default function ProposalStatusForm({
                 proposalName={proposalDetails?.title}
                 proposalId={proposalDetails?.id}
                 supervisorEmail={session?.user?.email as string}
+                setProvidedFeedback={setProvidedFeedback}
               />
             </Tabs.TabContent>
             <Tabs.TabContent
@@ -58,6 +62,7 @@ export default function ProposalStatusForm({
                 proposalName={proposalDetails?.title}
                 proposalId={proposalDetails?.id}
                 supervisorEmail={session?.user?.email as string}
+                setProvidedFeedback={setProvidedFeedback}
               />
             </Tabs.TabContent>
           </Tabs>
@@ -67,11 +72,13 @@ export default function ProposalStatusForm({
   } else if (
     (proposalDetails?.typeKey === 'STUDENT' &&
       proposalDetails?.statusKey === 'MATCHED') ||
-    proposalDetails?.receivedFeedbacks?.length > 0
+    proposalDetails?.receivedFeedbacks?.length > 0 ||
+    providedFeedback
   ) {
     return (
       <div className="p-4 bg-yellow-100">
-        {proposalDetails?.applications?.[0].statusKey === 'ACCEPTED'
+        {providedFeedback === 'ACCEPT' ||
+        proposalDetails?.applications?.[0].statusKey === 'ACCEPTED'
           ? 'You have already accepted this proposal!'
           : 'You have already provided feedback to this proposal!'}
       </div>
@@ -102,6 +109,7 @@ export default function ProposalStatusForm({
               proposalName={proposalDetails?.title}
               proposalId={proposalDetails?.id}
               supervisorEmail={session?.user?.email as string}
+              setProvidedFeedback={setProvidedFeedback}
             />
           </Tabs.TabContent>
           <Tabs.TabContent
@@ -116,6 +124,7 @@ export default function ProposalStatusForm({
               proposalName={proposalDetails?.title}
               proposalId={proposalDetails?.id}
               supervisorEmail={session?.user?.email as string}
+              setProvidedFeedback={setProvidedFeedback}
             />
           </Tabs.TabContent>
           <Tabs.TabContent
@@ -130,6 +139,7 @@ export default function ProposalStatusForm({
               proposalName={proposalDetails?.title}
               proposalId={proposalDetails?.id}
               supervisorEmail={session?.user?.email as string}
+              setProvidedFeedback={setProvidedFeedback}
             />
           </Tabs.TabContent>
           <Tabs.TabContent
@@ -144,12 +154,11 @@ export default function ProposalStatusForm({
               proposalName={proposalDetails?.title}
               proposalId={proposalDetails?.id}
               supervisorEmail={session?.user?.email as string}
+              setProvidedFeedback={setProvidedFeedback}
             />
           </Tabs.TabContent>
         </Tabs>
       </div>
     )
-  } else {
-    return null
   }
 }
diff --git a/src/components/RejectProposalForm.tsx b/src/components/RejectProposalForm.tsx
index 5a9100f..0065a87 100644
--- a/src/components/RejectProposalForm.tsx
+++ b/src/components/RejectProposalForm.tsx
@@ -13,12 +13,14 @@ interface RejectProposalFormProps {
   proposalName: string
   proposalId: string
   supervisorEmail: string
+  setProvidedFeedback: (value: string) => void
 }
 
 export default function RejectProposalForm({
   proposalName,
   proposalId,
   supervisorEmail,
+  setProvidedFeedback,
 }: RejectProposalFormProps) {
   const SignupSchema = Yup.object().shape({
     reason: Yup.string().required('Required'),
@@ -31,7 +33,7 @@ export default function RejectProposalForm({
     <Formik
       initialValues={{
         proposalName: proposalName,
-        reason: '',
+        reason: undefined,
         comment: '',
         proposalId: proposalId,
         supervisorEmail: supervisorEmail,
@@ -39,9 +41,9 @@ export default function RejectProposalForm({
       }}
       validationSchema={SignupSchema}
       onSubmit={async (values, { resetForm }) => {
-        await submitFeedback.mutateAsync(values)
-
         resetForm()
+        setProvidedFeedback('REJECT')
+        await submitFeedback.mutateAsync(values)
         toast.success('Proposal rejected successfully!')
       }}
     >
@@ -51,7 +53,7 @@ export default function RejectProposalForm({
           requirements will cause review by the thesis coordinator. The student
           will need to improve and resubmit the proposal.
         </div>
-        <div className="grid mt-4 place-items-lef">
+        <div className="flex flex-col gap-3 mt-4">
           <FormikTextField
             disabled={true}
             name="proposalName"
@@ -84,7 +86,7 @@ export default function RejectProposalForm({
               },
             ]}
             label="Reason"
-            placeholder="Select a name"
+            placeholder="Select a reason..."
             className={{
               label: 'font-sans text-lg',
               root: 'flex-col',
@@ -99,7 +101,7 @@ export default function RejectProposalForm({
               field: 'flex-col',
             }}
           />
-          <div className="mt-2 italic">
+          <div className="italic">
             Why do you recommend this proposal for rejection? Your comment will
             not be shown to the student.
           </div>
diff --git a/src/components/TentativeAcceptProposalForm.tsx b/src/components/TentativeAcceptProposalForm.tsx
index 100b248..2b45601 100644
--- a/src/components/TentativeAcceptProposalForm.tsx
+++ b/src/components/TentativeAcceptProposalForm.tsx
@@ -12,12 +12,14 @@ interface TentativeAcceptProposalFormProps {
   proposalName: string
   proposalId: string
   supervisorEmail: string
+  setProvidedFeedback: (value: string) => void
 }
 
 export default function TentativeAcceptProposalForm({
   proposalName,
   proposalId,
   supervisorEmail,
+  setProvidedFeedback,
 }: TentativeAcceptProposalFormProps) {
   const SignupSchema = Yup.object().shape({
     comment: Yup.string().required('Required'),
@@ -36,9 +38,9 @@ export default function TentativeAcceptProposalForm({
       }}
       validationSchema={SignupSchema}
       onSubmit={async (values, { resetForm }) => {
-        await submitFeedback.mutateAsync(values)
-
         resetForm()
+        setProvidedFeedback('ACCEPT_TENTATIVE')
+        await submitFeedback.mutateAsync(values)
         toast.success('Proposal tentatively accepted successfully!')
       }}
     >
@@ -48,7 +50,7 @@ export default function TentativeAcceptProposalForm({
           your feedback and is required to improve the proposal before you
           finally accept the proposal for supervision.
         </div>
-        <div className="grid mt-4 place-items-lef">
+        <div className="flex flex-col gap-3 mt-4">
           <FormikTextField
             disabled={true}
             name="proposalName"
@@ -67,7 +69,7 @@ export default function TentativeAcceptProposalForm({
               field: 'flex-col',
             }}
           />
-          <div className="mt-2 italic">
+          <div className="italic">
             Your message will be sent to the student alongside your notification
             of interest.
           </div>