diff --git a/admin-client/src/pages/admin/MembersTab.jsx b/admin-client/src/pages/admin/MembersTab.jsx
index 03a921f..b4eb120 100644
--- a/admin-client/src/pages/admin/MembersTab.jsx
+++ b/admin-client/src/pages/admin/MembersTab.jsx
@@ -15,6 +15,9 @@ const MembersTab = ({ initialClanFilter }) => {
   const [search, setSearch] = useState('');
   const [levelFilter, setLevelFilter] = useState('');
   const [clanFilter, setClanFilter] = useState(initialClanFilter || '');
+  const [minSolved, setMinSolved] = useState('');
+  const [maxSolved, setMaxSolved] = useState('');
+  const [sortBy, setSortBy] = useState('Default');
   const [menuOpen, setMenuOpen] = useState(null);
   const [menuPos, setMenuPos] = useState({ top: 0, right: 0 });
   const canManageUsers = canManageClanGlobally(user);
@@ -184,9 +187,55 @@ const MembersTab = ({ initialClanFilter }) => {
     } else if (clanFilter) {
       matchClan = activeClan?._id === clanFilter;
     }
-    return matchSearch && matchLevel && matchClan;
+
+    const solved = u.solvedProblems || 0;
+    const matchesMin = minSolved === '' || solved >= parseInt(minSolved);
+    const matchesMax = maxSolved === '' || solved <= parseInt(maxSolved);
+
+    return matchSearch && matchLevel && matchClan && matchesMin && matchesMax;
+  });
+
+  const sortedUsers = [...filteredUsers].sort((a, b) => {
+    const aSolved = a.solvedProblems || 0;
+    const bSolved = b.solvedProblems || 0;
+    if (sortBy === 'Solved (Low to High)') return aSolved - bSolved;
+    if (sortBy === 'Solved (High to Low)') return bSolved - aSolved;
+    return 0; // Default
   });
 
+  const handleDownloadCSV = () => {
+    const headers = ['Name', 'Username', 'Email', 'Reg No', 'Clan', 'Level', 'Solved', 'XP', 'Streak', 'Status'];
+    const rows = sortedUsers.map(u => {
+      const activeClan = u.clan ? (clansQuery.data || []).find(c => c._id === u.clan || c._id === u.clan?._id) : null;
+      const clanName = activeClan ? activeClan.name : 'Unassigned';
+      let status = 'Not Started';
+      if ((u.solvedProblems || 0) > 0) status = 'In Progress'; // Can't easily determine 'Completed all' globally without total question count
+      
+      return [
+        `"${u.name || ''}"`,
+        `"${u.username || ''}"`,
+        `"${u.email || ''}"`,
+        `"${u.regNo || 'N/A'}"`,
+        `"${clanName}"`,
+        `"${u.codingLevel || 'Beginner'}"`,
+        u.solvedProblems || 0,
+        u.points || 0,
+        u.streak || 0,
+        `"${u.status || 'Active'}"`
+      ].join(',');
+    });
+    
+    const csvContent = [headers.join(','), ...rows].join('\n');
+    const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
+    const url = URL.createObjectURL(blob);
+    const link = document.createElement('a');
+    link.setAttribute('href', url);
+    link.setAttribute('download', `Admin_Directory_${new Date().toISOString().split('T')[0]}.csv`);
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  };
+
   const getStatusDot = (status) => {
     switch(status) {
       case 'Active': return <div className="w-2 h-2 rounded-full bg-green-500 shadow-[0_0_8px_#22c55e]" />;
@@ -250,6 +299,44 @@ const MembersTab = ({ initialClanFilter }) => {
               ))}
             </select>
           </div>
+
+          <div className="flex items-center gap-2 px-2 py-1 bg-white dark:bg-black/20 rounded-lg border border-black/10 dark:border-white/10 h-9">
+            <span className="text-xs text-slate-500 dark:text-tertiary font-bold uppercase">Solved:</span>
+            <input 
+              type="number" 
+              placeholder="Min" 
+              value={minSolved}
+              onChange={e => setMinSolved(e.target.value)}
+              className="w-12 bg-transparent text-sm text-black dark:text-white text-center focus:outline-none border-b border-transparent focus:border-blue-500/50"
+            />
+            <span className="text-slate-500 dark:text-tertiary">-</span>
+            <input 
+              type="number" 
+              placeholder="Max" 
+              value={maxSolved}
+              onChange={e => setMaxSolved(e.target.value)}
+              className="w-12 bg-transparent text-sm text-black dark:text-white text-center focus:outline-none border-b border-transparent focus:border-blue-500/50"
+            />
+          </div>
+
+          <div className="relative">
+            <select
+              value={sortBy}
+              onChange={(e) => setSortBy(e.target.value)}
+              className="bg-white dark:bg-black/20 border border-black/10 dark:border-white/10 rounded-lg pl-3 pr-8 py-2 text-sm text-black dark:text-white appearance-none focus:outline-none focus:border-blue-500/50"
+            >
+              <option value="Default">Sort: Default</option>
+              <option value="Solved (Low to High)">Solved (Low to High)</option>
+              <option value="Solved (High to Low)">Solved (High to Low)</option>
+            </select>
+          </div>
+          
+          <button 
+            onClick={handleDownloadCSV}
+            className="px-4 py-2 rounded-lg bg-blue-500/10 text-blue-600 dark:text-blue-400 hover:bg-blue-500/20 transition-colors text-sm font-bold border border-blue-500/20 whitespace-nowrap h-9 flex items-center"
+          >
+            Export CSV
+          </button>
         </div>
       </div>
       </div>
