diff --git a/frontend/app/[locale]/admin/page.tsx b/frontend/app/[locale]/admin/page.tsx
index 290cbd12..5f1065c7 100644
--- a/frontend/app/[locale]/admin/page.tsx
+++ b/frontend/app/[locale]/admin/page.tsx
@@ -1,5 +1,5 @@
-import { Metadata } from 'next';
 import { FileQuestion, MessageSquare, ShoppingBag } from 'lucide-react';
+import { Metadata } from 'next';
 
 import { Link } from '@/i18n/routing';
 
diff --git a/frontend/app/[locale]/admin/quiz/[id]/page.tsx b/frontend/app/[locale]/admin/quiz/[id]/page.tsx
index 948e1416..f736abe9 100644
--- a/frontend/app/[locale]/admin/quiz/[id]/page.tsx
+++ b/frontend/app/[locale]/admin/quiz/[id]/page.tsx
@@ -2,9 +2,9 @@ import { Metadata } from 'next';
 import { notFound } from 'next/navigation';
 
 import { QuizEditorList } from '@/components/admin/quiz/QuizEditorList';
-import { UploadMoreQuestions } from '@/components/admin/quiz/UploadMoreQuestions';
-import { QuizStatusControls } from '@/components/admin/quiz/QuizStatusControls';
 import { QuizMetadataEditor } from '@/components/admin/quiz/QuizMetadataEditor';
+import { QuizStatusControls } from '@/components/admin/quiz/QuizStatusControls';
+import { UploadMoreQuestions } from '@/components/admin/quiz/UploadMoreQuestions';
 import { getAdminQuizFull } from '@/db/queries/quizzes/admin-quiz';
 import { Link } from '@/i18n/routing';
 import { issueCsrfToken } from '@/lib/security/csrf';
diff --git a/frontend/components/admin/quiz/CreateQuizForm.tsx b/frontend/components/admin/quiz/CreateQuizForm.tsx
index 85df22ec..dbfffa38 100644
--- a/frontend/components/admin/quiz/CreateQuizForm.tsx
+++ b/frontend/components/admin/quiz/CreateQuizForm.tsx
@@ -1,12 +1,11 @@
 'use client';
 
-import { useState } from 'react';
-
 import { useRouter } from 'next/navigation';
+import { useState } from 'react';
 
 import type { AdminCategoryItem } from '@/db/queries/categories/admin-categories';
-import type { JsonQuestion } from '@/lib/validation/admin-quiz';
 import { slugify } from '@/lib/shop/slug';
+import type { JsonQuestion } from '@/lib/validation/admin-quiz';
 
 import { InlineCategoryForm } from './InlineCategoryForm';
 import { JsonUploadArea } from './JsonUploadArea';
diff --git a/frontend/components/admin/quiz/DeleteQuizButton.tsx b/frontend/components/admin/quiz/DeleteQuizButton.tsx
index 9f918da3..d180d681 100644
--- a/frontend/components/admin/quiz/DeleteQuizButton.tsx
+++ b/frontend/components/admin/quiz/DeleteQuizButton.tsx
@@ -1,8 +1,7 @@
 'use client';
 
-import { useState } from 'react';
-
 import { useRouter } from 'next/navigation';
