diff --git a/src/pages/Directory/Directory.jsx b/src/pages/Directory/Directory.jsx
index ca95181f..d83e6328 100644
--- a/src/pages/Directory/Directory.jsx
+++ b/src/pages/Directory/Directory.jsx
@@ -38,7 +38,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
   const [IsDeleting, setDeleting] = useState(false);
   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
@@ -353,7 +353,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
             setOpenBucketModal={setOpenBucketModal}
             contactsToExport={contacts}
             notesToExport={notes}
-            selectedNoteNames={selectedNoteNames}       
+            selectedNoteNames={selectedNoteNames}
             setSelectedNoteNames={setSelectedNoteNames}
             notesForFilter={notes}
             setFilterAppliedNotes={setFilterAppliedNotes}
@@ -361,52 +361,35 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
         </div>
       </div>
       <div className="card-minHeight mt-0">
-        {(viewType === "card" || viewType === "list" || viewType === "notes") && (
-          <div className="d-flex flex-column justify-content-center align-items-center text-center">
-            {!loading && (viewType === "card" || viewType === "list") && contacts?.length === 0 && (
-              <p className="mt-10">No contact found</p>
-            )}
-            {!loading &&
-              (viewType === "card" || viewType === "list") &&
-              contacts?.length > 0 &&
-              currentItems.length === 0 && (
-                <p className="mt-10">No matching contact found</p>
-              )}
-          </div>
-        )}
-
-        {viewType === "list" && (
-          <div className="card cursor-pointer mt-5">
-            <div className="card-body p-2 pb-1">
-              <DirectoryListTableHeader>
-                {!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}
-                    />
-                  ))}
-              </DirectoryListTableHeader>
+        {/* 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>
         )}
 
-        {viewType === "card" && (
-          <div className="row mt-4">
-            {!loading &&
-              currentItems.map((contact) => (
-                <div
-                  key={contact.id}
-                  className="col-12 col-sm-6 col-md-4 col-lg-4 mb-4"
-                >
-                  <CardViewDirectory
+        {/* 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>
+                {currentItems.map((contact) => (
+                  <ListViewDirectory
+                    key={contact.id}
                     IsActive={IsActive}
                     contact={contact}
                     setSelectedContact={setSelectedContact}
@@ -416,19 +399,44 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
                     IsDeleted={setDeleteContact}
                     restore={handleDeleteContact}
                   />
-                </div>
-              ))}
+                ))}
+              </DirectoryListTableHeader>
+            </div>
           </div>
         )}
 
-        {viewType === "notes" && (
+        {/* Card View */}
+        {!loading && viewType === "card" && currentItems.length > 0 && (
+          <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>
+        )}
+
+        {/* Notes View */}
+        {!loading && viewType === "notes" && (
           <div className="mt-0">
             <NotesCardViewDirectory
               notes={notes}
               setNotesForFilter={setNotes}
               searchText={searchText}
               setIsOpenModalNote={setIsOpenModalNote}
-             filterAppliedNotes={filterAppliedNotes}
+              filterAppliedNotes={filterAppliedNotes}
             />
           </div>
         )}
@@ -437,7 +445,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" : ""}`}>
@@ -464,7 +472,10 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
                   </li>
                 ))}
 
-                <li className={`page-item ${currentPage === totalPages ? "disabled" : ""}`}>
+                <li
+                  className={`page-item ${currentPage === totalPages ? "disabled" : ""
+                    }`}
+                >
                   <button
                     className="page-link"
                     onClick={() => paginate(currentPage + 1)}
@@ -476,8 +487,10 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
             </nav>
           )}
       </div>
+
     </div>
   );
 };
 
-export default Directory;
\ No newline at end of file
+export default Directory;
+