diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx
index ad54ce20..be586d18 100644
--- a/src/pages/employee/EmployeeList.jsx
+++ b/src/pages/employee/EmployeeList.jsx
@@ -176,12 +176,10 @@ const EmployeeList = () => {
   useEffect(() => {
     if (!loading && Array.isArray(employees)) {
       const sorted = [...employees].sort((a, b) => {
-        const nameA = `${a.firstName || ""}${a.middleName || ""}${
-          a.lastName || ""
-        }`.toLowerCase();
-        const nameB = `${b.firstName || ""}${b.middleName || ""}${
-          b.lastName || ""
-        }`.toLowerCase();
+        const nameA = `${a.firstName || ""}${a.middleName || ""}${a.lastName || ""
+          }`.toLowerCase();
+        const nameB = `${b.firstName || ""}${b.middleName || ""}${b.lastName || ""
+          }`.toLowerCase();
         return nameA?.localeCompare(nameB);
       });
 
@@ -503,9 +501,8 @@ 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" }}
@@ -525,9 +522,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">
@@ -537,8 +534,8 @@ const EmployeeList = () => {
                       </tr>
                     ) : null}
                     {!loading &&
-                    displayData?.length === 0 &&
-                    (!searchText || showAllEmployees) ? (
+                      displayData?.length === 0 &&
+                      (!searchText || showAllEmployees) ? (
                       <tr>
                         <td
                           colSpan={8}
@@ -630,47 +627,55 @@ 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>
-                                  <button
-                                    className="dropdown-item py-1"
-                                    onClick={() => {
-                                      handleEmployeeModel(item.id);
-                                    }}
-                                  >
-                                    <i className="bx bx-edit bx-sm"></i> Edit
-                                  </button>
-                                  {!item.isSystem && (
+
+                                  {/* If ACTIVE employee */}
+                                  {item.isActive && (
                                     <>
                                       <button
                                         className="dropdown-item py-1"
-                                        onClick={() =>
-                                          handleOpenDelete(item.id)
-                                        }
+                                        onClick={() => handleEmployeeModel(item.id)}
                                       >
-                                        <i className="bx bx-task-x bx-sm"></i>{" "}
-                                        Suspend
+                                        <i className="bx bx-edit bx-sm"></i> Edit
                                       </button>
+                                      
+                                      {/* Suspend only when active */}
+                                      <button
+                                        className="dropdown-item py-1"
+                                        onClick={() => handleOpenDelete(item.id)}
+                                      >
+                                        <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.id)}
+                                    >
+                                      <i className="bx bx-refresh bx-sm me-1"></i>
+                                      Re-activate
+                                    </button>
+                                  )}
                                 </div>
                               </div>
                             </td>
@@ -687,9 +692,8 @@ 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"
@@ -702,9 +706,8 @@ 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"
@@ -716,9 +719,8 @@ const EmployeeList = () => {
                       ))}
 
                       <li
-                        className={`page-item ${
-                          currentPage === totalPages ? "disabled" : ""
-                        }`}
+                        className={`page-item ${currentPage === totalPages ? "disabled" : ""
+                          }`}
                       >
                         <button
                           className="page-link"