diff --git a/src/main/resources/templates/classrooms/new.html b/src/main/resources/templates/classrooms/new.html
index 383f3f2..bb83e4f 100644
--- a/src/main/resources/templates/classrooms/new.html
+++ b/src/main/resources/templates/classrooms/new.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:replace="~{layout :: layout('New Classroom', ~{::section} )}">
+<html th:replace="~{layout :: layout('New Classroom', ~{::section} , 'Dashboard')}">
 <head>
 </head>
 <body>
diff --git a/src/main/resources/templates/error/4xx.html b/src/main/resources/templates/error/4xx.html
index cd0ffad..77563b2 100644
--- a/src/main/resources/templates/error/4xx.html
+++ b/src/main/resources/templates/error/4xx.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:replace="~{layout :: layout('Error', ~{::section} )}">
+<html th:replace="~{layout :: layout('Error', ~{::section}, '' )}">
 <head>
 </head>
 <body>
diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html
index f38819c..1fa1171 100644
--- a/src/main/resources/templates/home.html
+++ b/src/main/resources/templates/home.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:replace="~{layout :: layout('Dashboard', ~{::section} )}">
+<html th:replace="~{layout :: layout('Dashboard', ~{::section} , 'Dashboard')}">
 <head>
 </head>
 <body>
diff --git a/src/main/resources/templates/layout.html b/src/main/resources/templates/layout.html
index 7cea209..6a2354b 100644
--- a/src/main/resources/templates/layout.html
+++ b/src/main/resources/templates/layout.html
@@ -3,7 +3,7 @@
         xmlns:th="http://www.thymeleaf.org"
         lang="en"
         class="h-full bg-gray-100"
-        th:fragment="layout (pageTitle, content)">
+        th:fragment="layout (pageTitle, content, activeMenu)">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -52,10 +52,12 @@
                                 <div class="ml-10 flex items-baseline space-x-4">
                                     <!-- Current: "bg-gray-900 text-white", Default: "text-gray-300 hover:bg-gray-700 hover:text-white" -->
                                     <a th:href="@{/}"
-                                       class="bg-gray-900 text-white rounded-md px-3 py-2 text-sm font-medium"
+                                       class="rounded-md px-3 py-2 text-sm font-medium"
+                                       th:classappend="${ activeMenu == 'Dashboard' ? 'bg-gray-900 text-white' : 'text-gray-300 hover:bg-gray-700 hover:text-white' }"
                                        aria-current="page">Dashboard</a>
                                     <a th:href="@{/quiz}"
-                                       class="text-gray-300 hover:bg-gray-700 hover:text-white rounded-md px-3 py-2 text-sm font-medium"
+                                       class="rounded-md px-3 py-2 text-sm font-medium"
+                                       th:classappend="${ activeMenu == 'Quiz' ? 'bg-gray-900 text-white' : 'text-gray-300 hover:bg-gray-700 hover:text-white' }"
                                        aria-current="page">Quiz</a>
                                 </div>
                             </div>
diff --git a/src/main/resources/templates/quiz-submitted-with-answers-correction.html b/src/main/resources/templates/quiz-submitted-with-answers-correction.html
index d63045b..910c223 100644
--- a/src/main/resources/templates/quiz-submitted-with-answers-correction.html
+++ b/src/main/resources/templates/quiz-submitted-with-answers-correction.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:replace="~{layout :: layout('Quizz', ~{::section} )}">
+<html th:replace="~{layout :: layout('Quizz', ~{::section}, 'Quiz' )}">
 <head>
 </head>
 <body>
diff --git a/src/main/resources/templates/quiz-submitted.html b/src/main/resources/templates/quiz-submitted.html
index 374eeaf..4cc56ac 100644
--- a/src/main/resources/templates/quiz-submitted.html
+++ b/src/main/resources/templates/quiz-submitted.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:replace="~{layout :: layout('Quizz', ~{::section} )}">
+<html th:replace="~{layout :: layout('Quiz', ~{::section} , 'Quiz')}">
 <head>
 </head>
 <body>
diff --git a/src/main/resources/templates/quiz.html b/src/main/resources/templates/quiz.html
index 8f5442f..b49e44f 100644
--- a/src/main/resources/templates/quiz.html
+++ b/src/main/resources/templates/quiz.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:replace="~{layout :: layout('Quizz', ~{::section} )}">
+<html th:replace="~{layout :: layout('Quiz', ~{::section} , 'Quiz')}">
 <head>
 </head>
 <body>
diff --git a/src/main/resources/templates/quiz/edit.html b/src/main/resources/templates/quiz/edit.html
index 349ad88..faac17c 100644
--- a/src/main/resources/templates/quiz/edit.html
+++ b/src/main/resources/templates/quiz/edit.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:replace="~{layout :: layout('Edit Quiz', ~{::section} )}">
+<html th:replace="~{layout :: layout('Edit Quiz', ~{::section} , 'Quiz')}">
 <head>
 </head>
 <body>
diff --git a/src/main/resources/templates/quiz/list.html b/src/main/resources/templates/quiz/list.html
index 8421c02..ec06636 100644
--- a/src/main/resources/templates/quiz/list.html
+++ b/src/main/resources/templates/quiz/list.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html th:replace="~{layout :: layout('Quiz List', ~{::div} )}">
+<html th:replace="~{layout :: layout('Quiz List', ~{::div} , 'Quiz')}">
 <body>
 
 <!--