diff --git a/templates/course/course_single.html b/templates/course/course_single.html
index 43057a4..bc1adf7 100644
--- a/templates/course/course_single.html
+++ b/templates/course/course_single.html
@@ -13,8 +13,8 @@
     </div>
 
     <div class="manage-wrap">
-        <div class="row">
-            <div class="col ml-auto">
+        <div class="d-flex">
+            <div class="">
                 {% if request.user.is_superuser or request.user.is_lecturer %}
                 <a class="btn btn-primary" href="{% url 'upload_file_view' course.slug %}"><i class="fas fa-plus"></i>
                     Upload new file
@@ -24,7 +24,7 @@
                 </a>
                 {% endif %}
             </div>
-            <div class="col text-right">
+            <div class="ms-auto">
                 <a class="btn btn-warning" href="{% url 'quiz_index' course.slug %}"><i class="fas fa-list"></i>
                     Take a Quiz
                 </a>
@@ -105,8 +105,8 @@
                                 </div>
                             </td>
                             {% endif %}
-
-                            {% empty %}
+                        </tr>
+                        {% empty %}
                         <tr>
                             <td></td>
                             <td></td>
@@ -183,8 +183,8 @@
                                 </div>
                             </td>
                             {% endif %}
-
-                            {% empty %}
+                        </tr>
+                        {% empty %}
                         <tr>
                             <td></td>
                             <td></td>
@@ -213,7 +213,7 @@
 
 </div>
 
-<div class="site-section">
+<div class="site-section mb-5">
     <div class="title-1">Instructor(s)</div>
     <br>
     <div class="container marketing">
@@ -237,6 +237,8 @@
                 </p>
                 <!-- <p><a class="btn btn-secondary" href="#" role="button">View details &raquo;</a></p> -->
             </div>
+            {% empty %}
+            <h6 class="text-muted mt-3">No lecturer assigned for this course</h6>
             {% endfor %}
 
         </div>
diff --git a/templates/course/program_single.html b/templates/course/program_single.html
index 819125b..ad29b9a 100644
--- a/templates/course/program_single.html
+++ b/templates/course/program_single.html
@@ -86,12 +86,12 @@
                     </th>
                     {% if request.user.is_superuser %}
                     <td>
-                        <div class="dropdown">
-                            <button class="btn btn-sm" type="button" data-bs-toggle="dropdown"
-                                aria-haspopup="true" aria-expanded="false">
-                                <i class="fas fa-ellipsis-v"></i>
+                        <div class="dropstart">
+                            <button class="btn btn-sm" type="button" data-bs-toggle="dropdown" 
+                            data-bs-boundary="window" aria-haspopup="true" aria-expanded="false">
+                                <i class="fas fa-ellipsis-v m-0"></i>
                             </button>
-                            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
+                            <div class="dropdown-menu">
                                 <a class="dropdown-item" href="{% url 'edit_course' slug=course.slug %}">
                                     <i class="fas fa-pencil-alt"></i> Edit
                                 </a>
diff --git a/templates/quiz/quiz_list.html b/templates/quiz/quiz_list.html
index 346aa49..f167f02 100644
--- a/templates/quiz/quiz_list.html
+++ b/templates/quiz/quiz_list.html
@@ -59,11 +59,11 @@
                     <small class="col-6 text-right">Time set: <b>1:30</b></small>
                 </div> -->
                 <div class="d-flex">
-                    <a class="btn btn-block btn-secondary" href="{% url 'quiz_take' pk=course.pk slug=quiz.slug %}">{% trans "Start quiz" %} &raquo;</a>
+                    <a class="btn btn-block btn-secondary w-100" href="{% url 'quiz_take' pk=course.pk slug=quiz.slug %}">{% trans "Start quiz" %} &raquo;</a>
 
                     {% if request.user.is_superuser or request.user.is_lecturer %}
-                        <li class="dropdown">
-                            <a class="btn btn-default bg-light ml-2" href="#" id="dropdown01" data-toggle="dropdown"><i class="fas fa-ellipsis-v m-0"></i></a>
+                        <li class="dropup">
+                            <button class="btn btn-default bg-light ms-2" type="button" data-bs-toggle="dropdown"><i class="fas fa-ellipsis-v m-0"></i></button>
                             <div class="dropdown-menu dropdown-menu-top-left" aria-labelledby="dropdown01">
                                 <a href="{% url 'quiz_update' slug=course.slug pk=quiz.id %}" class="update"><i class="fas fa-pencil-alt"></i> Edit</a>
                                 <a href="{% url 'quiz_delete' slug=course.slug pk=quiz.id %}" class="delete"><i class="fas fa-trash-alt"></i> Delete</a>