diff --git a/quiz/views.py b/quiz/views.py
index bb4c380..8fac91d 100644
--- a/quiz/views.py
+++ b/quiz/views.py
@@ -111,10 +111,10 @@ class MCQuestionCreate(CreateView):
     form_class = MCQuestionForm
     template_name = "quiz/mcquestion_form.html"
 
-    def get_form_kwargs(self):
-        kwargs = super().get_form_kwargs()
-        kwargs["quiz"] = get_object_or_404(Quiz, id=self.kwargs["quiz_id"])
-        return kwargs
+    # def get_form_kwargs(self):
+    #     kwargs = super().get_form_kwargs()
+    #     kwargs["quiz"] = get_object_or_404(Quiz, id=self.kwargs["quiz_id"])
+    #     return kwargs
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -134,10 +134,20 @@ class MCQuestionCreate(CreateView):
         formset = context["formset"]
         if formset.is_valid():
             with transaction.atomic():
-                form.instance.quiz = get_object_or_404(Quiz, id=self.kwargs["quiz_id"])
-                self.object = form.save()
+                # Save the MCQuestion instance without committing to the database yet
+                self.object = form.save(commit=False)
+                self.object.save()
+
+                # Retrieve the Quiz instance
+                quiz = get_object_or_404(Quiz, id=self.kwargs["quiz_id"])
+
+                # set the many-to-many relationship
+                self.object.quiz.add(quiz)
+
+                # Save the formset (choices for the question)
                 formset.instance = self.object
                 formset.save()
