diff --git a/frontend/app/flashcards/page.tsx b/frontend/app/flashcards/page.tsx
index 9e4f5a6..ba5f572 100644
--- a/frontend/app/flashcards/page.tsx
+++ b/frontend/app/flashcards/page.tsx
@@ -32,7 +32,7 @@ const getPartOfSpeechDisplay = (partOfSpeech: string): string => {
 }
 
 // 重構後的FlashcardsContent組件
-function FlashcardsContent() {
+function FlashcardsContent({ showForm, setShowForm }: { showForm: boolean; setShowForm: (show: boolean) => void }) {
   const router = useRouter()
   const toast = useToast()
   const [activeTab, setActiveTab] = useState<'all-cards' | 'favorites'>('all-cards')
@@ -821,14 +821,69 @@ function PaginationControls({ searchState, searchActions }: PaginationControlsPr
           下一頁
         </button>
       </div>
+
     </div>
   )
 }
 
 export default function FlashcardsPage() {
+  const [showForm, setShowForm] = useState(false)
+
   return (
     <ProtectedRoute>
-      <FlashcardsContent />
+      <FlashcardsContent showForm={showForm} setShowForm={setShowForm} />
+
+      {/* 全域模態框 - 在最外層 */}
+      {showForm && (
+        <div
+          style={{
+            position: 'fixed',
+            top: 0,
+            left: 0,
+            right: 0,
+            bottom: 0,
+            backgroundColor: 'rgba(0, 0, 0, 0.8)',
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+            zIndex: 999999
+          }}
+          onClick={() => setShowForm(false)}
+        >
+          <div
+            style={{
+              backgroundColor: 'white',
+              borderRadius: '12px',
+              padding: '32px',
+              maxWidth: '600px',
+              width: '90%',
+              maxHeight: '90vh',
+              overflowY: 'auto',
+              boxShadow: '0 25px 50px -12px rgba(0, 0, 0, 0.25)'
+            }}
+            onClick={(e) => e.stopPropagation()}
+          >
+            <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '24px' }}>
+              <h2 style={{ fontSize: '24px', fontWeight: 'bold' }}>新增詞卡</h2>
+              <button
+                onClick={() => setShowForm(false)}
+                style={{ fontSize: '24px', color: '#666', background: 'none', border: 'none', cursor: 'pointer' }}
+              >
+                ✕
+              </button>
+            </div>
+
+            <FlashcardForm
+              onSuccess={() => {
+                console.log('詞卡創建成功');
+                setShowForm(false);
+                // TODO: 刷新詞卡列表
+              }}
+              onCancel={() => setShowForm(false)}
+            />
+          </div>
+        </div>
+      )}
     </ProtectedRoute>
   )
 }
\ No newline at end of file
diff --git a/frontend/app/learn/page.tsx b/frontend/app/learn/page.tsx
index 14065a9..29a19af 100644
--- a/frontend/app/learn/page.tsx
+++ b/frontend/app/learn/page.tsx
@@ -799,39 +799,6 @@ export default function LearnPage() {
             </div>
           </div>
 
-          {/* 當前選擇突出顯示 */}
-          <div className="bg-gradient-to-r from-blue-50 to-blue-100 rounded-lg p-3 mb-3">
-            <div className="flex items-center justify-between">
-              <div>
-                {currentCard && (() => {
-                  const userCEFR = localStorage.getItem('userEnglishLevel') || 'A2';
-                  const wordCEFR = currentCard.difficultyLevel || 'A2';
-                  const context = getCurrentContext(userCEFR, wordCEFR);
-                  const contextData = generateContextTable(userCEFR, wordCEFR).find(c => c.isCurrent);
-
-                  return (
-                    <>
-                      <div>
-                        <span className="text-blue-800 font-medium">
-                          當前情境: {contextData?.icon} {context}
-                        </span>
-                        <div className="text-blue-600 text-xs mt-1">
-                          可用題型: {contextData?.reviewTypes.join(' | ')}
-                        </div>
-                      </div>
-                    </>
-                  );
-                })()}
-              </div>
-              <div className="text-blue-800 text-right">
-                <div className="text-xs">系統已選擇</div>
-                <div className="font-medium flex items-center gap-1">
-                  <span>{getModeIcon(mode)}</span>
-                  <span>{getModeLabel(mode)}</span>
-                </div>
-              </div>
-            </div>
-          </div>
 
           {/* 完整四情境對照表 */}
           <div className="bg-white rounded-lg p-4">
@@ -879,11 +846,6 @@ export default function LearnPage() {
                 </tbody>
               </table>
             </div>
-
-            <div className="mt-3 p-2 bg-gray-50 rounded text-xs text-gray-600">
-              <div className="font-medium mb-1">🧠 智能適配說明：</div>
-              <div>系統根據您的CEFR等級和詞彙CEFR等級自動判斷學習情境，並智能選擇最適合的複習題型。</div>
-            </div>
           </div>
         </div>
 
@@ -899,13 +861,6 @@ export default function LearnPage() {
           </div>
         )}
 
-        {/* System Auto-Selected Review Type Indicator */}
-        <ReviewTypeIndicator
-          currentMode={mode}
-          userCEFRLevel={localStorage.getItem('userEnglishLevel') || 'A2'}
-          wordCEFRLevel={currentCard?.difficultyLevel}
-        />
-
         {mode === 'flip-memory' ? (
           /* Flip Card Mode */
           <div className="relative">