diff --git a/csc/templates/csc/sidebar.html b/csc/templates/csc/sidebar.html
index ca7ce80..ccaa6fb 100644
--- a/csc/templates/csc/sidebar.html
+++ b/csc/templates/csc/sidebar.html
@@ -90,7 +90,7 @@ <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-
         </h6>
         
         <li class="nav-item">
-            <a class="dropdown-item" href="{% url 'csc:invi_dashboard' %}"><i class="fas fa-user-tag sb-icon"></i>Invigilator Dashboard</a>
+            <a class="dropdown-item" href="{{ request.scheme }}://{{request.get_host}}/csc/invigilator_dashboard/"><i class="fas fa-user-tag sb-icon"></i>Invigilator Dashboard</a>
             <a class="nav-link scroll_link " href="{% url 'home' %}"><i class="fas fa-home sb-icon" ></i>Home<span class="sr-only">(current)</span></a>
         </li>
 
diff --git a/csc/templates/csc/student_dashboard.html b/csc/templates/csc/student_dashboard.html
index 97875f2..e122d5d 100644
--- a/csc/templates/csc/student_dashboard.html
+++ b/csc/templates/csc/student_dashboard.html
@@ -225,7 +225,7 @@
                                     {% if attendance.status == 1%}
                                       <input type="hidden" id="testurl{{course.mdlcourse_id}}" name="testurl" value="{{ CSC_ONLINE_TEST_URL }}/course/view.php?id={{course.mdlcourse_id}}">
 
-                                      <button class="btn btn-info" type="button" onclick="take_to_test({{course.mdlcourse_id}});">
+                                      <button class="btn btn-outline-info btn-sm " type="button" onclick="take_to_test({{course.mdlcourse_id}});">
                                       Attempt {{course.testfoss.foss}} Test
                                       </button>
                                     {% elif attendance.status >= 3%}
@@ -242,7 +242,7 @@
                                                 <span class="badge">Grade: {{grade_entry.mdlgrade}} </span></button>
 
                                             {% elif grade_entry.status == 3 and not student.id|is_retest_allowed:course.testfoss_id  %}
-                                                <button type="button"  class="btn btn-warning" >Test attempts over &nbsp;
+                                                <button type="button"  class="btn btn-warning" >No more attempts left&nbsp;
                                                 <span class="badge">Grade: {{grade_entry.mdlgrade}} </span></button>
                                             {% endif %}
                                         
@@ -309,7 +309,7 @@
                                     {% if attendance.status == 1%}
                                       <input type="hidden" id="testurl{{course.mdlcourse_id}}" name="testurl" value="{{ CSC_ONLINE_TEST_URL }}/course/view.php?id={{course.mdlcourse_id}}">
 
-                                      <button class="btn btn-info" type="button" onclick="take_to_test({{course.mdlcourse_id}});">
+                                      <button class="btn btn-outline-info btn-sm " type="button" onclick="take_to_test({{course.mdlcourse_id}});">
                                       Attempt {{course.testfoss.foss}} Test
                                       </button>
                                     {% elif attendance.status >= 3%}
@@ -323,7 +323,7 @@
                                                 <span class="badge">Grade: {{grade_entry.mdlgrade}} </span></button>
 
                                             {% elif grade_entry.status == 3 and not student.id|is_retest_allowed:course.testfoss_id  %}
-                                                <button type="button"  class="btn btn-warning" >Test attempts over &nbsp;
+                                                <button type="button"  class="btn btn-warning" >No more attempts left
                                                 <span class="badge">Grade: {{grade_entry.mdlgrade}} </span></button>
                                             {% endif %}
 
diff --git a/csc/templates/csc/test_assign.html b/csc/templates/csc/test_assign.html
index a2fc725..4502868 100644
--- a/csc/templates/csc/test_assign.html
+++ b/csc/templates/csc/test_assign.html
@@ -67,8 +67,13 @@
                             <tr>
                                 <td>
                                     <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" value="{{student.user.email}}" id="flexCheckDefault" name="students" {% if student.assigned %}checked{% endif %} {% if student.ineligible %}disabled{% endif %} {% if student.test_taken %}disabled{% endif %}>
-                                        <label class="form-check-label" for="flexCheckDefault"></label>
+                                        <input class="form-check-input" type="checkbox" value="{{student.user.email}}" id="flexCheckDefault" name="students" 
+                                        {% if student.assigned %}checked{% endif %} 
+                                        {% if student.ineligible %}disabled{% endif %} 
+                                        {% if student.test_taken %}disabled{% endif %}
+                                        
+                                        >
+                                        <label class="form-check-label" for="flexCheckDefault">{% if student.retest %}(Retest Request){% endif %}</label>
                                       </div>
                                 </td>
                                 <td>{{student.user.get_full_name|title}}</td>
