diff --git a/src/pages/Directory/Directory.jsx b/src/pages/Directory/Directory.jsx
index 3b3f4671..05f465c9 100644
--- a/src/pages/Directory/Directory.jsx
+++ b/src/pages/Directory/Directory.jsx
@@ -39,6 +39,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
   const [openBucketModal, setOpenBucketModal] = useState(false);
   const [notes, setNotes] = useState([]);
   const [filterAppliedNotes, setFilterAppliedNotes] = useState([]);
+  const [filterAppliedNotes, setFilterAppliedNotes] = useState([]);
   // const [selectedOrgs, setSelectedOrgs] = useState([]);
 
   // ✅ Changed to an array for multiple selections
@@ -354,6 +355,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
             contactsToExport={contacts}
             notesToExport={notes}
             selectedNoteNames={selectedNoteNames}
+            selectedNoteNames={selectedNoteNames}
             setSelectedNoteNames={setSelectedNoteNames}
             notesForFilter={notes}
             setFilterAppliedNotes={setFilterAppliedNotes}
@@ -361,97 +363,75 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
         </div>
       </div>
       <div className="card-minHeight mt-0">
-        {/* LIST VIEW */}
-        {viewType === "list" && (
-          <div className="card cursor-pointer mt-3">
-            <div className="card-body p-2 pb-1" style={{ minHeight: "200px" }}>
+        {/* Loader when switching between Active/Pending or filtering */}
+        {loading && (
+          <div className="d-flex justify-content-center align-items-center py-5">
+            <div className="spinner-border text-primary" role="status">
+              <span className="visually-hidden">Loading...</span>
+            </div>
+          </div>
+        )}
+
+        {/* Empty state messages */}
+        {!loading && (viewType === "card" || viewType === "list") && (
+          <div className="d-flex flex-column justify-content-center align-items-center text-center">
+            {contacts?.length === 0 && (
+              <p className="mt-10">No contact found</p>
+            )}
+            {contacts?.length > 0 && currentItems.length === 0 && (
+              <p className="mt-10">No matching contact found</p>
+            )}
+          </div>
+        )}
+
+        {/* List View */}
+        {!loading && viewType === "list" && currentItems.length > 0 && (
+          <div className="card cursor-pointer mt-5">
+            <div className="card-body p-2 pb-1">
               <DirectoryListTableHeader>
-                {!loading && contacts?.length === 0 ? (
-                  <tr>
-                    <td colSpan="6">
-                      <div
-                        className="d-flex justify-content-center align-items-center"
-                        style={{ height: "150px",marginLeft: "230px" }}
-                      >
-                        <p className="mb-0 text-muted">No contact found</p>
-                      </div>
-                    </td>
-                  </tr>
-                ) : !loading && contacts?.length > 0 && currentItems.length === 0 ? (
-                  <tr>
-                    <td colSpan="6">
-                      <div
-                        className="d-flex justify-content-center align-items-center"
-                        style={{ height: "150px" }}
-                      >
-                        <p className="mb-0 text-muted">No matching contact found</p>
-                      </div>
-                    </td>
-                  </tr>
-                ) : (
-                  !loading &&
-                  currentItems.map((contact) => (
-                    <ListViewDirectory
-                      key={contact.id}
-                      IsActive={IsActive}
-                      contact={contact}
-                      setSelectedContact={setSelectedContact}
-                      setIsOpenModal={setIsOpenModal}
-                      setOpen_contact={setOpen_contact}
-                      setIsOpenModalNote={setIsOpenModalNote}
-                      IsDeleted={setDeleteContact}
-                      restore={handleDeleteContact}
-                    />
-                  ))
-                )}
+                {currentItems.map((contact) => (
+                  <ListViewDirectory
+                    key={contact.id}
+                    IsActive={IsActive}
+                    contact={contact}
+                    setSelectedContact={setSelectedContact}
+                    setIsOpenModal={setIsOpenModal}
+                    setOpen_contact={setOpen_contact}
+                    setIsOpenModalNote={setIsOpenModalNote}
+                    IsDeleted={setDeleteContact}
+                    restore={handleDeleteContact}
+                  />
+                ))}
               </DirectoryListTableHeader>
             </div>
           </div>
         )}
 
-        {/* CARD VIEW */}
-        {viewType === "card" && (
-          <>
-            {contacts?.length === 0 && !loading ? (
+        {/* Card View */}
+        {!loading && viewType === "card" && currentItems.length > 0 && (
+          <div className="row mt-4">
+            {currentItems.map((contact) => (
               <div
-                className="d-flex justify-content-center align-items-center text-center"
-                style={{ minHeight: "200px" }}
+                key={contact.id}
+                className="col-12 col-sm-6 col-md-4 col-lg-4 mb-4"
               >
-                <p className="text-muted mb-0">No contact found</p>
+                <CardViewDirectory
+                  IsActive={IsActive}
+                  contact={contact}
+                  setSelectedContact={setSelectedContact}
+                  setIsOpenModal={setIsOpenModal}
+                  setOpen_contact={setOpen_contact}
+                  setIsOpenModalNote={setIsOpenModalNote}
+                  IsDeleted={setDeleteContact}
+                  restore={handleDeleteContact}
+                />
               </div>
-            ) : currentItems.length === 0 && !loading ? (
-              <div
-                className="d-flex justify-content-center align-items-center text-center"
-                style={{ minHeight: "250px" }}
-              >
-                <p className="text-muted mb-0">No matching contact found</p>
-              </div>
-            ) : (
-              <div className="row mt-4">
-                {currentItems.map((contact) => (
-                  <div
-                    key={contact.id}
-                    className="col-12 col-sm-6 col-md-4 col-lg-4 mb-4"
-                  >
-                    <CardViewDirectory
-                      IsActive={IsActive}
-                      contact={contact}
-                      setSelectedContact={setSelectedContact}
-                      setIsOpenModal={setIsOpenModal}
-                      setOpen_contact={setOpen_contact}
-                      setIsOpenModalNote={setIsOpenModalNote}
-                      IsDeleted={setDeleteContact}
-                      restore={handleDeleteContact}
-                    />
-                  </div>
-                ))}
-              </div>
-            )}
-          </>
+            ))}
+          </div>
         )}
 
-        {/* NOTES VIEW */}
-        {viewType === "notes" && (
+        {/* Notes View */}
+        {!loading && viewType === "notes" && (
           <div className="mt-0">
             <NotesCardViewDirectory
               notes={notes}
@@ -459,6 +439,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
               searchText={searchText}
               setIsOpenModalNote={setIsOpenModalNote}
               filterAppliedNotes={filterAppliedNotes}
+              filterAppliedNotes={filterAppliedNotes}
             />
           </div>
         )}
@@ -467,7 +448,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
         {!loading &&
           viewType !== "notes" &&
           contacts?.length > 0 &&
-          currentItems.length > ITEMS_PER_PAGE && (
+          filteredContacts.length > ITEMS_PER_PAGE && (
             <nav aria-label="Page navigation">
               <ul className="pagination pagination-sm justify-content-end py-1">
                 <li className={`page-item ${currentPage === 1 ? "disabled" : ""}`}>
@@ -494,6 +475,10 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
                   </li>
                 ))}
 
+                <li
+                  className={`page-item ${currentPage === totalPages ? "disabled" : ""
+                    }`}
+                >
                 <li
                   className={`page-item ${currentPage === totalPages ? "disabled" : ""
                     }`}
@@ -510,8 +495,10 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
           )}
       </div>
 
+
     </div>
   );
 };
 
-export default Directory;
\ No newline at end of file
+export default Directory;
+