diff --git a/app/Views/DashBoard.php b/app/Views/DashBoard.php
index b0cefc4e..b9e1294c 100755
--- a/app/Views/DashBoard.php
+++ b/app/Views/DashBoard.php
@@ -193,6 +193,10 @@
         min-height: 70vh !important;
     }
 
+    .active{
+        color : white !important ;
+    }
+
 
 </style>
 
@@ -212,12 +216,12 @@
 
                          <li class="nav-item d-flex justify-content-center align-items-center"> 
                             <a  href="#pending-actions-dash-tab" data-toggle="tab" aria-expanded="false"
-                                class="nav-link px-3 py-1 " id="pending_actions_tab">
+                                class="nav-link px-3 py-1 dash-anchor" id="pending_actions_tab">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/inactive_pending_actions.png" alt="Logo" height="14" class="inactive_pending" >
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_pending_actions.png" alt="Logo" height="14" 
                                 class="active_pending" style="display:none;">
                                 &nbsp;&nbsp;
-                                <span class="d-none d-sm-inline-block">Pending Actions</span>
+                                <span class="d-none d-sm-inline-block dash-tab">Pending Actions</span>
                             </a>
                         </li>
                         &nbsp;&nbsp;&nbsp;&nbsp;
@@ -226,12 +230,12 @@
                     <?php if(in_array(get_role_id(), [1,2,3,5]) || (get_role_id() == 4 && in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
 
                          <li class="nav-item d-flex justify-content-center align-items-center">
-                            <a href="#bds-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1" id="bds_tab">
+                            <a href="#bds-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor" id="bds_tab">
                                  <img src="<?= base_url() . "public"; ?>/assets/images/inactive_bds.png" alt="Logo" height="14" class="inactive_bds">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_bds.png" alt="Logo" height="14" 
-                                class="active_bds" style="display:none;">
+                                class="active_bds " style="display:none;">
                                     &nbsp;&nbsp;
-                                <span class="d-none d-sm-inline-block">BDS</span>
+                                <span class="d-none d-sm-inline-block dash-tab">BDS</span>
                             </a>
                         </li>
                          &nbsp;&nbsp;&nbsp;&nbsp;
@@ -242,12 +246,12 @@
                             $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team()) ? 'active show' : '';
                         ?>
                     <li class="nav-item d-flex justify-content-center align-items-center">
-                        <a  href="#claims-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1"  id="claims_tab">
+                        <a  href="#claims-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor"  id="claims_tab">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/inactive_claims.png" alt="Logo" height="14" class="inactive_claims">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_claims.png" alt="Logo" height="14" 
-                                 class="active_claims" style="display:none;">
+                                 class="active_claims " style="display:none;">
                                     &nbsp;&nbsp;
-                            <span class="d-none d-sm-inline-block">Claims</span>
+                            <span class="d-none d-sm-inline-block dash-tab">Claims</span>
                         </a>
                     </li>
                      &nbsp;&nbsp;&nbsp;&nbsp;
@@ -256,13 +260,13 @@
                         <?php
                             $isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID,user_team()) ? 'active show' : '';
                         ?>
-                    <li class="nav-item d-flex justify-content-center align-items-center">
-                        <a  href="#leads-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1"  id="leads_tab" >
+                    <li class="nav-item d-flex justify-content-center align-items-center ">
+                        <a  href="#leads-dash-tab " data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor"  id="leads_tab" >
                                  <img src="<?= base_url() . "public"; ?>/assets/images/inactive_leads_and_bds_renewal.png" alt="Logo" height="14" class="inactive_leads">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_leads_and_bds_renewal.png" alt="Logo" height="14" 
-                                class="active_leads" style="display:none;">
+                                class="active_leads " style="display:none;">
                                     &nbsp;&nbsp;
-                            <span class="d-none d-sm-inline-block">Leads and BDS Renewals</span>
+                            <span class="d-none d-sm-inline-block dash-tab">Leads and BDS Renewals</span>
                         </a>
                     </li>
              &nbsp;&nbsp;&nbsp;&nbsp;
@@ -375,3 +379,20 @@ $(document).ready(function(){
 });
 </script>
 
+<script>
+
+// $(document).on('click', '.dash-anchor', function () {
+//     console.log("clicked dynamic", this);
+
+//     // remove active class from all tabs
+//     $('.dash-tab').removeClass('active');
+
+//     // add active only to the clicked one's child span
+//     $(this).find('.dash-tab').addClass('active');
+// });
+
+
+
+
+</script>
+
diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index e8452cd0..5f8d59f2 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -538,9 +538,6 @@ table.dataTable tbody td {
                     attr: {
                         id: 'btnAdd',
                         title: 'Add'
-                    },
-                    action: function () {
-                        $('#con-close-modal').modal('show');
                     }
                 }
 
@@ -565,14 +562,6 @@ table.dataTable tbody td {
         });
         
 
-        $('#btnAdd').click(function(){
-            $('#first_name').val('');
-            $('#last_name').val('');
-            $('#email').val('');
-            $('#mobile').val('');
-            $('#emp_code').val('');        
-            $('#UserForm').attr('action', '<?php echo base_url('/user/create');?>');     
-        })    
 
 
         $('.close').click(function(){
@@ -839,3 +828,17 @@ table.dataTable tbody td {
     }
 </script>
 
+<script>
+    $(document).on('click', '#btnAdd', function(){
+        $('#first_name').val('');
+        $('#last_name').val('');
+        $('#email').val('');
+        $('#mobile').val('');
+        $('#emp_code').val('');        
+        $('#UserForm').attr('action', '<?php echo base_url('/user/create');?>');    
+        let myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));
+        myModal.show();  // open modal
+
+    });
+
+</script>
\ No newline at end of file
diff --git a/app/Views/enrollment_list.php b/app/Views/enrollment_list.php
index 598c5062..96da7591 100755
--- a/app/Views/enrollment_list.php
+++ b/app/Views/enrollment_list.php
@@ -454,13 +454,13 @@
             buttons: [
                 {
                     extend: 'copy',
-                    text: '<i class="fa fa-copy"></i>',
+                    text: '<i class="mdi mdi-content-copy"></i>',
                     titleAttr: 'Copy',
                     filename: 'Enrolment List'
                 },
                 {
                     extend: 'print',
-                    text: '<i class="fa fa-print"></i>',
+                    text: '<i class="mdi mdi-printer"></i>',
                     titleAttr: 'Print',
                     filename: 'Enrolment List'
                 },
@@ -472,7 +472,7 @@
                 },
                 {
                     extend: 'csv',
-                    text: '<i class="mdi mdi-file-csv"></i>',
+                    text: '<i class="mdi mdi-file-document"></i>',
                     titleAttr: 'CSV',
                     filename: 'Enrolment List'
                 }
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index f148d77b..0fedd6a5 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -429,7 +429,6 @@
 
         .search-bar input {
             width: 100%;
-            padding-right: 40px; /* make space for the button */
             border-radius: 10px !important;
             background-color: #F4F4F4;
             box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.1), 0px 4px 8px rgba(0, 0, 0, 0.2);