diff --git a/assets/script.js b/assets/script.js
index 59854d6..68b1870 100644
--- a/assets/script.js
+++ b/assets/script.js
@@ -22,40 +22,27 @@ function answer(el, correct) {
 (function () {
   var NOTICE_ID = "quiz-mode-notice";
   var STORAGE_KEY = "quiz-mode-enabled";
-  var QUIZ_CLASS = "quiz-mode-active";
-  var HAS_Q_CLASS = "quiz-has-questions";
+  var QUIZ_ATTR = "data-quiz-mode";
+  var HAS_Q_ATTR = "data-quiz-has-questions";
 
   function pageHasQuestions() {
     return document.querySelector(".course .question") !== null;
   }
 
-  function tagSectionTail() {
-    var course = document.querySelector(".course");
-    if (!course) return false;
-    var tagged = course.querySelectorAll("[data-quiz-tail]");
-    for (var i = 0; i < tagged.length; i++) {
-      tagged[i].removeAttribute("data-quiz-tail");
-    }
-    var children = course.children;
-    for (var j = 0; j < children.length; j++) {
-      var child = children[j];
-      if (child.tagName !== "DIV") continue;
-      var text = (child.textContent || "").toLowerCase();
-      if (text.indexOf("weiter zum nächsten abschnitt") !== -1 ||
-          text.indexOf("weiter zum nächsten kapitel") !== -1) {
-        child.setAttribute("data-quiz-tail", "");
-        return true;
-      }
-    }
-    return false;
-  }
-
   function showNotice(text) {
     var n = document.getElementById(NOTICE_ID);
     if (!n) {
       n = document.createElement("div");
       n.id = NOTICE_ID;
-      document.body.appendChild(n);
+      n.className = "alert alert-info";
+      n.setAttribute("role", "alert");
+      n.style.clear = "both";
+      var course = document.querySelector(".course");
+      if (course) {
+        course.insertBefore(n, course.firstChild);
+      } else {
+        document.body.appendChild(n);
+      }
     }
     n.textContent = text;
   }
@@ -67,15 +54,17 @@ function answer(el, correct) {
 
   function updateButton(btn, on) {
     btn.setAttribute("aria-pressed", on ? "true" : "false");
-    btn.classList.toggle("active", on);
+    btn.classList.toggle("btn-primary", on);
+    btn.classList.toggle("btn-secondary", !on);
     btn.title = on ? "Alles anzeigen" : "Nur Fragen anzeigen";
   }
 
   function setQuizMode(on) {
     var hasQ = pageHasQuestions();
-    document.body.classList.toggle(HAS_Q_CLASS, hasQ);
-    if (on && hasQ) tagSectionTail();
-    document.body.classList.toggle(QUIZ_CLASS, on);
+    if (hasQ) document.body.setAttribute(HAS_Q_ATTR, "");
+    else document.body.removeAttribute(HAS_Q_ATTR);
+    if (on) document.body.setAttribute(QUIZ_ATTR, "");
+    else document.body.removeAttribute(QUIZ_ATTR);
     var btn = document.getElementById("quiz-mode-toggle");
     if (btn) updateButton(btn, on);
     if (on && !hasQ) {
@@ -89,7 +78,7 @@ function answer(el, correct) {
     var btn = document.getElementById("quiz-mode-toggle");
     if (!btn) return;
     btn.addEventListener("click", function () {
-      var next = !document.body.classList.contains(QUIZ_CLASS);
+      var next = !document.body.hasAttribute(QUIZ_ATTR);
       setQuizMode(next);
       try { localStorage.setItem(STORAGE_KEY, next ? "1" : "0"); } catch (e) {}
     });
diff --git a/assets/style-course.css b/assets/style-course.css
index 6a31f23..ee2c628 100644
--- a/assets/style-course.css
+++ b/assets/style-course.css
@@ -448,41 +448,9 @@ span.formula {
 }
 
 /* Quiz-Modus */
-#quiz-mode-toggle {
-  cursor: pointer;
-}
-#quiz-mode-toggle.active {
-  background: #0a7a2a;
-  border-color: #0a7a2a;
-  color: #fff;
-}
-#quiz-mode-toggle.active svg {
-  fill: #fff;
-}
-
-#quiz-mode-notice {
-  position: fixed;
-  top: 12px;
-  right: 12px;
-  z-index: 99999;
-  max-width: 260px;
-  padding: 8px 12px;
-  font: 500 13px/1.35 system-ui, -apple-system, sans-serif;
-  color: #333;
-  background: #fff3cd;
-  border: 1px solid #ffe69c;
-  border-radius: 6px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
-}
-
-body.quiz-mode-active.quiz-has-questions .course > * {
+body[data-quiz-mode][data-quiz-has-questions] .course > * {
   display: none !important;
 }
-body.quiz-mode-active.quiz-has-questions .course > .course-toolbar,
-body.quiz-mode-active.quiz-has-questions .course > h1,
-body.quiz-mode-active.quiz-has-questions .course > nav,
-body.quiz-mode-active.quiz-has-questions .course > .question,
-body.quiz-mode-active.quiz-has-questions .course > [data-quiz-tail],
-body.quiz-mode-active.quiz-has-questions .course > [data-quiz-tail] ~ * {
+body[data-quiz-mode][data-quiz-has-questions] .course > [data-quiz-shown] {
   display: revert !important;
 }
diff --git a/templates/html/chapter.html b/templates/html/chapter.html
index 665c794..d969ca9 100644
--- a/templates/html/chapter.html
+++ b/templates/html/chapter.html
@@ -1,4 +1,4 @@
-<div class="course-toolbar" style="float: right;">
+<div class="course-toolbar" style="float: right;" data-quiz-shown>
   <div class="btn-group" role="group">
     {% if chapter["video_url"] %}
       <a class="btn btn-secondary" href="{{ chapter["video_url"] }}" title="Video öffnen" target="_blank"><svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"></path><path d="M21 3H3c-1.11 0-2 .89-2 2v12c0 1.1.89 2 2 2h5v2h8v-2h5c1.1 0 1.99-.9 1.99-2L23 5c0-1.11-.9-2-2-2zm0 14H3V5h18v12zm-5-6l-7 4V7z"></path></svg></a>
@@ -9,7 +9,7 @@
   </div>
 </div>
 
-<nav aria-label="breadcrumb">
+<nav aria-label="breadcrumb" data-quiz-shown>
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="index.html">Home</a></li>
     <li class="breadcrumb-item"><a href="{{ edition }}_course_index.html">{{ name }}</a></li>
@@ -17,7 +17,7 @@
   </ol>
 </nav>
 
-<h1>{{ chapter["title"] }}</h1>
+<h1 data-quiz-shown>{{ chapter["title"] }}</h1>
 <p>{{ chapter["abstract"] }}</p>
 <div class="chapter-toc d-grid gap-2">
     {% for section in chapter["sections"] %}
diff --git a/templates/html/next_chapter.html b/templates/html/next_chapter.html
index 1febff7..2cc7759 100644
--- a/templates/html/next_chapter.html
+++ b/templates/html/next_chapter.html
@@ -1,4 +1,4 @@
 <br/>
-<div>
+<div data-quiz-shown>
 	Weiter zum nächsten Kapitel: <a href="{{ url }}">{{ title }}</a>
 </div>
diff --git a/templates/html/next_section.html b/templates/html/next_section.html
index f5a213a..efc6da4 100644
--- a/templates/html/next_section.html
+++ b/templates/html/next_section.html
@@ -1,4 +1,4 @@
 <br/>
-<div>
+<div data-quiz-shown>
 	Weiter zum nächsten Abschnitt: <a href="{{ url }}">{{ title }}</a>
 </div>
diff --git a/templates/html/question.html b/templates/html/question.html
index bb613b8..da63683 100644
--- a/templates/html/question.html
+++ b/templates/html/question.html
@@ -1,4 +1,4 @@
-<div class="question layout-{{ layout }}" id="{{ number }}">
+<div class="question layout-{{ layout }}" id="{{ number }}" data-quiz-shown>
   <div class="question-text">
     {{ number }}: {{ question }}
   </div>
@@ -23,7 +23,7 @@
     {% endfor %}
   </div>
 </div>
-<div class="solution">
+<div class="solution" data-quiz-shown>
   {% if has_solution %}
     <a class="btn btn-warning btn-sm d-inline-flex align-items-center" href="{{ number }}.html" aria-label="Lösungshinweis zu Frage {{ number }}" title="Lösungshinweis">
       <svg class="solution-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640" fill="currentColor" aria-hidden="true" focusable="false">
diff --git a/templates/html/section.html b/templates/html/section.html
index 640cf4e..bd7a279 100644
--- a/templates/html/section.html
+++ b/templates/html/section.html
@@ -1,4 +1,4 @@
-<div class="course-toolbar" style="float: right;">
+<div class="course-toolbar" style="float: right;" data-quiz-shown>
   <div class="btn-group" role="group">
     {% if section["video_url"] %}
       <a class="btn btn-secondary" href="{{ section["video_url"] }}" title="Video öffnen" target="_blank"><svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"></path><path d="M21 3H3c-1.11 0-2 .89-2 2v12c0 1.1.89 2 2 2h5v2h8v-2h5c1.1 0 1.99-.9 1.99-2L23 5c0-1.11-.9-2-2-2zm0 14H3V5h18v12zm-5-6l-7 4V7z"></path></svg></a>
@@ -9,7 +9,7 @@
   </div>
 </div>
 
-<nav aria-label="breadcrumb">
+<nav aria-label="breadcrumb" data-quiz-shown>
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="index.html">Home</a></li>
     <li class="breadcrumb-item"><a href="{{ edition }}_course_index.html">{{ name }}</a></li>
@@ -18,7 +18,7 @@
   </ol>
 </nav>
 
-<h1>{{ section["title"] }}</h1>
+<h1 data-quiz-shown>{{ section["title"] }}</h1>
 
 <a id="margin_0"></a>
 {{ section["content"] }}
\ No newline at end of file