@@ -352,7 +439,7 @@ const MembersTab = ({ initialClanFilter }) => {
               </tr>
             </thead>
             <tbody>
-              {filteredUsers.map((user, i) => (
+              {sortedUsers.map((user, i) => (
                 <motion.tr key={user._id} initial={{ opacity: 0, y: 5 }} animate={{ opacity: 1, y: 0 }} transition={{ delay: i * 0.02 }} className="border-b border-white/[0.02] hover:bg-white/[0.01] transition-colors group">
                   <td className="p-4 pl-6 font-bold text-sm text-primary">
                     <MemberHoverCard userId={user._id} username={user.username}>
@@ -413,14 +500,14 @@ const MembersTab = ({ initialClanFilter }) => {
                   </td>
                 </motion.tr>
               ))}
-              {filteredUsers.length === 0 && (
+              {sortedUsers.length === 0 && (
                 <tr><td colSpan="7" className="p-10 text-center text-tertiary">No members found matching the criteria.</td></tr>
               )}
             </tbody>
           </table>
         </div>
         <div className="p-3 border-t border-white/[0.05] bg-white/[0.01] text-xs text-tertiary flex justify-between items-center px-6">
-          <span>Showing {filteredUsers.length} members</span>
+          <span>Showing {sortedUsers.length} members</span>
         </div>
       </BaseCard>
 
diff --git a/admin-client/src/pages/admin/QuestionSetsTab.jsx b/admin-client/src/pages/admin/QuestionSetsTab.jsx
index ab08832..133d5db 100644
--- a/admin-client/src/pages/admin/QuestionSetsTab.jsx
+++ b/admin-client/src/pages/admin/QuestionSetsTab.jsx
@@ -291,6 +291,9 @@ const QuestionSetsTab = () => {
   const [solutionLangByKey, setSolutionLangByKey] = useState({});
   const [previewQuestion, setPreviewQuestion] = useState(null);
 
+  const todayStr = new Date().toISOString().split('T')[0];
+  const isPastDeadline = editingSetId && form.deadline && form.deadline < todayStr;
+
   const blankForm = ()=>({title:'',weekNumber:1,deadline:'',targetLevel:'Both',questions:[{...initialQuestionState}]});
 
   const setsQuery = useQuery({queryKey:['admin-question-sets'],queryFn:async()=>{try{const r=await api.get('/api/sets');return r.data.data||[]}catch{return[]}}});
@@ -496,38 +499,38 @@ const QuestionSetsTab = () => {
     );
   };
 
-  const HintsEditor = ({hints,onChange}) => {
+  const HintsEditor = ({hints,onChange,disabled}) => {
     const list = hints && hints.length ? hints : [''];
     return (
       <div className="md:col-span-3 space-y-2">
         <div className="flex items-center justify-between">
           <label className="field-label text-[10px] mb-0">Hints (optional)</label>
-          <button type="button" className="text-xs text-accent hover:underline font-bold" onClick={()=>onChange([...list,''])}>+ Add Hint</button>
+          {!disabled && <button type="button" className="text-xs text-accent hover:underline font-bold" onClick={()=>onChange([...list,''])}>+ Add Hint</button>}
         </div>
         {list.map((hint,hi)=>(
           <div key={hi} className="flex items-center gap-2">
-            <input className="field-input text-sm" placeholder="Hint..." value={hint} onChange={e=>{const nh=[...list];nh[hi]=e.target.value;onChange(nh)}}/>
-            {list.length>1&&<button type="button" className="text-secondary hover:text-red-400 transition-colors" onClick={()=>onChange(list.filter((_,j)=>j!==hi))}><FiTrash2 size={14}/></button>}
+            <input disabled={disabled} className="field-input text-sm" placeholder="Hint..." value={hint} onChange={e=>{const nh=[...list];nh[hi]=e.target.value;onChange(nh)}}/>
+            {list.length>1&&!disabled&&<button type="button" className="text-secondary hover:text-red-400 transition-colors" onClick={()=>onChange(list.filter((_,j)=>j!==hi))}><FiTrash2 size={14}/></button>}
           </div>
         ))}
       </div>
     );
   };
 
-  const TestCaseEditor = ({cases,onChange}) => (
+  const TestCaseEditor = ({cases,onChange,disabled}) => (
     <div className="md:col-span-3 space-y-2">
       <div className="flex items-center justify-between">
         <label className="field-label text-[10px] mb-0">Test Cases</label>
-        <button type="button" className="text-xs text-accent hover:underline font-bold" onClick={()=>onChange([...(cases||[]),emptyTestCase()])}>+ Add Case</button>
+        {!disabled && <button type="button" className="text-xs text-accent hover:underline font-bold" onClick={()=>onChange([...(cases||[]),emptyTestCase()])}>+ Add Case</button>}
       </div>
       {(!cases||cases.length===0)?<p className="text-xs text-tertiary">No test cases — click Add Case.</p>:(
         <div className="space-y-3 max-h-60 overflow-y-auto">
           {cases.map((tc,i)=>(
-            <div key={i} className="grid grid-cols-[1fr_2fr_1fr_auto] gap-2 items-start bg-black/5 dark:bg-white/5 rounded-xl p-3 border border-glass-border">
-              <div><p className="text-[10px] text-tertiary mb-1">Label</p><input className="field-input text-xs py-1" placeholder="Example 1" value={tc.label} onChange={e=>{const t=[...cases];t[i]={...t[i],label:e.target.value};onChange(t)}}/></div>
-              <div><p className="text-[10px] text-tertiary mb-1">Args (JSON array)</p><input className="field-input text-xs py-1 font-mono" placeholder='[[2,7,11,15], 9]' value={tc.args} onChange={e=>{const t=[...cases];t[i]={...t[i],args:e.target.value};onChange(t)}}/></div>
-              <div><p className="text-[10px] text-tertiary mb-1">Expected</p><input className="field-input text-xs py-1 font-mono" placeholder='[0,1]' value={tc.expected} onChange={e=>{const t=[...cases];t[i]={...t[i],expected:e.target.value};onChange(t)}}/></div>
-              <button type="button" className="mt-5 text-secondary hover:text-red-400 transition-colors" onClick={()=>onChange(cases.filter((_,j)=>j!==i))}><FiTrash2 size={14}/></button>
+            <div key={i} className={`grid grid-cols-[1fr_2fr_1fr_auto] gap-2 items-start bg-black/5 dark:bg-white/5 rounded-xl p-3 border border-glass-border ${disabled ? 'opacity-70' : ''}`}>
+              <div><p className="text-[10px] text-tertiary mb-1">Label</p><input disabled={disabled} className="field-input text-xs py-1" placeholder="Example 1" value={tc.label} onChange={e=>{const t=[...cases];t[i]={...t[i],label:e.target.value};onChange(t)}}/></div>
+              <div><p className="text-[10px] text-tertiary mb-1">Args (JSON array)</p><input disabled={disabled} className="field-input text-xs py-1 font-mono" placeholder='[[2,7,11,15], 9]' value={tc.args} onChange={e=>{const t=[...cases];t[i]={...t[i],args:e.target.value};onChange(t)}}/></div>
+              <div><p className="text-[10px] text-tertiary mb-1">Expected</p><input disabled={disabled} className="field-input text-xs py-1 font-mono" placeholder='[0,1]' value={tc.expected} onChange={e=>{const t=[...cases];t[i]={...t[i],expected:e.target.value};onChange(t)}}/></div>
+              {!disabled && <button type="button" className="mt-5 text-secondary hover:text-red-400 transition-colors" onClick={()=>onChange(cases.filter((_,j)=>j!==i))}><FiTrash2 size={14}/></button>}
             </div>
           ))}
         </div>
@@ -559,25 +562,28 @@ const QuestionSetsTab = () => {
         <motion.div initial={{opacity:0,y:10}} animate={{opacity:1,y:0}} className="space-y-6">
           <form onSubmit={handlePublish} className="space-y-6">
             <BaseCard>
-              <h2 className="text-xl font-black text-primary">Set Details</h2>
-              <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-                <div><label className="field-label">Set Title</label><input required className="field-input" placeholder="e.g. Dynamic Programming Basics" value={form.title} onChange={e=>setForm({...form,title:e.target.value})}/></div>
+              <div className="flex justify-between items-center">
+                <h2 className="text-xl font-black text-primary">Set Details</h2>
+                {isPastDeadline && <span className="text-xs font-bold text-orange-400 bg-orange-400/10 px-3 py-1 rounded-lg">Past Deadline - Only solutions can be updated</span>}
+              </div>
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-4 mt-4">
+                <div><label className="field-label">Set Title</label><input disabled={isPastDeadline} required className="field-input" placeholder="e.g. Dynamic Programming Basics" value={form.title} onChange={e=>setForm({...form,title:e.target.value})}/></div>
                 <div><label className="field-label">Target Level</label>
                   <div className="flex bg-black/5 dark:bg-white/5 p-1 rounded-xl">
-                    {['Beginner','Intermediate','Both'].map(lvl=>(<button type="button" key={lvl} onClick={()=>setForm({...form,targetLevel:lvl})} className={`flex-1 py-1.5 text-xs font-bold rounded-lg transition-colors ${form.targetLevel===lvl?'bg-black/10 dark:bg-white/10 text-primary shadow':'text-tertiary hover:text-secondary'}`}>{lvl}</button>))}
+                    {['Beginner','Intermediate','Both'].map(lvl=>(<button disabled={isPastDeadline} type="button" key={lvl} onClick={()=>setForm({...form,targetLevel:lvl})} className={`flex-1 py-1.5 text-xs font-bold rounded-lg transition-colors ${form.targetLevel===lvl?'bg-black/10 dark:bg-white/10 text-primary shadow':'text-tertiary hover:text-secondary disabled:opacity-50'}`}>{lvl}</button>))}
                   </div>
                 </div>
                 <div><label className="field-label">Week Number</label>
-                  <div className="relative"><FiCalendar className="absolute left-3 top-1/2 -translate-y-1/2 text-tertiary"/><input required type="number" min="1" className="field-input pl-9" value={form.weekNumber} onChange={e=>setForm({...form,weekNumber:Number(e.target.value)})}/></div>
+                  <div className="relative"><FiCalendar className="absolute left-3 top-1/2 -translate-y-1/2 text-tertiary"/><input disabled={isPastDeadline} required type="number" min="1" className="field-input pl-9" value={form.weekNumber} onChange={e=>setForm({...form,weekNumber:Number(e.target.value)})}/></div>
                 </div>
-                <div><label className="field-label">Deadline</label><input required type="date" min={new Date().toISOString().split('T')[0]} className="field-input" value={form.deadline} onChange={e=>setForm({...form,deadline:e.target.value})}/></div>
+                <div><label className="field-label">Deadline</label><input disabled={isPastDeadline} required type="date" min={editingSetId ? undefined : new Date().toISOString().split('T')[0]} className="field-input" value={form.deadline} onChange={e=>setForm({...form,deadline:e.target.value})}/></div>
               </div>
             </BaseCard>
 
             <div className="space-y-3">
               <div className="flex justify-between items-center">
                 <h2 className="text-lg font-black text-primary">Questions ({form.questions.length}/5)</h2>
-                {form.questions.length<5&&(<button type="button" onClick={handleAddQuestion} className="text-xs font-bold text-accent bg-accent/10 px-3 py-1.5 rounded-lg hover:bg-accent/20 transition-colors flex items-center gap-1"><FiPlus /> Add Question</button>)}
+                {form.questions.length<5&&!isPastDeadline&&(<button type="button" onClick={handleAddQuestion} className="text-xs font-bold text-accent bg-accent/10 px-3 py-1.5 rounded-lg hover:bg-accent/20 transition-colors flex items-center gap-1"><FiPlus /> Add Question</button>)}
               </div>
               <div className="grid grid-cols-1 lg:grid-cols-2 gap-4 items-start">
               <AnimatePresence>
@@ -589,26 +595,26 @@ const QuestionSetsTab = () => {
                         <h3 className="font-bold text-primary flex items-center gap-2"><span className="w-6 h-6 rounded bg-black/10 dark:bg-white/10 flex items-center justify-center text-xs text-secondary">{i+1}</span> Question Config</h3>
                         <div className="flex items-center gap-1">
                           <button type="button" onClick={()=>setPreviewQuestion(q)} className="flex items-center gap-1.5 text-xs text-secondary hover:text-accent bg-black/5 dark:bg-white/5 hover:bg-accent/10 border border-glass-border hover:border-accent/30 px-2.5 py-1 rounded-lg transition-colors font-semibold"><FiEye size={13}/> Preview</button>
-                          {form.questions.length>1&&(<button type="button" onClick={()=>handleRemoveQuestion(i)} className="text-red-400 hover:text-red-300 p-1 ml-1"><FiTrash2 size={16}/></button>)}
+                          {form.questions.length>1&&!isPastDeadline&&(<button type="button" onClick={()=>handleRemoveQuestion(i)} className="text-red-400 hover:text-red-300 p-1 ml-1"><FiTrash2 size={16}/></button>)}
                         </div>
                       </div>
                       <div className="grid grid-cols-1 md:grid-cols-3 gap-3">
                         <div className="md:col-span-3 bg-purple-500/5 border border-purple-500/20 p-3 rounded-lg flex flex-col md:flex-row gap-3 items-end">
-                          <div className="flex-1 w-full"><label className="field-label text-[10px] text-purple-400">Fetch from LeetCode (Slug or URL)</label><input className="field-input text-sm border-purple-500/30 focus:border-purple-500/60" placeholder="e.g. two-sum" value={q.leetcodeSlug||''} onChange={e=>updateQuestion(i,'leetcodeSlug',e.target.value)}/></div>
-                          <button type="button" disabled={fetchLeetCodeMutation.isLoading&&fetchLeetCodeMutation.variables?.index===i} onClick={()=>{let slug=q.leetcodeSlug.trim();if(slug.includes('leetcode.com/problems/'))slug=slug.split('leetcode.com/problems/')[1].split('/')[0];if(!slug)return toast.error('Enter a LeetCode slug or URL');fetchLeetCodeMutation.mutate({slug,index:i})}} className="bg-purple-500/20 text-purple-400 font-bold px-4 py-2 rounded-lg text-sm hover:bg-purple-500/30 transition-colors whitespace-nowrap">
+                          <div className="flex-1 w-full"><label className="field-label text-[10px] text-purple-400">Fetch from LeetCode (Slug or URL)</label><input disabled={isPastDeadline} className="field-input text-sm border-purple-500/30 focus:border-purple-500/60 disabled:opacity-50" placeholder="e.g. two-sum" value={q.leetcodeSlug||''} onChange={e=>updateQuestion(i,'leetcodeSlug',e.target.value)}/></div>
+                          <button type="button" disabled={isPastDeadline||(fetchLeetCodeMutation.isLoading&&fetchLeetCodeMutation.variables?.index===i)} onClick={()=>{let slug=q.leetcodeSlug.trim();if(slug.includes('leetcode.com/problems/'))slug=slug.split('leetcode.com/problems/')[1].split('/')[0];if(!slug)return toast.error('Enter a LeetCode slug or URL');fetchLeetCodeMutation.mutate({slug,index:i})}} className="bg-purple-500/20 text-purple-400 font-bold px-4 py-2 rounded-lg text-sm hover:bg-purple-500/30 transition-colors whitespace-nowrap disabled:opacity-50">
                             {fetchLeetCodeMutation.isLoading&&fetchLeetCodeMutation.variables?.index===i?'Fetching...':'Fetch Details'}
                           </button>
                         </div>
-                        <div className="md:col-span-2"><label className="field-label text-[10px]">Title</label><input required className="field-input text-sm" value={q.title} onChange={e=>updateQuestion(i,'title',e.target.value)}/></div>
-                        <div><label className="field-label text-[10px]">Difficulty</label><select className="field-select text-sm" value={q.difficulty} onChange={e=>updateQuestion(i,'difficulty',e.target.value)}><option>Easy</option><option>Medium</option><option>Hard</option></select></div>
-                        <div><label className="field-label text-[10px]">Points</label><input type="number" min="1" className="field-input text-sm" value={q.points} onChange={e=>updateQuestion(i,'points',Number(e.target.value))}/></div>
-                        <div><label className="field-label text-[10px]">Tags/Category</label><input className="field-input text-sm" placeholder="e.g. Arrays, Sorting" value={q.category} onChange={e=>updateQuestion(i,'category',e.target.value)}/></div>
-                        <div className="md:col-span-3 flex items-center gap-2"><input type="checkbox" id={`order-independent-${i}`} checked={!!q.orderIndependent} onChange={e=>updateQuestion(i,'orderIndependent',e.target.checked)}/><label htmlFor={`order-independent-${i}`} className="text-xs text-secondary cursor-pointer">Order doesn't matter (e.g. Group Anagrams) — ignore array/element order when checking output</label></div>
-                        <div className="md:col-span-3"><label className="field-label text-[10px]">Problem Description</label><textarea required rows="3" className="field-textarea text-sm" value={q.description} onChange={e=>updateQuestion(i,'description',e.target.value)}/></div>
-                        <HintsEditor hints={q.hints} onChange={v=>updateQuestion(i,'hints',v)}/>
+                        <div className="md:col-span-2"><label className="field-label text-[10px]">Title</label><input disabled={isPastDeadline} required className="field-input text-sm" value={q.title} onChange={e=>updateQuestion(i,'title',e.target.value)}/></div>
+                        <div><label className="field-label text-[10px]">Difficulty</label><select disabled={isPastDeadline} className="field-select text-sm disabled:opacity-70" value={q.difficulty} onChange={e=>updateQuestion(i,'difficulty',e.target.value)}><option>Easy</option><option>Medium</option><option>Hard</option></select></div>
+                        <div><label className="field-label text-[10px]">Points</label><input disabled={isPastDeadline} type="number" min="1" className="field-input text-sm" value={q.points} onChange={e=>updateQuestion(i,'points',Number(e.target.value))}/></div>
+                        <div><label className="field-label text-[10px]">Tags/Category</label><input disabled={isPastDeadline} className="field-input text-sm" placeholder="e.g. Arrays, Sorting" value={q.category} onChange={e=>updateQuestion(i,'category',e.target.value)}/></div>
+                        <div className="md:col-span-3 flex items-center gap-2"><input disabled={isPastDeadline} type="checkbox" id={`order-independent-${i}`} checked={!!q.orderIndependent} onChange={e=>updateQuestion(i,'orderIndependent',e.target.checked)}/><label htmlFor={`order-independent-${i}`} className={`text-xs text-secondary cursor-pointer ${isPastDeadline ? 'opacity-70' : ''}`}>Order doesn't matter (e.g. Group Anagrams) — ignore array/element order when checking output</label></div>
+                        <div className="md:col-span-3"><label className="field-label text-[10px]">Problem Description</label><textarea disabled={isPastDeadline} required rows="3" className="field-textarea text-sm disabled:opacity-70" value={q.description} onChange={e=>updateQuestion(i,'description',e.target.value)}/></div>
+                        <HintsEditor disabled={isPastDeadline} hints={q.hints} onChange={v=>updateQuestion(i,'hints',v)}/>
                         {renderSolutionEditor({ editorKey: `set-question-${i}`, solutions: q.solutions||[], onChange: v=>updateQuestion(i,'solutions',v) })}
-                        <div className="md:col-span-3"><label className="field-label text-[10px]">Solution Function Name</label><input className="field-input text-sm font-mono" placeholder="e.g. twoSum" value={q.functionName||''} onChange={e=>updateQuestion(i,'functionName',e.target.value.trim())}/><SignatureInfo functionName={q.functionName} params={q.params} returnType={q.returnType}/></div>
-                        <TestCaseEditor cases={q.testCases||[]} onChange={v=>updateQuestion(i,'testCases',v)}/>
+                        <div className="md:col-span-3"><label className="field-label text-[10px]">Solution Function Name</label><input disabled={isPastDeadline} className="field-input text-sm font-mono disabled:opacity-70" placeholder="e.g. twoSum" value={q.functionName||''} onChange={e=>updateQuestion(i,'functionName',e.target.value.trim())}/><SignatureInfo functionName={q.functionName} params={q.params} returnType={q.returnType}/></div>
+                        <TestCaseEditor disabled={isPastDeadline} cases={q.testCases||[]} onChange={v=>updateQuestion(i,'testCases',v)}/>
                       </div>
                     </BaseCard>
                   </motion.div>
diff --git a/client/src/pages/ChallengeDetails.jsx b/client/src/pages/ChallengeDetails.jsx
index 7243f7d..bc0f917 100644
--- a/client/src/pages/ChallengeDetails.jsx
+++ b/client/src/pages/ChallengeDetails.jsx
@@ -228,6 +228,7 @@ const ChallengeDetails = () => {
 
   // Logic: LocalStorage Persistence
   useEffect(() => {
+    if (isReviewMode) return;
     const raw = localStorage.getItem(draftKey);
     if (!raw) return;
     try {
@@ -240,7 +241,7 @@ const ChallengeDetails = () => {
     } catch {
       localStorage.removeItem(draftKey);
     }
-  }, [draftKey]);
+  }, [draftKey, isReviewMode]);
 
   const challengeQuery = useQuery({
     queryKey: ["challenge", id],
@@ -259,6 +260,7 @@ const ChallengeDetails = () => {
   });
 
   useEffect(() => {
+    if (isReviewMode) return;
     const hasAnyCode = Object.values(codeByLang).some((c) => c.trim());
     if (!(repoUrl.trim() || hasAnyCode)) {
       localStorage.removeItem(draftKey);
@@ -277,7 +279,7 @@ const ChallengeDetails = () => {
         updatedAt: new Date().toISOString(),
       }),
     );
-  }, [draftKey, repoUrl, codeByLang, language, challengeQuery.data]);
+  }, [draftKey, repoUrl, codeByLang, language, challengeQuery.data, isReviewMode]);
 
   // A language is offered only if this challenge can actually run in it.
   // Python/JS drivers are dynamic; compiled languages need a drivable signature.
diff --git a/client/src/pages/chief/ChiefDashboardTab.jsx b/client/src/pages/chief/ChiefDashboardTab.jsx
index a008280..e5b9124 100644
--- a/client/src/pages/chief/ChiefDashboardTab.jsx
+++ b/client/src/pages/chief/ChiefDashboardTab.jsx
@@ -49,6 +49,7 @@ const ChiefDashboardTab = ({ clan, onTabChange }) => {
   const [warningModal, setWarningModal] = useState({ open: false, user: null, message: '' });
   const [selectedSetId, setSelectedSetId] = useState(null);
   const [hoveredMember, setHoveredMember] = useState(null); // { memberId, name, x, y }
+  const [filterType, setFilterType] = useState('All'); // Filter state
   const isArchived = isClanArchived(clan);
   const canManageClan = canManageOwnClan(user, clan);
   const canArchive = canArchiveClan(user, clan);
@@ -178,6 +179,50 @@ const ChiefDashboardTab = ({ clan, onTabChange }) => {
   const circleCircumference = 2 * Math.PI * circleRadius;
   const strokeDashoffset = circleCircumference - (completionRate / 100) * circleCircumference;
 
+  const filteredMembers = members.filter(member => {
+    if (filterType === 'All') return true;
+    const setData = selectedMembers[member._id];
+    const solved = setData?.solved ?? 0;
+    const total = setData?.total ?? (selectedSet?.challengeCount ?? 0);
+    if (filterType === 'Completed') return total > 0 && solved === total;
+    if (filterType === 'In Progress') return solved > 0 && solved < total;
+    if (filterType === 'Not Started') return solved === 0;
+    return true;
+  });
+
+  const handleDownloadCSV = () => {
+    const headers = ['Name', 'Username', 'Email', 'Level', 'XP', 'Solved', 'Total', 'Status'];
+    const rows = filteredMembers.map(member => {
+      const setData = selectedMembers[member._id];
+      const solved = setData?.solved ?? 0;
+      const total = setData?.total ?? (selectedSet?.challengeCount ?? 0);
+      let status = 'Not Started';
+      if (total > 0 && solved === total) status = 'Completed';
+      else if (solved > 0) status = 'In Progress';
+      
+      return [
+        `"${member.name || member.username || ''}"`,
+        `"${member.username || ''}"`,
+        `"${member.email || ''}"`,
+        `"${member.codingLevel || 'Beginner'}"`,
+        member.points || 0,
+        solved,
+        total,
+        `"${status}"`
+      ].join(',');
+    });
+    
+    const csvContent = [headers.join(','), ...rows].join('\n');
+    const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
+    const url = URL.createObjectURL(blob);
+    const link = document.createElement('a');
+    link.setAttribute('href', url);
+    link.setAttribute('download', `Clan_Progress_${clan.name?.replace(/\s+/g, '_')}_${selectedSet?.title?.replace(/\s+/g, '_') || 'Overview'}.csv`);
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  };
+
   return (
     <div className="space-y-6">
       {isArchived && (
@@ -296,10 +341,29 @@ const ChiefDashboardTab = ({ clan, onTabChange }) => {
 
         {/* Right Col: Member Progress List */}
         <BaseCard className="p-6 xl:col-span-2 flex flex-col h-full">
-          <div className="flex items-center justify-between mb-4">
+          <div className="flex flex-col sm:flex-row sm:items-center justify-between mb-4 gap-4">
             <h2 className="text-sm font-bold text-secondary uppercase tracking-widest flex items-center gap-2">
               <FiActivity className="text-accent" /> Member Progress Overview
             </h2>
+            <div className="flex items-center gap-2">
+              <select 
+                value={filterType} 
+                onChange={(e) => setFilterType(e.target.value)}
+                className="bg-black/20 border border-white/10 text-primary text-xs rounded-lg px-3 py-1.5 focus:outline-none focus:border-accent"
+              >
+                <option value="All">All Members</option>
+                <option value="Completed">Completed</option>
+                <option value="In Progress">In Progress</option>
+                <option value="Not Started">Not Started</option>
+              </select>
+              <button 
+                onClick={handleDownloadCSV}
+                className="px-3 py-1.5 rounded-lg bg-blue-500/10 text-blue-400 hover:bg-blue-500/20 transition-colors text-xs font-bold border border-blue-500/20"
+                title="Download as Excel/CSV"
+              >
+                Export CSV
+              </button>
+            </div>
           </div>
 
           {/* Set selector */}
@@ -332,7 +396,7 @@ const ChiefDashboardTab = ({ clan, onTabChange }) => {
             {!setAnalyticsQuery.isLoading && sets.length === 0 && (
               <p className="text-tertiary text-sm py-4">No question sets published yet.</p>
             )}
-            {sets.length > 0 && members.map((member) => {
+            {sets.length > 0 && filteredMembers.map((member) => {
               const { text: timeText, isOnline } = getRelativeTime(member.lastLoginDate || member.createdAt);
               const isWarned = member.status === 'Warned';
               const setData = selectedMembers[member._id];
diff --git a/client/src/pages/chief/ChiefMembersTab.jsx b/client/src/pages/chief/ChiefMembersTab.jsx
index f8199fe..7fc63c1 100644
--- a/client/src/pages/chief/ChiefMembersTab.jsx
+++ b/client/src/pages/chief/ChiefMembersTab.jsx
@@ -19,6 +19,9 @@ const ChiefMembersTab = ({ clan }) => {
   const [warnMessage, setWarnMessage] = useState('');
   const [searchTerm, setSearchTerm] = useState('');
   const [statusFilter, setStatusFilter] = useState('All');
+  const [minSolved, setMinSolved] = useState('');
+  const [maxSolved, setMaxSolved] = useState('');
+  const [sortBy, setSortBy] = useState('Default');
   const isArchived = isClanArchived(clan);
   const canManageMembers = canManageClanMembers(currentUser, clan);
   const canManageClan = canManageOwnClan(currentUser, clan);
@@ -104,29 +107,85 @@ const ChiefMembersTab = ({ clan }) => {
                           (member.regNo && member.regNo.toLowerCase().includes(searchTerm.toLowerCase())) ||
                           (member.email && member.email.toLowerCase().includes(searchTerm.toLowerCase()));
     const memberStatus = member.status || 'Active';
-    if (statusFilter === 'All') return matchesSearch;
-    return matchesSearch && memberStatus === statusFilter;
+    const statusMatch = statusFilter === 'All' ? true : memberStatus === statusFilter;
+    
+    const solved = member.solvedProblems || 0;
+    const matchesMin = minSolved === '' || solved >= parseInt(minSolved);
+    const matchesMax = maxSolved === '' || solved <= parseInt(maxSolved);
+    
+    return matchesSearch && statusMatch && matchesMin && matchesMax;
   });
 
+  const sortedMembers = [...filteredMembers].sort((a, b) => {
+    const aSolved = a.solvedProblems || 0;
+    const bSolved = b.solvedProblems || 0;
+    if (sortBy === 'Solved (Low to High)') return aSolved - bSolved;
+    if (sortBy === 'Solved (High to Low)') return bSolved - aSolved;
+    return 0; // Default
+  });
+
+  const handleDownloadCSV = () => {
+    const headers = ['Name', 'Username', 'Email', 'Reg No', 'Level', 'Solved', 'XP', 'Streak', 'Status'];
+    const rows = sortedMembers.map(user => {
+      const isWarned = user.status === 'Warned';
+      const isInactive = user.status === 'Inactive';
+      const status = isWarned ? 'Warned' : isInactive ? 'Inactive' : 'Active';
+      
+      return [
+        `"${user.name || user.username || ''}"`,
+        `"${user.username || ''}"`,
+        `"${user.email || ''}"`,
+        `"${user.regNo || 'N/A'}"`,
+        `"${user.codingLevel || 'Beginner'}"`,
+        user.solvedProblems || 0,
+        user.points || 0,
+        user.streak || 0,
+        `"${status}"`
+      ].join(',');
+    });
+    
+    const csvContent = [headers.join(','), ...rows].join('\n');
+    const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
+    const url = URL.createObjectURL(blob);
+    const link = document.createElement('a');
+    link.setAttribute('href', url);
+    link.setAttribute('download', `Member_Management_${clan.name?.replace(/\s+/g, '_') || 'Clan'}.csv`);
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  };
+
   return (
     <div className="space-y-6">
-      <div className="flex flex-col md:flex-row justify-between items-start md:items-center gap-4">
-        <h2 className="text-section-title font-bold flex items-center gap-2">
-          <FiUsers className="text-blue-400" /> Member Management
-        </h2>
-        <div className="flex items-center gap-3 w-full md:w-auto">
-          <div className="relative w-full md:w-64">
-            <FiSearch className="absolute left-3 top-1/2 -translate-y-1/2 text-tertiary" />
-            <input 
-              type="text" 
-              placeholder="Search by name or reg no..." 
-              value={searchTerm}
-              onChange={e => setSearchTerm(e.target.value)}
-              className="field-input pl-10 h-10 text-sm w-full"
-            />
+      <div className="flex flex-col gap-4">
+        <div className="flex flex-col md:flex-row justify-between items-start md:items-center gap-4">
+          <h2 className="text-section-title font-bold flex items-center gap-2">
+            <FiUsers className="text-blue-400" /> Member Management
+          </h2>
+          <div className="flex flex-wrap items-center gap-3 w-full md:w-auto">
+            <div className="relative w-full md:w-64">
+              <FiSearch className="absolute left-3 top-1/2 -translate-y-1/2 text-tertiary" />
+              <input 
+                type="text" 
+                placeholder="Search by name or reg no..." 
+                value={searchTerm}
+                onChange={e => setSearchTerm(e.target.value)}
+                className="field-input pl-10 h-10 text-sm w-full"
+              />
+            </div>
+            
+            <button 
+              onClick={handleDownloadCSV}
+              className="px-4 py-2 rounded-lg bg-blue-500/10 text-blue-400 hover:bg-blue-500/20 transition-colors text-sm font-bold border border-blue-500/20 whitespace-nowrap"
+            >
+              Export CSV
+            </button>
           </div>
+        </div>
+
+        <div className="flex flex-wrap items-center gap-3 bg-black/20 p-3 rounded-xl border border-white/5">
           <Select value={statusFilter} onValueChange={setStatusFilter}>
-            <SelectTrigger className="field-select h-10 text-sm w-[135px] flex items-center justify-between">
+            <SelectTrigger className="field-select h-10 text-sm w-[135px] flex items-center justify-between bg-black/40">
               <SelectValue placeholder="All Status" />
             </SelectTrigger>
             <SelectContent>
@@ -136,6 +195,36 @@ const ChiefMembersTab = ({ clan }) => {
               <SelectItem value="Warned">Warned</SelectItem>
             </SelectContent>
           </Select>
+
+          <div className="flex items-center gap-2 px-2 py-1 bg-black/40 rounded-lg border border-white/10">
+            <span className="text-xs text-tertiary font-bold uppercase">Solved:</span>
+            <input 
+              type="number" 
+              placeholder="Min" 
+              value={minSolved}
+              onChange={e => setMinSolved(e.target.value)}
+              className="w-16 h-8 bg-transparent text-sm text-primary text-center focus:outline-none border-b border-transparent focus:border-accent"
+            />
+            <span className="text-tertiary">-</span>
+            <input 
+              type="number" 
+              placeholder="Max" 
+              value={maxSolved}
+              onChange={e => setMaxSolved(e.target.value)}
+              className="w-16 h-8 bg-transparent text-sm text-primary text-center focus:outline-none border-b border-transparent focus:border-accent"
+            />
+          </div>
+
+          <Select value={sortBy} onValueChange={setSortBy}>
+            <SelectTrigger className="field-select h-10 text-sm w-[180px] flex items-center justify-between bg-black/40">
+              <SelectValue placeholder="Sort By" />
+            </SelectTrigger>
+            <SelectContent>
+              <SelectItem value="Default">Sort: Default</SelectItem>
+              <SelectItem value="Solved (Low to High)">Solved (Low to High)</SelectItem>
+              <SelectItem value="Solved (High to Low)">Solved (High to Low)</SelectItem>
+            </SelectContent>
+          </Select>
         </div>
       </div>
 
@@ -153,7 +242,7 @@ const ChiefMembersTab = ({ clan }) => {
             </tr>
           </thead>
           <tbody>
-            {filteredMembers.map((user, i) => {
+            {sortedMembers.map((user, i) => {
               const isWarned = user.status === 'Warned';
               const isInactive = user.status === 'Inactive';
               const isActive = !isWarned && !isInactive;
@@ -274,7 +363,7 @@ const ChiefMembersTab = ({ clan }) => {
                 </motion.tr>
               );
             })}
-            {filteredMembers.length === 0 && (
+            {sortedMembers.length === 0 && (
               <tr>
                 <td colSpan="7" className="p-8 text-center text-tertiary text-sm">
                   No members found matching your filters.
diff --git a/server/src/features/clans/clan.controller.js b/server/src/features/clans/clan.controller.js
index e0dbb6c..d4d9d11 100644
--- a/server/src/features/clans/clan.controller.js
+++ b/server/src/features/clans/clan.controller.js
@@ -673,7 +673,7 @@ const updateClan = async (req, res, next) => {
 
     const populated = await Clan.findById(clan._id)
       .populate('chief', 'username email')
-      .populate('members', 'username email profilePicture points streak')
+      .populate('members', 'name username email profilePicture points streak')
       .populate('createdBy', 'username email')
       .populate('archivedBy', 'username email')
       .populate('restoredBy', 'username email');
@@ -730,7 +730,7 @@ const archiveClan = async (req, res, next) => {
 
     const clan = await Clan.findById(req.params.id)
       .populate('chief', 'username email')
-      .populate('members', 'username email profilePicture points streak')
+      .populate('members', 'name username email profilePicture points streak')
       .populate('createdBy', 'username email')
       .populate('archivedBy', 'username email')
       .populate('restoredBy', 'username email');
@@ -762,7 +762,7 @@ const restoreClan = async (req, res, next) => {
 
     const populated = await Clan.findById(clan._id)
       .populate('chief', 'username email')
-      .populate('members', 'username email profilePicture points streak')
+      .populate('members', 'name username email profilePicture points streak')
       .populate('createdBy', 'username email')
       .populate('archivedBy', 'username email')
       .populate('restoredBy', 'username email');
@@ -963,7 +963,7 @@ const assignChief = async (req, res, next) => {
 
     const populated = await Clan.findById(clanId)
       .populate('chief', 'username email')
-      .populate('members', 'username email profilePicture points streak');
+      .populate('members', 'name username email profilePicture points streak');
 
     sendSuccess(res, { data: populated, message: 'Clan chief assigned' });
 
@@ -1031,7 +1031,7 @@ const removeChief = async (req, res, next) => {
 
     const populated = await Clan.findById(clanId)
       .populate('chief', 'username email')
-      .populate('members', 'username email');
+      .populate('members', 'name username email');
 
     return sendSuccess(res, { data: populated, message: 'Clan chief removed' });
   } catch (err) {
@@ -1099,7 +1099,7 @@ const addMember = async (req, res, next) => {
 
     const populated = await Clan.findById(clanId)
       .populate('chief', 'username email')
-      .populate('members', 'username email profilePicture points streak');
+      .populate('members', 'name username email profilePicture points streak');
 
     sendSuccess(res, { data: populated, message: 'Member added' });
 
@@ -1182,7 +1182,7 @@ const removeMember = async (req, res, next) => {
 
     const populated = await Clan.findById(clanId)
       .populate('chief', 'username email')
-      .populate('members', 'username email profilePicture points streak');
+      .populate('members', 'name username email profilePicture points streak');
 
     return sendSuccess(res, { data: populated, message: 'Member removed' });
   } catch (err) {