+
                 if "another" in self.request.POST:
                     return redirect(
                         "mc_create",
diff --git a/templates/core/index.html b/templates/core/index.html
index f6a5f45..045c546 100644
--- a/templates/core/index.html
+++ b/templates/core/index.html
@@ -49,9 +49,9 @@
                         </button>
                         <div class="dropdown-menu">
                             <a class="dropdown-item" href="{% url 'edit_post' pk=item.id %}"><i
-                                    class="fas fa-pencil-alt"></i>{% trans 'Edit' %}</a>
+                                    class="unstyled me-2 fas fa-pencil-alt"></i>{% trans 'Edit' %}</a>
                             <a class="dropdown-item" href="{% url 'delete_post' pk=item.id %}"><i
-                                    class="fas fa-trash-alt"></i>{% trans 'Delete' %}</a>
+                                    class="unstyled me-2 fas fa-trash-alt"></i>{% trans 'Delete' %}</a>
                         </div>
                     </div>
                     {% endif %}
diff --git a/templates/course/course_single.html b/templates/course/course_single.html
index 27ff2c9..d261250 100644
--- a/templates/course/course_single.html
+++ b/templates/course/course_single.html
@@ -107,7 +107,7 @@
                                 <span class="text-danger">
                                     {% trans 'No video Uploaded.' %}
                                     {% if request.user.is_superuser or request.user.is_lecturer %}
-                                    <a href="{% url 'upload_video' course.slug %}">
+                                    <a href="{% url 'upload_video' course.slug %}" class="text-primary">
                                         <i class="primary" style="font-size: 22px;">
                                             {% trans 'Upload now.' %}
                                         </i>
@@ -184,7 +184,7 @@
                                 <span class="text-danger">
                                     {% trans 'No File Uploaded.' %}
                                     {% if request.user.is_superuser or request.user.is_lecturer %}
-                                    <a href="{% url 'upload_file_view' course.slug %}">
+                                    <a href="{% url 'upload_file_view' course.slug %}" class="text-primary">
                                         <i class="primary" style="font-size: 22px;">
                                             {% trans 'Upload now.' %}
                                         </i>
diff --git a/templates/course/program_single.html b/templates/course/program_single.html
index c1ae053..c04e9f8 100644
--- a/templates/course/program_single.html
+++ b/templates/course/program_single.html
@@ -95,7 +95,7 @@
                   <span class="text-danger">
                     {% trans 'No course for this progrm.' %}
                     {% if request.user.is_superuser %}
-                    <a href="{% url 'course_add' pk=program.pk %}">
+                    <a href="{% url 'course_add' pk=program.pk %}" class="text-primary">
                     <i class="primary" style="font-size: 22px;">
                         {% trans 'Add one now.' %}
                     </i>
diff --git a/templates/quiz/mcquestion_form.html b/templates/quiz/mcquestion_form.html
index a4808f2..8489716 100644
--- a/templates/quiz/mcquestion_form.html
+++ b/templates/quiz/mcquestion_form.html
@@ -52,7 +52,7 @@
                         <div class="input-group-prepend">
                             <span class="input-group-text">{{ fs.correct }} <small class="ms-1">{% trans 'Correct' %}</small></span>
                         </div>
-                        {{ fs.choice }}
+                        {{ fs.choice_text }}
                         <div class="input-group-prepend">
                             <span class="input-group-text">{{ fs.DELETE }} <small class="ms-1">{% trans 'Delete' %}</small></span>
                         </div>
diff --git a/templates/quiz/progress.html b/templates/quiz/progress.html
index 183c090..5b1971b 100644
--- a/templates/quiz/progress.html
+++ b/templates/quiz/progress.html
@@ -95,7 +95,7 @@
 </div>
   {% endif %}
   {% if not cat_scores and not exams %}
- 	<div class="col-12 p-4 text-center"><h3><i class="far fa-frown"></i></h3> {% trans 'No recordes yet. Try to do some quizzes in your course.' %}</div> 
+ 	<div class="col-12 p-4 text-center"><h3><i class="far fa-frown text-secondary"></i></h3> {% trans 'No recordes yet' %}</div> 
   {% endif %}
 
 {% endblock %}
diff --git a/templates/quiz/quiz_marking_detail.html b/templates/quiz/quiz_marking_detail.html
index 8a449e7..afaea9f 100644
--- a/templates/quiz/quiz_marking_detail.html
+++ b/templates/quiz/quiz_marking_detail.html
@@ -14,7 +14,7 @@
 	</ol>
 </nav>
 
-<div class="row col-12 justify-content-between">{{ sitting.quiz }}
+<div class="row col-12 justify-content-between">
 	<div class="header-title-md">{% trans "Quiz title" %}: {{ sitting.quiz.title }}</div>
 	<em class="info-text title-danger">{% trans "Category" %}: {{ sitting.quiz.category }}</em>
 </div>
diff --git a/templates/setting/admin_panel.html b/templates/setting/admin_panel.html
index b66a447..e9bcaef 100644
--- a/templates/setting/admin_panel.html
+++ b/templates/setting/admin_panel.html
@@ -34,17 +34,17 @@
     <div class="row">
         <div class="col-md-6">
             <div class="border-bottom">
-                {% trans 'Manage' %}<a class="link" href="{% url 'lecturer_list' %}">{% trans 'Lecturers' %} &raquo;</a>
+                {% trans 'Manage' %}<a class="link" href="{% url 'lecturer_list' %}"> {% trans 'Lecturers' %} &raquo;</a>
                 <p class="text-muted">CRUD (Create, Retrieve, Update &amp; Delete) lecturers</p>
             </div>
 
             <div class="border-bottom mt-3">
-                {% trans 'Manage' %}<a class="link" href="{% url 'student_list' %}">{% trans 'Students' %} &raquo;</a>
+                {% trans 'Manage' %}<a class="link" href="{% url 'student_list' %}"> {% trans 'Students' %} &raquo;</a>
             <p class="text-muted">CRUD (Create, Retrieve, Update &amp; Delete) {% trans 'students' %}</p>
             </div>
 
             <div class="border-bottom mt-3">
-                {% trans 'Manage' %}<a class="link" href="{% url 'session_list' %}">{% trans 'Session' %} &raquo;</a>
+                {% trans 'Manage' %}<a class="link" href="{% url 'session_list' %}"> {% trans 'Session' %} &raquo;</a>
             <p class="text-muted">CRUD (Create, Retrieve, Update &amp; Delete) {% trans 'sessions' %}</p>
             </div>
 
diff --git a/templates/sidebar.html b/templates/sidebar.html
index e8df7ae..fe2558d 100644
--- a/templates/sidebar.html
+++ b/templates/sidebar.html
@@ -108,7 +108,7 @@
 			</li>
 			{% endif %}
 			<br />
-			<p class="ml-3">&RightArrow; Others</p>
+			<p class="ms-3 text-secondary">&RightArrow; Others</p>
 			<li class="{% if request.path == ep %}active{% endif %}">
 				<a href="{% url 'edit_profile' %}"><i class="fas fa-cogs"></i>{% trans 'Account Setting' %}</a>
 			</li>