diff --git a/src/pages/FeedbackPage.jsx b/src/pages/FeedbackPage.jsx
index a296376..5da508a 100644
--- a/src/pages/FeedbackPage.jsx
+++ b/src/pages/FeedbackPage.jsx
@@ -9,7 +9,6 @@ function FeedbackPage() {
   const selectedAnswers = location.state?.selectedAnswers || {};
   const currentIndex = location.state?.currentIndex ?? 0;
 
-  // NEW: backend result support
   const score = location.state?.score ?? 0;
   const total = location.state?.total ?? questions.length;
   const correctAnswers = location.state?.correctAnswers ?? score;
@@ -30,7 +29,7 @@ function FeedbackPage() {
 
   const question = questions[currentIndex];
   const userAnswer = selectedAnswers[currentIndex];
-  const correctAnswer = question.correctAnswer;
+  const correctAnswer = question.answer;
   const isCorrect = userAnswer === correctAnswer;
 
   return (
@@ -57,7 +56,7 @@ function FeedbackPage() {
           <div className="progress-track">
             <div
               className="progress-fill"
-              style={{ width: `${(score / total) * 100}%` }}
+              style={{ width: `${total ? (score / total) * 100 : 0}%` }}
             ></div>
           </div>
 
@@ -69,9 +68,7 @@ function FeedbackPage() {
 
         <main className="feedback-main">
           <section className="feedback-header">
-            <h1>
-              {isCorrect ? "Great job!" : "Keep going!"}
-            </h1>
+            <h1>{isCorrect ? "Great job!" : "Keep going!"}</h1>
             <p>
               {isCorrect
                 ? "You're on the right track."
@@ -84,18 +81,19 @@ function FeedbackPage() {
             <h2>{question.question}</h2>
 
             <div className="feedback-options-grid">
-              {question.options.map((option, index) => {
+              {Object.entries(question.options).map(([key, value]) => {
                 let boxClass = "feedback-option-box";
 
-                if (option === correctAnswer) boxClass += " correct-box";
-                if (userAnswer === option && option !== correctAnswer)
+                if (key === correctAnswer) boxClass += " correct-box";
+                if (userAnswer === key && key !== correctAnswer) {
                   boxClass += " wrong-box";
+                }
 
                 return (
-                  <div key={index} className={boxClass}>
-                    {option}
-                    {option === correctAnswer && <span>Correct Answer</span>}
-                    {userAnswer === option && option !== correctAnswer && (
+                  <div key={key} className={boxClass}>
+                    <strong>{key}:</strong> {value}
+                    {key === correctAnswer && <span>Correct Answer</span>}
+                    {userAnswer === key && key !== correctAnswer && (
                       <span>Your Selection</span>
                     )}
                   </div>
@@ -107,27 +105,20 @@ function FeedbackPage() {
           <section className="themed-card explanation-card">
             <div className="explanation-top">
               <h3>AI Explanation</h3>
-              <div className="tag-pill small-pill">
-                LUCID MENTOR ANALYSIS
-              </div>
+              <div className="tag-pill small-pill">LUCID MENTOR ANALYSIS</div>
             </div>
 
             <p>
               {isCorrect
                 ? "Great job. Your answer matches the expected reasoning."
-                : "Think of this like searching in a sorted structure. Efficient algorithms eliminate large portions quickly, which is why ordering matters."}
+                : "Think of this like searching through a well-organized structure. The correct answer follows the underlying concept tested in the question, so focus on the principle rather than guessing from similar-looking choices."}
             </p>
 
             <div className="explanation-actions">
-              <button
-                className="primary-btn"
-                onClick={() => navigate("/dashboard")}
-              >
+              <button className="primary-btn" onClick={() => navigate("/dashboard")}>
                 Go to Dashboard →
               </button>
-              <button className="secondary-btn">
-                Ask AI More
-              </button>
+              <button className="secondary-btn">Ask AI More</button>
             </div>
           </section>
 
@@ -135,15 +126,16 @@ function FeedbackPage() {
             <div className="tip-card themed-card">
               <strong>Pro Tip</strong>
               <p>
-                Efficient searching depends on structure. Ordered data allows
-                faster algorithms.
+                Efficient problem solving depends on understanding the structure
+                behind the question, not just memorizing the answer.
               </p>
             </div>
 
             <div className="tip-card themed-card">
               <strong>Confused?</strong>
               <p>
-                Use visual explanations to better understand how the algorithm works.
+                Review the correct option carefully and compare it with your
+                selection to understand the difference.
               </p>
             </div>
           </div>
diff --git a/src/pages/QuizPage.jsx b/src/pages/QuizPage.jsx
index 3c19346..7fcbbb7 100644
--- a/src/pages/QuizPage.jsx
+++ b/src/pages/QuizPage.jsx
@@ -6,7 +6,7 @@ function QuizPage() {
   const navigate = useNavigate();
 
   const questions = location.state?.questions || [];
-  const topic = location.state?.topic || "Data Structures & Algorithms";
+  const topic = location.state?.topic || "Quiz";
   const quizId = location.state?.quizId || null;
 
   const [currentIndex, setCurrentIndex] = useState(0);
@@ -31,10 +31,10 @@ function QuizPage() {
   const currentQuestion = questions[currentIndex];
   const progress = ((currentIndex + 1) / questions.length) * 100;
 
-  const handleSelect = (option) => {
+  const handleSelect = (optionKey) => {
     setSelectedAnswers((prev) => ({
       ...prev,
-      [currentIndex]: option,
+      [currentIndex]: optionKey,
     }));
   };
 
@@ -121,15 +121,14 @@ function QuizPage() {
           <h1>{topic}</h1>
 
           <div className="quiz-progress-row">
-            <span>Question {currentIndex + 1} of {questions.length}</span>
+            <span>
+              Question {currentIndex + 1} of {questions.length}
+            </span>
             <span>{Math.round(progress)}% Completed</span>
           </div>
 
           <div className="progress-track">
-            <div
-              className="progress-fill"
-              style={{ width: `${progress}%` }}
-            ></div>
+            <div className="progress-fill" style={{ width: `${progress}%` }}></div>
           </div>
         </section>
 
@@ -145,21 +144,19 @@ function QuizPage() {
           </div>
 
           <div className="answers-panel">
-            {currentQuestion.options.map((option, index) => (
+            {Object.entries(currentQuestion.options).map(([key, value]) => (
               <button
-                key={index}
+                key={key}
                 type="button"
                 className={
-                  selectedAnswers[currentIndex] === option
+                  selectedAnswers[currentIndex] === key
                     ? "answer-option selected-answer"
                     : "answer-option"
                 }
-                onClick={() => handleSelect(option)}
+                onClick={() => handleSelect(key)}
               >
-                <span className="option-letter">
-                  {String.fromCharCode(65 + index)}
-                </span>
-                {option}
+                <span className="option-letter">{key}</span>
+                {value}
               </button>
             ))}
 
@@ -176,15 +173,12 @@ function QuizPage() {
               </button>
 
               {currentIndex < questions.length - 1 ? (
-                <button
-                  type="button"
-                  className="primary-btn"
-                  onClick={handleNext}
-                >
+                <button type="button" className="primary-btn" onClick={handleNext}>
                   Next
                 </button>
               ) : (
                 <button
+                  type="button"
                   className="primary-btn submit-btn"
                   onClick={handleSubmit}
                   disabled={loading}
@@ -193,23 +187,6 @@ function QuizPage() {
                 </button>
               )}
             </div>
-
-            <button
-              className="text-btn"
-              onClick={() =>
-                navigate("/feedback", {
-                  state: {
-                    topic,
-                    questions,
-                    selectedAnswers,
-                    score: 0,
-                    currentIndex,
-                  },
-                })
-              }
-            >
-              Skip this question
-            </button>
           </div>
         </section>
       </main>