+import { useState } from 'react';
 
 interface DeleteQuizButtonProps {
   quizId: string;
diff --git a/frontend/components/admin/quiz/QuestionEditor.tsx b/frontend/components/admin/quiz/QuestionEditor.tsx
index ae6fc79c..3ebfaa97 100644
--- a/frontend/components/admin/quiz/QuestionEditor.tsx
+++ b/frontend/components/admin/quiz/QuestionEditor.tsx
@@ -169,6 +169,7 @@ export function QuestionEditor({
       setValidationError(null);
       setActiveLocale('en');
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isEditing]);
 
   useEffect(() => {
@@ -501,7 +502,7 @@ export function QuestionEditor({
           <button
             type="button"
             onClick={handleSave}
-            disabled={saveStatus === 'saving' || saveStatus === 'saved'}
+            disabled={!isDirty || saveStatus === 'saving' || saveStatus === 'saved'}
             className={cn(
               'rounded-md px-4 py-2 text-sm font-medium transition-colors disabled:opacity-50',
               saveStatus === 'saved'
diff --git a/frontend/components/admin/quiz/QuizListTable.tsx b/frontend/components/admin/quiz/QuizListTable.tsx
index a9266d14..84f7148b 100644
--- a/frontend/components/admin/quiz/QuizListTable.tsx
+++ b/frontend/components/admin/quiz/QuizListTable.tsx
@@ -1,8 +1,7 @@
+import type { AdminQuizListItem } from '@/db/queries/quizzes/admin-quiz';
 import { Link } from '@/i18n/routing';
 import { cn } from '@/lib/utils';
 
-import type { AdminQuizListItem } from '@/db/queries/quizzes/admin-quiz';
-
 import { DeleteQuizButton } from './DeleteQuizButton';
 
 const TH =
diff --git a/frontend/components/admin/quiz/QuizStatusControls.tsx b/frontend/components/admin/quiz/QuizStatusControls.tsx
index 1a412be8..f7f50373 100644
--- a/frontend/components/admin/quiz/QuizStatusControls.tsx
+++ b/frontend/components/admin/quiz/QuizStatusControls.tsx
@@ -1,8 +1,7 @@
 'use client';
 
-import { useState } from 'react';
-
 import { useRouter } from 'next/navigation';
+import { useState } from 'react';
 
 interface ConfirmModal {
   title: string;
diff --git a/frontend/components/admin/quiz/UploadMoreQuestions.tsx b/frontend/components/admin/quiz/UploadMoreQuestions.tsx
index e985c0a7..6f45c1c9 100644
--- a/frontend/components/admin/quiz/UploadMoreQuestions.tsx
+++ b/frontend/components/admin/quiz/UploadMoreQuestions.tsx
@@ -1,8 +1,7 @@
 'use client';
 
-import { useState } from 'react';
-
 import { useRouter } from 'next/navigation';
+import { useState } from 'react';
 
 import type { JsonQuestion } from '@/lib/validation/admin-quiz';
 
diff --git a/frontend/components/dashboard/AchievementBadge.tsx b/frontend/components/dashboard/AchievementBadge.tsx
index 7b9009d6..97928a75 100644
--- a/frontend/components/dashboard/AchievementBadge.tsx
+++ b/frontend/components/dashboard/AchievementBadge.tsx
@@ -1,38 +1,38 @@
 'use client';
 
 import {
-  motion,
-  useMotionValue,
-  useReducedMotion,
-  useSpring,
-  useTransform,
-} from 'framer-motion';
-import {
-  Fire,
-  Target,
-  Lightning,
   Brain,
+  Code,
+  Crown,
   Diamond,
-  Star,
+  Fire,
+  GithubLogo,
   Heart,
-  Trophy,
-  Rocket,
-  Crown,
-  Code,
   Infinity as InfinityIcon,
-  GithubLogo,
+  Lightning,
   Medal,
-  Seal,
   Moon,
+  Rocket,
+  Seal,
   Shield,
+  Star,
+  Target,
+  Trophy,
   Waves,
 } from '@phosphor-icons/react';
+import {
+  motion,
+  useMotionValue,
+  useReducedMotion,
+  useSpring,
+  useTransform,
+} from 'framer-motion';
 import { useTranslations } from 'next-intl';
-import { useState, useEffect } from 'react';
+import { useEffect,useState } from 'react';
 
 import type {
-  EarnedAchievement,
   AchievementIconName,
+  EarnedAchievement,
 } from '@/lib/achievements';
 
 const ICON_MAP: Record<AchievementIconName, React.ElementType> = {
diff --git a/frontend/components/home/FlipCardQA.tsx b/frontend/components/home/FlipCardQA.tsx
index 291c6610..27d49cda 100644
--- a/frontend/components/home/FlipCardQA.tsx
+++ b/frontend/components/home/FlipCardQA.tsx
@@ -9,8 +9,8 @@ import {
 } from 'framer-motion';
 import { RotateCw } from 'lucide-react';
 import Image from 'next/image';
-import { useEffect, useRef, useState } from 'react';
 import { useTranslations } from 'next-intl';
+import { useEffect, useRef, useState } from 'react';
 
 interface Question {
   id: number;
diff --git a/frontend/components/home/InteractiveCTAButton.tsx b/frontend/components/home/InteractiveCTAButton.tsx
index 5bb769df..8f276e42 100644
--- a/frontend/components/home/InteractiveCTAButton.tsx
+++ b/frontend/components/home/InteractiveCTAButton.tsx
@@ -8,7 +8,8 @@ import {
   useSpring,
 } from 'framer-motion';
 import { useTranslations } from 'next-intl';
-import React, { useRef, useState, useEffect } from 'react';
+import React, { useEffect,useRef, useState } from 'react';
+
 import { Link } from '@/i18n/routing';
 
 const MotionLink = motion(Link);
diff --git a/frontend/components/quiz/QuizzesSection.tsx b/frontend/components/quiz/QuizzesSection.tsx
index 095bd1d8..a7287104 100644
--- a/frontend/components/quiz/QuizzesSection.tsx
+++ b/frontend/components/quiz/QuizzesSection.tsx
@@ -108,10 +108,32 @@ export default function QuizzesSection({
                   </div>
                 </div>
               ) : (
-                <div className="py-12 text-center">
-                  <p className="text-gray-600 dark:text-gray-400">
-                    {t('noQuizzes')}
-                  </p>
+                <div className="py-20 text-center">
+                  {(() => {
+                    const lines = t('noQuizzes')
+                      .split('\n')
+                      .map(l => l.trim())
+                      .filter(Boolean);
+                    return (
+                      <>
+                        {lines[0] && (
+                          <p className="motion-safe:animate-fade-up text-lg font-semibold text-gray-900 motion-reduce:opacity-100 dark:text-white">
+                            {lines[0]}
+                          </p>
+                        )}
+                        {lines[1] && (
+                          <p className="motion-safe:animate-fade-up mt-2 text-gray-400 motion-safe:[animation-delay:150ms] motion-reduce:opacity-100 dark:text-gray-300">
+                            {lines[1]}
+                          </p>
+                        )}
+                        {lines[2] && (
+                          <p className="motion-safe:animate-fade-up mt-1 text-gray-500 motion-safe:[animation-delay:300ms] motion-reduce:opacity-100 dark:text-gray-400">
+                            {lines[2]}
+                          </p>
+                        )}
+                      </>
+                    );
+                  })()}
                 </div>
               )}
             </TabsContent>
diff --git a/frontend/db/queries/quizzes/admin-quiz.ts b/frontend/db/queries/quizzes/admin-quiz.ts
index 625feec8..adb6fccd 100644
--- a/frontend/db/queries/quizzes/admin-quiz.ts
+++ b/frontend/db/queries/quizzes/admin-quiz.ts
@@ -3,12 +3,12 @@ import { eq, inArray, sql } from 'drizzle-orm';
 import { db } from '../../index';
 import { categories, categoryTranslations } from '../../schema/categories';
 import {
-  quizQuestions,
-  quizTranslations,
-  quizzes,
   quizAnswers,
   quizAnswerTranslations,
   quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from '../../schema/quiz';
 
 const ADMIN_LOCALE = 'en';
diff --git a/frontend/db/seed-questions.ts b/frontend/db/seed-questions.ts
index 7f5ffd2a..2afb63ed 100644
--- a/frontend/db/seed-questions.ts
+++ b/frontend/db/seed-questions.ts
@@ -2,8 +2,8 @@ import 'dotenv/config';
 
 import { and, eq } from 'drizzle-orm';
 
-import rawData from '../parse/questions.json';
 import { invalidateAllQaCache } from '../lib/cache/qa';
+import rawData from '../parse/questions.json';
 import { db } from './index';
 import { categories, questions, questionTranslations } from './schema';
 
diff --git a/frontend/lib/quiz/quiz-answers-redis.ts b/frontend/lib/quiz/quiz-answers-redis.ts
index f99042af..79870f37 100644
--- a/frontend/lib/quiz/quiz-answers-redis.ts
+++ b/frontend/lib/quiz/quiz-answers-redis.ts
@@ -8,7 +8,7 @@ import {
   quizQuestions,
 } from '@/db/schema/quiz';
 import { getRedisClient } from '@/lib/redis';
-import type { QuizQuestionWithAnswers, AttemptReview } from '@/types/quiz';
+import type { AttemptReview,QuizQuestionWithAnswers } from '@/types/quiz';
 
 interface QuizAnswersCache {
   quizId: string;
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index d97602db..02ef7e93 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -257,7 +257,7 @@
       "start": "Start Quiz"
     },
     "section": {
-      "noQuizzes": "No quizzes in this category yet."
+      "noQuizzes": "No quizzes yet...\nBut they're already in development.\nStay tuned - new quizzes coming soon!"
     },
     "exitModal": {
       "title": "Exit Quiz?",
diff --git a/frontend/messages/pl.json b/frontend/messages/pl.json
index aed0229b..1128f899 100644
--- a/frontend/messages/pl.json
+++ b/frontend/messages/pl.json
@@ -257,7 +257,7 @@
       "start": "Rozpocznij Quiz"
     },
     "section": {
-      "noQuizzes": "Brak quizów w tej kategorii."
+      "noQuizzes": "Brak quizów na ten moment…\nAle już są w przygotowaniu.\nBądź na bieżąco - wkrótce pojawią się nowe quizy!"
     },
     "exitModal": {
       "title": "Wyjść z Quizu?",
diff --git a/frontend/messages/uk.json b/frontend/messages/uk.json
index 883b64e9..ac82cca2 100644
--- a/frontend/messages/uk.json
+++ b/frontend/messages/uk.json
@@ -257,7 +257,7 @@
       "start": "Розпочати квіз"
     },
     "section": {
-      "noQuizzes": "У цій категорії ще немає квізів."
+      "noQuizzes": "Квізів поки що немає…\nАле вони вже в розробці.\nСлідкуйте за оновленнями - скоро зʼявляться нові квізи!"
     },
     "exitModal": {
       "title": "Вийти з квізу?",