Update app.py

app.py

@@ -419,14 +419,7 @@ init_session_state()
 
 def extract_and_fix_json(text, subject="General"):
     """
-    Extract JSON from text and fix common issues - UPDATED BASED ON ACTUAL AI RESPONSES
-    
-    Args:
-        text (str): Raw text containing JSON
-        subject (str): Subject name for fallback
-    
-    Returns:
-        dict: Parsed JSON or generic plan
+    Extract JSON from text and fix common issues
     """
     if not text or not isinstance(text, str):
         if st.session_state.show_debug:
@@ -436,18 +429,32 @@ def extract_and_fix_json(text, subject="General"):
     # Store raw response for debug
     st.session_state.raw_response = text
     
-    # Clean the text
+    # Clean the text - more aggressive cleaning
     text = text.strip()
     
-    # Remove markdown code blocks (case insensitive)
-    text = re.sub(r'```json\s*', '', text, flags=re.IGNORECASE)
-    text = re.sub(r'```\s*', '', text, flags=re.IGNORECASE)
-    text = re.sub(r'```javascript\s*', '', text, flags=re.IGNORECASE)
-    text = re.sub(r'```python\s*', '', text, flags=re.IGNORECASE)
+    # Check if response indicates safety blocking
+    if "safety" in text.lower() or "blocked" in text.lower() or "not allowed" in text.lower():
+        if st.session_state.show_debug:
+            st.error("❌ Response indicates safety blocking")
+        return None
+    
+    # Remove ALL markdown code blocks and any surrounding text
+    text = re.sub(r'.*?```(?:json)?\s*', '', text, flags=re.IGNORECASE | re.DOTALL)
+    text = re.sub(r'```.*', '', text, flags=re.IGNORECASE | re.DOTALL)
+    
+    # Remove any non-JSON text before first {
+    first_brace = text.find('{')
+    if first_brace > 0:
+        text = text[first_brace:]
+    
+    # Remove any non-JSON text after last }
+    last_brace = text.rfind('}')
+    if last_brace != -1:
+        text = text[:last_brace+1]
     
     # Show cleaned text in debug
     if st.session_state.show_debug:
-        with st.expander("🧹 Cleaned Text (first 500 chars)", expanded=False):
+        with st.expander("🧹 Cleaned Text", expanded=False):
             st.code(text[:500] + "..." if len(text) > 500 else text)
     
     # Find JSON boundaries
@@ -457,6 +464,7 @@ def extract_and_fix_json(text, subject="General"):
     if start_idx == -1 or end_idx == -1 or end_idx <= start_idx:
         if st.session_state.show_debug:
             st.error(f"❌ No JSON found. Start: {start_idx}, End: {end_idx}")
+            st.info(f"Text preview: {text[:200]}...")
         return None
     
     json_str = text[start_idx:end_idx+1]
@@ -464,7 +472,7 @@ def extract_and_fix_json(text, subject="General"):
     # Show JSON string in debug
     if st.session_state.show_debug:
         with st.expander("🔍 JSON String Being Parsed", expanded=False):
-            st.code(json_str[:1000] + "..." if len(json_str) > 1000 else json_str)
+            st.code(json_str[:800] + "..." if len(json_str) > 800 else json_str)
     
     try:
         # First try: Direct parse
@@ -662,7 +670,7 @@ def create_generic_plan(subject, days_available):
 
 def generate_study_plan(api_key, **kwargs):
     """
-    Generate study plan using Gemini
+    Generate study plan using Gemini with safety handling
     """
     if not api_key:
         st.error("❌ No API key provided")
@@ -674,17 +682,19 @@ def generate_study_plan(api_key, **kwargs):
     days_available = kwargs.get('days_available', 60)
     hours_per_day = kwargs.get('hours_per_day', 2)
     current_level = kwargs.get('current_level', 'Beginner')
