diff --git a/Mindforge.Web/src/components/FlashcardStudySession.tsx b/Mindforge.Web/src/components/FlashcardStudySession.tsx
index 0dfda1c..fc84ed6 100644
--- a/Mindforge.Web/src/components/FlashcardStudySession.tsx
+++ b/Mindforge.Web/src/components/FlashcardStudySession.tsx
@@ -109,7 +109,6 @@ export function FlashcardStudySession({ cards, libraryMetaById, onAnswer, onEnd
   const [submittingAnswer, setSubmittingAnswer] = useState(false);
   const [cardExiting, setCardExiting] = useState(false);
   const [stampState, setStampState] = useState<'correct' | 'wrong' | null>(null);
-  const [flipped, setFlipped] = useState(false);
   const [sessionAnswers, setSessionAnswers] = useState<Record<number, boolean>>({});
   const [submissionError, setSubmissionError] = useState<string | null>(null);
 
@@ -132,7 +131,6 @@ export function FlashcardStudySession({ cards, libraryMetaById, onAnswer, onEnd
     setSubmittingAnswer(false);
     setCardExiting(false);
     setStampState(null);
-    setFlipped(false);
     setSessionAnswers({});
     setSubmissionError(null);
   }, [cards]);
@@ -144,12 +142,6 @@ export function FlashcardStudySession({ cards, libraryMetaById, onAnswer, onEnd
     };
   }, []);
 
-  useEffect(() => {
-    if (showAnswer && flipped) return;
-    if (!showAnswer && !flipped) return;
-    setFlipped(showAnswer);
-  }, [showAnswer, flipped]);
-
   useEffect(() => {
     function handleKeyDown(e: KeyboardEvent) {
       if (cards.length === 0 || !currentCard) return;
@@ -178,7 +170,6 @@ export function FlashcardStudySession({ cards, libraryMetaById, onAnswer, onEnd
     setCurrentIndex(currentIndex - 1);
     setShowAnswer(false);
     setShowBackQuestion(false);
-    setFlipped(false);
     setStampState(null);
     setCardExiting(false);
     setSubmissionError(null);
@@ -193,7 +184,6 @@ export function FlashcardStudySession({ cards, libraryMetaById, onAnswer, onEnd
     setCurrentIndex(currentIndex + 1);
     setShowAnswer(false);
     setShowBackQuestion(false);
-    setFlipped(false);
     setStampState(null);
     setCardExiting(false);
     setSubmittingAnswer(false);
@@ -273,7 +263,7 @@ export function FlashcardStudySession({ cards, libraryMetaById, onAnswer, onEnd
 
           <div class="study-stage">
             <div
-              class={`study-flashcard${flipped ? ' is-flipped' : ''}${cardExiting ? ' is-reviewed' : ''}`}
+              class={`study-flashcard${showAnswer ? ' is-flipped' : ''}${cardExiting ? ' is-reviewed' : ''}`}
               onClick={() => {
                 if (submittingAnswer) return;
                 if (!showAnswer) {
diff --git a/Mindforge.Web/src/components/SpacedReviewComponent.tsx b/Mindforge.Web/src/components/SpacedReviewComponent.tsx
index 802a7f6..ef82f10 100644
--- a/Mindforge.Web/src/components/SpacedReviewComponent.tsx
+++ b/Mindforge.Web/src/components/SpacedReviewComponent.tsx
@@ -237,11 +237,11 @@ export function SpacedReviewComponent() {
 
   const toggleStatus = (status: FlashcardRagStatus) => {
     if (selectedStatuses.includes(status)) {
-      setSelectedStatuses(selectedStatuses.filter((value) => value !== status));
+      setSelectedStatuses([]);
       return;
     }
 
-    setSelectedStatuses([...selectedStatuses, status]);
+    setSelectedStatuses(['Red', 'Amber', 'Green', 'Grey']);
   };
 
   const toggleLibrary = (libraryId: number) => {