diff --git a/src/pages/Directory/Directory.jsx b/src/pages/Directory/Directory.jsx
index 2509364f..ca95181f 100644
--- a/src/pages/Directory/Directory.jsx
+++ b/src/pages/Directory/Directory.jsx
@@ -38,8 +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 [filterAppliedNotes, setFilterAppliedNotes] = useState([]);
   // const [selectedOrgs, setSelectedOrgs] = useState([]);
 
   // ✅ Changed to an array for multiple selections
@@ -354,8 +353,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
             setOpenBucketModal={setOpenBucketModal}
             contactsToExport={contacts}
             notesToExport={notes}
-            selectedNoteNames={selectedNoteNames}
-            selectedNoteNames={selectedNoteNames}
+            selectedNoteNames={selectedNoteNames}       
             setSelectedNoteNames={setSelectedNoteNames}
             notesForFilter={notes}
             setFilterAppliedNotes={setFilterAppliedNotes}
@@ -363,35 +361,25 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
         </div>
       </div>
       <div className="card-minHeight mt-0">
-        {/* LIST VIEW */}
+        {(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-3">
-            <div className="card-body p-2 pb-1" style={{ minHeight: "200px" }}>
+          <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 &&
+                {!loading &&
                   currentItems.map((contact) => (
                     <ListViewDirectory
                       key={contact.id}
@@ -404,55 +392,35 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
                       IsDeleted={setDeleteContact}
                       restore={handleDeleteContact}
                     />
-                  ))
-                )}
+                  ))}
               </DirectoryListTableHeader>
             </div>
           </div>
         )}
 
-        {/* CARD VIEW */}
         {viewType === "card" && (
-          <>
-            {contacts?.length === 0 && !loading ? (
-              <div
-                className="d-flex justify-content-center align-items-center text-center"
-                style={{ minHeight: "200px" }}
-              >
-                <p className="text-muted mb-0">No contact found</p>
-              </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 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
+                    IsActive={IsActive}
+                    contact={contact}
+                    setSelectedContact={setSelectedContact}
+                    setIsOpenModal={setIsOpenModal}
+                    setOpen_contact={setOpen_contact}
+                    setIsOpenModalNote={setIsOpenModalNote}
+                    IsDeleted={setDeleteContact}
+                    restore={handleDeleteContact}
+                  />
+                </div>
+              ))}
+          </div>
         )}
 
-        {/* NOTES VIEW */}
         {viewType === "notes" && (
           <div className="mt-0">
             <NotesCardViewDirectory
@@ -460,13 +428,12 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
               setNotesForFilter={setNotes}
               searchText={searchText}
               setIsOpenModalNote={setIsOpenModalNote}
-              filterAppliedNotes={filterAppliedNotes}
-              filterAppliedNotes={filterAppliedNotes}
+             filterAppliedNotes={filterAppliedNotes}
             />
           </div>
         )}
 
-        {/* PAGINATION */}
+        {/* Pagination */}
         {!loading &&
           viewType !== "notes" &&
           contacts?.length > 0 &&
@@ -497,14 +464,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
                   </li>
                 ))}
 
-                <li
-                  className={`page-item ${currentPage === totalPages ? "disabled" : ""
-                    }`}
-                >
-                <li
-                  className={`page-item ${currentPage === totalPages ? "disabled" : ""
-                    }`}
-                >
+                <li className={`page-item ${currentPage === totalPages ? "disabled" : ""}`}>
                   <button
                     className="page-link"
                     onClick={() => paginate(currentPage + 1)}
@@ -516,8 +476,6 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
             </nav>
           )}
       </div>
-
-
     </div>
   );
 };