+    intensity = kwargs.get('intensity', 'Moderate')
     study_days = kwargs.get('study_days', ["Mon", "Tue", "Wed", "Thu", "Fri"])
     
     weeks = max(1, days_available // 7)
     
-    # SIMPLIFIED PROMPT - based on what works
-    prompt = f"""Create a detailed {weeks}-week study plan for: {subject}
+    # IMPROVED PROMPT with safety considerations
+    prompt = f"""Create a detailed {weeks}-week study plan for learning: {subject}
 
 Study schedule: {hours_per_day} hours/day, {len(study_days)} days/week ({', '.join(study_days)})
 Current level: {current_level}
+Intensity: {intensity}
 
-Return valid JSON with this exact structure:
+Return ONLY valid JSON with this exact structure:
 
 {{
   "subject": "{subject}",
@@ -698,54 +708,73 @@ Return valid JSON with this exact structure:
       "focus": "Week focus title",
       "objectives": ["Objective 1", "Objective 2"],
       "daily_tasks": [
-        ["Task 1 Monday", "Task 2 Monday"],
-        ["Task 1 Tuesday", "Task 2 Tuesday"],
-        ["Task 1 Wednesday", "Task 2 Wednesday"],
-        ["Task 1 Thursday", "Task 2 Thursday"],
-        ["Task 1 Friday", "Task 2 Friday"]
+        ["Task 1 for Monday", "Task 2 for Monday"],
+        ["Task 1 for Tuesday", "Task 2 for Tuesday"],
+        ["Task 1 for Wednesday", "Task 2 for Wednesday"],
+        ["Task 1 for Thursday", "Task 2 for Thursday"],
+        ["Task 1 for Friday", "Task 2 for Friday"]
       ],
-      "day_focus": ["Monday: Intro", "Tuesday: Practice", "Wednesday: Deep Dive", "Thursday: Review", "Friday: Project"],
-      "week_summary": "Week summary",
+      "day_focus": ["Monday: Introduction", "Tuesday: Practice", "Wednesday: Deep Dive", "Thursday: Review", "Friday: Project"],
+      "week_summary": "Brief summary of week's learning objectives",
       "resources": ["Resource 1", "Resource 2"],
-      "milestone": "Weekly milestone"
+      "milestone": "What to achieve by week's end"
     }}
   ],
   "study_tips": ["Tip 1", "Tip 2"],
   "success_metrics": ["Metric 1", "Metric 2"]
 }}
 
-IMPORTANT: 
-1. Make sure topics_allocation values are NUMBERS (not strings like "10 hours")
-2. Include ALL {weeks} weeks in the weekly_schedule array
-3. Return ONLY JSON, no additional text
-4. Make tasks specific and actionable for {subject}"""
+IMPORTANT RULES:
+1. Return ONLY JSON, no additional text
+2. topics_allocation values must be NUMBERS (e.g., 10, not "10 hours")
+3. Include ALL {weeks} weeks in weekly_schedule array
+4. Make tasks specific, practical, and educational
+5. Keep content appropriate for all ages
+6. Focus on learning and skill development
+7. Ensure JSON is valid and complete"""
 
     try:
-        # Configure API
+        # Configure API with safety settings
         genai.configure(api_key=api_key)
         model = genai.GenerativeModel('gemini-2.5-flash')
         
         # Show prompt in debug mode
         if st.session_state.show_debug:
             with st.expander("📝 Prompt Sent to AI", expanded=False):
-                st.code(prompt[:1000] + "..." if len(prompt) > 1000 else prompt)
+                st.code(prompt[:800] + "..." if len(prompt) > 800 else prompt)
         
