diff --git a/src/App.tsx b/src/App.tsx
index fe84b86..2308d8d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -75,7 +75,7 @@ function App() {
         <div className="app-nav__center"> We highlight what matters</div>
         <div className="app-nav__actions">
           {isSignedIn ? (
-            <Link to="/feedback">Past feedback</Link>
+            <Link to="/feedback">Feedback</Link>
           ) : (
             <Link to="/create-user">Join Us</Link>
           )}
diff --git a/src/components/FeedbackGallery.tsx b/src/components/FeedbackGallery.tsx
index 3799057..8fd694c 100644
--- a/src/components/FeedbackGallery.tsx
+++ b/src/components/FeedbackGallery.tsx
@@ -54,41 +54,26 @@ export default function Feedback() {
   return (
     <>
       {message && <p>{message}</p>}
-      <Accordion type="single" className="w-full" collapsible>
-        {allFeedback.map((item, index) => (
-          <AccordionItem value={`feedback-${index}`}>
-            <AccordionTrigger>{item.job_name}</AccordionTrigger>
-            <AccordionContent>
-              <ResultCard
-                jobDescription={item.job_description}
-                feedback={item.gen_feedback}
-              />
-            </AccordionContent>
-          </AccordionItem>
-        ))}
-      </Accordion>
-
-      {/* {allFeedback.length > 0 && (
-        <ul>
+      {allFeedback.length > 0 ? (
+        <Accordion type="single" className="w-full" collapsible>
           {allFeedback.map((item, index) => (
-            <li key={index}>{item.job_name}
-              <ResultCard
-                jobDescription={item.job_description}
-                feedback={item.gen_feedback}
-              />
-            </li>
-          ))}
-
-          <Accordion type="single" collapsible>
-            <AccordionItem value="item-1">
-              <AccordionTrigger>Is it accessible?</AccordionTrigger>
+            <AccordionItem
+              key={`feedback-${index}`}
+              value={`feedback-${index}`}
+            >
+              <AccordionTrigger>{item.job_name}</AccordionTrigger>
               <AccordionContent>
-                Yes. It adheres to the WAI-ARIA design pattern.
+                <ResultCard
+                  jobDescription={item.job_description}
+                  feedback={item.gen_feedback}
+                />
               </AccordionContent>
             </AccordionItem>
-          </Accordion>
-        </ul>
-      )} */}
+          ))}
+        </Accordion>
+      ) : (
+        <p>You don't have any saved feedback yet...</p>
+      )}
     </>
   );
 }