diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx
index 935add9b..002c205d 100644
--- a/src/pages/employee/EmployeeList.jsx
+++ b/src/pages/employee/EmployeeList.jsx
@@ -511,8 +511,9 @@ const EmployeeList = () => {
                         Status
                       </th>
                       <th
-                        className={`sorting_disabled  ${!Manage_Employee && "d-none"
-                          }`}
+                        className={`sorting_disabled  ${
+                          !Manage_Employee && "d-none"
+                        }`}
                         rowSpan="1"
                         colSpan="1"
                         style={{ width: "50px" }}
@@ -532,9 +533,9 @@ const EmployeeList = () => {
                     )}
                     {/* Conditional messages for no data or no search results */}
                     {!loading &&
-                      displayData?.length === 0 &&
-                      searchText &&
-                      !showAllEmployees ? (
+                    displayData?.length === 0 &&
+                    searchText &&
+                    !showAllEmployees ? (
                       <tr>
                         <td colSpan={8}>
                           <small className="muted">
@@ -544,8 +545,8 @@ const EmployeeList = () => {
                       </tr>
                     ) : null}
                     {!loading &&
-                      displayData?.length === 0 &&
-                      (!searchText || showAllEmployees) ? (
+                    displayData?.length === 0 &&
+                    (!searchText || showAllEmployees) ? (
                       <tr>
                         <td
                           colSpan={8}
@@ -570,7 +571,9 @@ const EmployeeList = () => {
                               <div className="d-flex flex-column">
                                 <a
                                   onClick={() =>
-                                    navigate(`/employee/${item.id}`)
+                                    navigate(
+                                      `/employee/${item.id}?for=attendance`
+                                    )
                                   }
                                   className="text-heading text-truncate cursor-pointer"
                                 >
@@ -637,56 +640,47 @@ const EmployeeList = () => {
                                   <i className="bx bx-dots-vertical-rounded bx-md"></i>
                                 </button>
                                 <div className="dropdown-menu dropdown-menu-end">
-                                  {/* View always visible */}
                                   <button
-                                    onClick={() => navigate(`/employee/${item.id}`)}
+                                    onClick={() =>
+                                      navigate(`/employee/${item.id}`)
+                                    }
                                     className="dropdown-item py-1"
                                   >
                                     <i className="bx bx-detail bx-sm"></i> View
                                   </button>
-
-                                  {/* If ACTIVE employee */}
-                                  {item.isActive && (
+                                  <button
+                                    className="dropdown-item py-1"
+                                    onClick={() => {
+                                      handleEmployeeModel(item.id);
+                                    }}
+                                  >
+                                    <i className="bx bx-edit bx-sm"></i> Edit
+                                  </button>
+                                  {!item.isSystem && (
                                     <>
                                       <button
                                         className="dropdown-item py-1"
-                                        onClick={() => handleEmployeeModel(item.id)}
+                                        onClick={() =>
+                                          handleOpenDelete(item.id)
+                                        }
                                       >
-                                        <i className="bx bx-edit bx-sm"></i> Edit
+                                        <i className="bx bx-task-x bx-sm"></i>{" "}
+                                        Suspend
                                       </button>
-
-                                      {/* Suspend only when active */}
-                                      {item.isActive && (
-                                        <button
-                                          className="dropdown-item py-1"
-                                          onClick={() => handleOpenDelete(item)}
-                                        >
-                                          <i className="bx bx-task-x bx-sm"></i> Suspend
-                                        </button>
-                                      )}
-
                                       <button
                                         className="dropdown-item py-1"
                                         type="button"
                                         data-bs-toggle="modal"
                                         data-bs-target="#managerole-modal"
-                                        onClick={() => setEmpForManageRole(item.id)}
+                                        onClick={() =>
+                                          setEmpForManageRole(item.id)
+                                        }
                                       >
-                                        <i className="bx bx-cog bx-sm"></i> Manage Role
+                                        <i className="bx bx-cog bx-sm"></i>{" "}
+                                        Manage Role
                                       </button>
-
                                     </>
                                   )}
-
-                                  {/* If INACTIVE employee AND inactive toggle is ON */}
-                                  {!item.isActive && showInactive && (
-                                    <button
-                                      className="dropdown-item py-1"
-                                      onClick={() => handleOpenDelete(item)}
-                                    >
-                                      <i className="bx bx-refresh bx-sm me-1"></i> Re-activate
-                                    </button>
-                                  )}
                                 </div>
                               </div>
                             </td>
@@ -703,8 +697,9 @@ const EmployeeList = () => {
                   <nav aria-label="Page">
                     <ul className="pagination pagination-sm justify-content-end py-1">
                       <li
-                        className={`page-item ${currentPage === 1 ? "disabled" : ""
-                          }`}
+                        className={`page-item ${
+                          currentPage === 1 ? "disabled" : ""
+                        }`}
                       >
                         <button
                           className="page-link btn-xs"
@@ -717,8 +712,9 @@ const EmployeeList = () => {
                       {[...Array(totalPages)]?.map((_, index) => (
                         <li
                           key={index}
-                          className={`page-item ${currentPage === index + 1 ? "active" : ""
-                            }`}
+                          className={`page-item ${
+                            currentPage === index + 1 ? "active" : ""
+                          }`}
                         >
                           <button
                             className="page-link"
@@ -730,8 +726,9 @@ const EmployeeList = () => {
                       ))}
 
                       <li
-                        className={`page-item ${currentPage === totalPages ? "disabled" : ""
-                          }`}
+                        className={`page-item ${
+                          currentPage === totalPages ? "disabled" : ""
+                        }`}
                       >
                         <button
                           className="page-link"