diff --git a/csc/utils.py b/csc/utils.py
index 4083d91..133f42f 100644
--- a/csc/utils.py
+++ b/csc/utils.py
@@ -146,7 +146,12 @@ def get_valid_students_for_test(vle,test):
         fosses.append(item.testfoss)
         fosses.append(item.foss)
     other_tests = Test.objects.filter(foss__in=fosses).exclude(id=test.id)
-    students = Student.objects.filter(vle_id=vle.id,student_foss__csc_foss_id__in=fosses,student_foss__foss_start_date__lte=datetime.date.today()-timedelta(days=10)).annotate(assigned=Exists(CSCTestAtttendance.objects.filter(student_id=OuterRef('id'),test=test))).annotate(ineligible=Exists(CSCTestAtttendance.objects.filter(student_id=OuterRef('id'),test__in=other_tests))).annotate(test_taken=Exists(CSCTestAtttendance.objects.filter(student_id=OuterRef('id'),test=test,status=TEST_COMPLETED_BY_STUDENT))).distinct()
+    all_tests = Test.objects.filter(foss__in=fosses)
+    students = Student.objects.filter(vle_id=vle.id,student_foss__csc_foss_id__in=fosses,student_foss__foss_start_date__lte=datetime.date.today()-timedelta(days=10)).annotate(
+        assigned=Exists(CSCTestAtttendance.objects.filter(~Q(status=RETEST),student_id=OuterRef('id'),test=test))).annotate(
+        ineligible=Exists(CSCTestAtttendance.objects.filter(student_id=OuterRef('id'),test__in=other_tests))).annotate(
+            test_taken=Exists(CSCTestAtttendance.objects.filter(student_id=OuterRef('id'),test=test,status=TEST_COMPLETED_BY_STUDENT))).annotate(
+                retest=Exists(CSCTestAtttendance.objects.filter(student_id=OuterRef('id'),test__in=all_tests,status=RETEST))).distinct()
     
     return students
 
diff --git a/csc/vle_views.py b/csc/vle_views.py
index 56e3494..948fd45 100644
--- a/csc/vle_views.py
+++ b/csc/vle_views.py
@@ -630,15 +630,15 @@ def test_assign(request):
           print(e)
         try:
           ta = CSCTestAtttendance.objects.create(test=test,student=student,mdluser_id=mdluser.id,mdlcourse_id=mdlcourse_id,status=0,mdlquiz_id=mdlquiz_id)
-          print("************* 4F")
         except IntegrityError as e:
           print(e)
-          print("************* 5F")
-          print('test: ',test.id)
-          ta= CSCTestAtttendance.objects.get(test=test,student=student,mdluser_id=mdluser.id,mdlcourse_id=mdlcourse_id,status=4,mdlquiz_id=mdlquiz_id)
-          ta.status=0
-          ta.attempts=ta.attempts+1
-          ta.save()
+          try:
+            ta= CSCTestAtttendance.objects.get(test=test,student=student,mdluser_id=mdluser.id,mdlcourse_id=mdlcourse_id,status=4,mdlquiz_id=mdlquiz_id)
+            ta.status=0
+            ta.attempts=ta.attempts+1
+            ta.save()
+          except CSCTestAtttendance.DoesNotExist as e:
+            pass
       if request.POST.get('action_type') == 'add_students':
         nta = CSCTestAtttendance.objects.filter(test=test,status=TEST_OPEN).exclude(student__user__email__in=assigned_students)
         for item in nta:
@@ -646,6 +646,7 @@ def test_assign(request):
       else:
         print(f"\n\n action type is NOT add_students **************************** ")
       messages.add_message(request,messages.SUCCESS,f'Test assigned to the students.')
+      
     except Exception as e:
       print(e)
       messages.error(request,"No test in moodle for the selected foss.Please contact support.")
diff --git a/spoken/templates/spoken/base.html b/spoken/templates/spoken/base.html
index 47c8b02..e47ed0b 100644
--- a/spoken/templates/spoken/base.html
+++ b/spoken/templates/spoken/base.html
@@ -59,7 +59,7 @@
 
 
 			{% if request.user|has_group:"INVIGILATOR" %}
-			<a class="dropdown-item" href="{% url 'csc:invi_dashboard' %}">INVIGILATOR Dashboard</a>
+			<a class="dropdown-item" href="{{ request.scheme }}://{{request.get_host}}{% url 'csc:invi_dashboard'%}">INVIGILATOR Dashboard</a>
 			{% endif %}