-        # Generate response
+        # Generate response with safety settings
         response = model.generate_content(
             prompt,
             generation_config=genai.GenerationConfig(
-                max_output_tokens=4000,
-                temperature=0.7
-            )
+                max_output_tokens=3000,  # Reduced for safety
+                temperature=0.7,
+                top_p=0.95,
+                top_k=40
+            ),
+            safety_settings=[
+                {"category": "HARM_CATEGORY_HARASSMENT", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
+                {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
+                {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
+                {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "BLOCK_MEDIUM_AND_ABOVE"}
+            ]
         )
         
-        raw_text = response.text
+        # SAFE way to get response text
+        if response and hasattr(response, 'text'):
+            raw_text = response.text
+        else:
+            raw_text = ""
+            
         st.session_state.raw_response = raw_text
         
         # Show raw response in debug mode
         if st.session_state.show_debug:
             with st.expander("🔍 Raw AI Response", expanded=False):
-                st.text_area("AI Response", raw_text, height=200, key="ai_response_raw")
+                if raw_text:
+                    st.text_area("AI Response", raw_text, height=200, key="ai_response_raw_gen")
+                else:
+                    st.warning("No response text received")
         
         # Extract JSON
         plan = extract_and_fix_json(raw_text, subject)
@@ -766,6 +795,7 @@ IMPORTANT:
             plan['generated_at'] = datetime.now().isoformat()
             plan['total_days'] = days_available
             plan['user_level'] = current_level
+            plan['intensity'] = intensity
             
             # Initialize week tracking
             for week in plan.get('weekly_schedule', []):
@@ -783,16 +813,26 @@ IMPORTANT:
             
             return plan
         else:
-            st.warning("⚠️ Could not extract valid JSON from AI response")
             if st.session_state.show_debug:
-                st.info("Falling back to generic plan")
+                st.warning("⚠️ Could not extract valid JSON from AI response")
+                if not raw_text:
+                    st.error("❌ Empty response from AI")
+                else:
+                    st.info("Falling back to generic plan")
             return create_generic_plan(subject, days_available)
     
     except Exception as e:
-        st.error(f"❌ AI Generation Error: {str(e)}")
+        error_msg = str(e)
+        st.error(f"❌ AI Generation Error: {error_msg}")
+        
+        # Handle safety errors
+        if "safety" in error_msg.lower() or "finish_reason" in error_msg.lower():
+            st.warning("🔒 **Safety restriction triggered.** Try a different subject or simpler request.")
+        
         if st.session_state.show_debug:
             with st.expander("🔍 Error Details", expanded=False):
                 st.exception(e)
+        
         return create_generic_plan(subject, days_available)
 
 def generate_weekly_test(api_key, week_number, weekly_tasks, subject):
@@ -1188,7 +1228,7 @@ tab1, tab2, tab3, tab4, tab5, tab6 = st.tabs([
 
 
 # ============================================
-# TAB 1: DEFINE GOAL
+# TAB 1: DEFINE GOAL - WITH DROPDOWN OPTIONS
 # ============================================
 
 with tab1:
@@ -1206,26 +1246,38 @@ with tab1:
         else:
             st.success("✅ **API Key Loaded**")
     
-    # Test API Button
+    # Test API Button with SAFETY FIX
     if st.session_state.api_key and st.session_state.show_debug:
-        if st.button("Test API Connection", type="secondary", key="test_api"):
+        if st.button("Test API Connection", type="secondary", key="test_api_tab1"):
             try:
                 genai.configure(api_key=st.session_state.api_key)
                 model = genai.GenerativeModel('gemini-2.5-flash')
-                test_response = model.generate_content("Say 'API is working'", 
-                    generation_config=genai.GenerationConfig(max_output_tokens=10))
-                if test_response.text:
+                
+                # Use a safer, more neutral prompt
+                test_response = model.generate_content(
+                    "Please respond with just the word 'Connected'",
+                    generation_config=genai.GenerationConfig(
+                        max_output_tokens=10,
+                        temperature=0.1
+                    )
+                )
+                
+                # Safely get response text
+                if test_response and hasattr(test_response, 'text') and test_response.text:
                     st.success(f"✅ **API Connected:** {test_response.text}")
                 else:
-                    st.error("❌ No response from API")
+                    st.error("❌ No valid response from API")
+                    
             except Exception as e:
                 st.error(f"❌ **API Error:** {str(e)}")
+                if "safety" in str(e).lower():
+                    st.info("🔒 **Safety restriction detected.** Try a different subject or rephrase your request.")
     
     st.markdown("---")
     
     # Option 1: Upload Existing Plan
     st.info("📤 **Option 1: Upload Existing Plan**")
-    uploaded_file = st.file_uploader("Upload saved study plan (JSON)", type=['json'], key="upload_plan")
+    uploaded_file = st.file_uploader("Upload saved study plan (JSON)", type=['json'], key="upload_plan_tab1")
     
     if uploaded_file is not None and not st.session_state.plan_loaded:
         try:
@@ -1239,19 +1291,46 @@ with tab1:
     
     st.markdown("---")
     
-    # Option 2: Create New Plan - SIMPLIFIED
+    # Option 2: Create New Plan - WITH DROPDOWN + CUSTOM
     st.info("🎯 **Option 2: Create New Plan**")
     
     col1, col2 = st.columns([2, 1])
     
     with col1:
-        subject = st.text_input(
-            "What do you want to learn?",
-            placeholder="e.g., Data Science, Python, Web Development...",
-            help="Enter the subject or topic",
-            key="subject_input"
+        # Subject selection: Dropdown OR Custom input
+        subject_options = [
+            "Select a subject or enter custom...",
+            "Data Science & Machine Learning",
+            "Python Programming",
+            "Web Development (Full Stack)",
+            "Artificial Intelligence",
+            "Cloud Computing (AWS/Azure/GCP)",
+            "Cybersecurity",
+            "Mobile App Development",
+            "Digital Marketing",
+            "Business Analytics",
+            "Language Learning (Spanish/French/English)",
+            "Project Management",
+            "Graphic Design",
+            "Game Development"
+        ]
+        
+        selected_option = st.selectbox(
+            "Choose a subject or enter custom:",
+            options=subject_options,
+            index=0,
+            key="subject_select_tab1"
         )
         
+        if selected_option == "Select a subject or enter custom...":
+            subject = st.text_input(
+                "Or enter your own subject:",
+                placeholder="e.g., Quantum Computing, Ethical Hacking, Music Production...",
+                key="custom_subject_tab1"
+            )
+        else:
+            subject = selected_option
+        
         col1a, col2a = st.columns(2)
         with col1a:
             hours_per_day = st.slider(
@@ -1259,7 +1338,7 @@ with tab1:
                 min_value=1,
                 max_value=8,
                 value=2,
-                key="hours_slider"
+                key="hours_slider_tab1"
             )
         
         with col2a:
@@ -1268,14 +1347,14 @@ with tab1:
                 min_value=7,
                 max_value=365,
                 value=60,
-                key="days_slider"
+                key="days_slider_tab1"
             )
         
         study_days = st.multiselect(
             "Study days:",
             ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
             default=["Mon", "Tue", "Wed", "Thu", "Fri"],
-            key="study_days_select"
+            key="study_days_select_tab1"
         )
         
     with col2:
@@ -1283,17 +1362,25 @@ with tab1:
             "Your level:",
             ["Beginner", "Intermediate", "Advanced"],
             index=0,
-            key="level_select"
+            key="level_select_tab1"
+        )
+        
+        # Add study intensity
+        intensity = st.select_slider(
+            "Study intensity:",
+            options=["Casual", "Moderate", "Intensive"],
+            value="Moderate",
+            key="intensity_slider_tab1"
         )
     
     st.markdown("---")
     
     # Generate Plan Button
-    if st.button("🚀 Generate AI Study Plan", type="primary", use_container_width=True, key="generate_plan_btn"):
+    if st.button("🚀 Generate AI Study Plan", type="primary", use_container_width=True, key="generate_plan_btn_tab1"):
         if not st.session_state.api_key:
             st.error("⚠️ **API Key Required:** Please set GEMINI_API_KEY in Hugging Face Secrets.")
-        elif not subject:
-            st.error("⚠️ Please enter a subject/topic")
+        elif not subject or subject == "Select a subject or enter custom...":
+            st.error("⚠️ Please enter or select a subject")
         elif not study_days:
             st.error("⚠️ Please select at least one study day")
         else:
@@ -1306,12 +1393,13 @@ with tab1:
                         len(study_days)
                     )
                     
-                    # Create plan data
+                    # Create plan data with intensity
                     plan_data = {
                         'subject': subject,
                         'days_available': days_available,
                         'hours_per_day': hours_per_day,
                         'current_level': current_level,
+                        'intensity': intensity,
                         'study_days': study_days
                     }
                     
@@ -1371,7 +1459,7 @@ with tab1:
                 st.metric("Plan Type", plan_type)
         
         with st.expander("📋 Raw AI Response", expanded=False):
-            st.text_area("Full Response", st.session_state.raw_response, height=300, key="raw_response_display")
+            st.text_area("Full Response", st.session_state.raw_response, height=300, key="raw_response_display_tab1")
         
         if st.session_state.study_plan:
             with st.expander("📊 Parsed Plan Structure", expanded=False):
@@ -2157,7 +2245,7 @@ with tab4:
         st.info("👈 **Generate a study plan first to see analytics!**")
 
 # ============================================
-# TAB 5: TESTS (Updated with proper JSON extraction)
+# TAB 5: TESTS - FIXED DUPLICATE BUTTON ERROR
 # ============================================
 
 with tab5:
@@ -2188,44 +2276,54 @@ with tab5:
                                         completed_week_tasks += 1
                     
                     completion_percentage = (completed_week_tasks / week_tasks * 100) if week_tasks > 0 else 0
-                    test_available = completion_percentage >= 50  # Lower threshold for testing
-                    
-                    col1, col2, col3 = st.columns([3, 1, 1])
-                    
-                    with col1:
-                        st.markdown(f"### Week {week_num}: {week.get('focus', '')}")
-                        st.caption(f"Completion: {completion_percentage:.0f}%")
+                    test_available = completion_percentage >= 50
                     
-                    with col2:
-                        test_key = f"week_{week_num}_test"
-                        test_taken = test_key in st.session_state.test_results
+                    with st.container():
+                        col1, col2, col3 = st.columns([3, 1, 1])
                         
-                        if test_taken:
-                            score = st.session_state.test_results[test_key]['percentage']
-                            st.metric("Score", f"{score:.0f}%")
-                    
-                    with col3:
-                        if test_available:
-                            if st.button(f"📝 Start Test", key=f"test_week{week_num}", use_container_width=True):
-                                with st.spinner(f"Generating test..."):
-                                    test_data = generate_weekly_test(
-                                        st.session_state.api_key, 
-                                        week_num, 
-                                        week.get('daily_tasks', []), 
-                                        subject
-                                    )
-                                    
-                                    if test_data and 'questions' in test_data:
-                                        st.session_state.current_test = week_num
-                                        st.session_state.test_questions = test_data['questions']
-                                        st.session_state.test_completed = False
-                                        st.session_state.user_test_answers = {}
-                                        st.rerun()
-                                    else:
-                                        st.error("Failed to generate test")
-                        else:
-                            st.button(f"🔒", disabled=True, use_container_width=True)
-                            st.caption(f"Complete 50%")
+                        with col1:
+                            st.markdown(f"**Week {week_num}:** {week.get('focus', '')[:50]}...")
+                            st.caption(f"Completion: {completion_percentage:.0f}% • Tasks: {completed_week_tasks}/{week_tasks}")
+                        
+                        with col2:
+                            test_key = f"week_{week_num}_test"
+                            test_taken = test_key in st.session_state.test_results
+                            
+                            if test_taken:
+                                score = st.session_state.test_results[test_key]['percentage']
+                                st.metric("", f"{score:.0f}%", label_visibility="collapsed")
+                        
+                        with col3:
+                            if test_available:
+                                if st.button(f"📝 Start Test", 
+                                           key=f"start_test_week_{week_num}_{subject.replace(' ', '_')}",
+                                           use_container_width=True):
+                                    with st.spinner(f"Generating test for Week {week_num}..."):
+                                        test_data = generate_weekly_test(
+                                            st.session_state.api_key, 
+                                            week_num, 
+                                            week.get('daily_tasks', []), 
+                                            subject
+                                        )
+                                        
+                                        if test_data and 'questions' in test_data:
+                                            st.session_state.current_test = week_num
+                                            st.session_state.test_questions = test_data['questions']
+                                            st.session_state.test_completed = False
+                                            st.session_state.user_test_answers = {}
+                                            st.rerun()
+                                        else:
+                                            st.error("Failed to generate test. Try again.")
+                            else:
+                                # FIXED: Added unique key and disabled properly
+                                st.button(f"🔒 Locked", 
+                                         key=f"locked_test_week_{week_num}_{subject.replace(' ', '_')}", 
+                                         disabled=True, 
+                                         use_container_width=True)
+                                if completion_percentage < 50:
+                                    st.caption(f"Complete 50% to unlock")
+                        
+                        st.markdown("---")
         
         # Test Taking View
         elif st.session_state.current_test and not st.session_state.test_completed:
@@ -2233,27 +2331,58 @@ with tab5:
             test_questions = st.session_state.test_questions
             
             st.markdown(f"### 📝 Week {week_num} Test")
+            st.info(f"Answer all {len(test_questions)} questions. Click on your chosen answer.")
             
             for i, question in enumerate(test_questions):
-                st.markdown(f"**Q{i+1}: {question['question']}**")
-                
-                current_answer = st.session_state.user_test_answers.get(str(i), "")
-                
-                cols = st.columns(2)
-                for opt_idx, option in enumerate(['A', 'B', 'C', 'D']):
-                    col = cols[opt_idx % 2]
-                    with col:
-                        if st.button(
-                            f"{option}. {question['options'][option]}",
-                            key=f"q{i}_opt{option}",
-                            use_container_width=True
-                        ):
-                            st.session_state.user_test_answers[str(i)] = option
-                            st.rerun()
+                with st.container():
+                    st.markdown(f"**Q{i+1}. {question['question']}**")
+                    
+                    current_answer = st.session_state.user_test_answers.get(str(i), "")
+                    
+                    # Create 2 columns for options
+                    col_a, col_b = st.columns(2)
+                    
+                    with col_a:
+                        # Option A and B
+                        for option in ['A', 'B']:
+                            option_text = question['options'][option]
+                            is_selected = (current_answer == option)
+                            
+                            if st.button(
+                                f"{option}. {option_text[:80]}..." if len(option_text) > 80 else f"{option}. {option_text}",
+                                key=f"test_q{week_num}_{i}_opt{option}",
+                                use_container_width=True,
+                                type="primary" if is_selected else "secondary"
+                            ):
+                                st.session_state.user_test_answers[str(i)] = option
+                                st.rerun()
+                    
+                    with col_b:
+                        # Option C and D
+                        for option in ['C', 'D']:
+                            option_text = question['options'][option]
+                            is_selected = (current_answer == option)
+                            
+                            if st.button(
+                                f"{option}. {option_text[:80]}..." if len(option_text) > 80 else f"{option}. {option_text}",
+                                key=f"test_q{week_num}_{i}_opt{option}",
+                                use_container_width=True,
+                                type="primary" if is_selected else "secondary"
+                            ):
+                                st.session_state.user_test_answers[str(i)] = option
+                                st.rerun()
+                    
+                    st.markdown("---")
             
-            if st.button("Submit Test", type="primary"):
-                st.session_state.test_completed = True
-                st.rerun()
+            # Submit button
+            col_submit1, col_submit2, col_submit3 = st.columns([1, 2, 1])
+            with col_submit2:
+                if st.button("📤 Submit Test", 
+                           type="primary", 
+                           key=f"submit_test_week_{week_num}",
+                           use_container_width=True):
+                    st.session_state.test_completed = True
+                    st.rerun()
         
         # Test Results View
         elif st.session_state.test_completed:
@@ -2281,20 +2410,50 @@ with tab5:
             st.success(f"## 🎯 Test Score: {score_percentage:.1f}%")
             st.info(f"**{correct_count} out of {len(test_questions)} correct**")
             
-            with st.expander("Review Answers"):
+            # Performance feedback
+            if score_percentage >= 80:
+                st.balloons()
+                st.success("**Excellent!** You have a strong understanding of this week's material.")
+            elif score_percentage >= 60:
+                st.success("**Good job!** You understand the main concepts.")
+            else:
+                st.warning("**Review needed.** Consider revisiting this week's material.")
+            
+            with st.expander("📋 Review Answers", expanded=False):
                 for i, question in enumerate(test_questions):
                     user_answer = user_answers.get(str(i), "Not answered")
                     is_correct = user_answer == question['correct_answer']
                     
-                    st.markdown(f"**Q{i+1}: {question['question']}**")
-                    st.write(f"Your answer: {user_answer}")
-                    st.write(f"Correct answer: {question['correct_answer']}")
-                    st.write(f"Explanation: {question['explanation']}")
+                    st.markdown(f"**Q{i+1}. {question['question']}**")
+                    
+                    # Show user's answer with color
+                    if user_answer in question['options']:
+                        user_answer_text = f"{user_answer}. {question['options'][user_answer]}"
+                        if is_correct:
+                            st.success(f"✅ **Your answer:** {user_answer_text}")
+                        else:
+                            st.error(f"❌ **Your answer:** {user_answer_text}")
+                    else:
+                        st.warning("⏸️ **Your answer:** Not answered")
+                    
+                    # Show correct answer
+                    correct_answer_text = f"{question['correct_answer']}. {question['options'][question['correct_answer']]}"
+                    st.info(f"📚 **Correct answer:** {correct_answer_text}")
+                    
+                    # Show explanation
+                    if question.get('explanation'):
+                        st.markdown(f"💡 **Explanation:** {question['explanation']}")
+                    
                     st.markdown("---")
             
-            if st.button("Back to Tests"):
+            # Back button
+            if st.button("← Back to Test List", 
+                        key=f"back_from_test_{week_num}",
+                        use_container_width=True):
                 st.session_state.current_test = None
                 st.session_state.test_completed = False
+                st.session_state.test_questions = []
+                st.session_state.user_test_answers = {}
                 st.rerun()
     
     else: