diff --git a/src/components/Project/ProjectCardView.jsx b/src/components/Project/ProjectCardView.jsx
index cb44fd2a..3c439fbc 100644
--- a/src/components/Project/ProjectCardView.jsx
+++ b/src/components/Project/ProjectCardView.jsx
@@ -8,7 +8,12 @@ const ProjectCardView = ({ data, currentPage, totalPages, paginate }) => {
   return (
     <div className="row page-min-h">
       {data?.length === 0 && (
-        <p className="text-center text-muted">No projects found.</p>
+        <div
+          className="col-12 d-flex justify-content-center align-items-center"
+          style={{ minHeight: "250px" }} 
+        >
+          <p className="text-center text-muted m-0">No Infra projects found.</p>
+        </div>
       )}
 
       {data?.map((project) => (
diff --git a/src/components/Project/ProjectListView.jsx b/src/components/Project/ProjectListView.jsx
index 2741801e..acda1d5b 100644
--- a/src/components/Project/ProjectListView.jsx
+++ b/src/components/Project/ProjectListView.jsx
@@ -143,77 +143,94 @@ const ProjectListView = ({ data, currentPage, totalPages, paginate }) => {
             </tr>
           </thead>
           <tbody>
-            {data?.map((project) => (
-              <tr key={project.id}>
-                {projectColumns.map((col) => (
-                  <td
-                    key={col.key}
-                    colSpan={col.colSpan}
-                    className={`${col.className} py-5`}
-                    style={{ paddingTop: "20px", paddingBottom: "20px" }}
-                  >
-                    {col.getValue
-                      ? col.getValue(project)
-                      : project[col.key] || "N/A"}
-                  </td>
-                ))}
-                <td
-                  className={`mx-2 ${
-                    canManageProject ? "d-sm-table-cell" : "d-none"
-                  }`}
-                >
-                  <div className="dropdown z-2">
-                    <button
-                      type="button"
-                      className="btn btn-icon btn-text-secondary rounded-pill dropdown-toggle hide-arrow p-0"
-                      data-bs-toggle="dropdown"
-                      aria-expanded="false"
+            {data?.length > 0 ? (
+              data?.map((project) => (
+                <tr key={project.id}>
+                  {projectColumns.map((col) => (
+                    <td
+                      key={col.key}
+                      colSpan={col.colSpan}
+                      className={`${col.className} py-5`}
+                      style={{ paddingTop: "20px", paddingBottom: "20px" }}
                     >
-                      <i
-                        className="bx bx-dots-vertical-rounded bx-sm text-muted"
-                        data-bs-toggle="tooltip"
-                        data-bs-offset="0,8"
-                        data-bs-placement="top"
-                        data-bs-custom-class="tooltip-dark"
-                        title="More Action"
-                      ></i>
-                    </button>
-                    <ul className="dropdown-menu dropdown-menu-end">
-                      <li>
-                        <a
-                          aria-label="click to  View details"
-                          className="dropdown-item cursor-pointer"
-                        >
-                          <i className="bx bx-detail me-2"></i>
-                          <span className="align-left">View details</span>
-                        </a>
-                      </li>
+                      {col.getValue
+                        ? col.getValue(project)
+                        : project[col.key] || "N/A"}
+                    </td>
+                  ))}
+                  <td
+                    className={`mx-2 ${canManageProject ? "d-sm-table-cell" : "d-none"
+                      }`}
+                  >
+                    <div className="dropdown z-2">
+                      <button
+                        type="button"
+                        className="btn btn-icon btn-text-secondary rounded-pill dropdown-toggle hide-arrow p-0"
+                        data-bs-toggle="dropdown"
+                        aria-expanded="false"
+                      >
+                        <i
+                          className="bx bx-dots-vertical-rounded bx-sm text-muted"
+                          data-bs-toggle="tooltip"
+                          data-bs-offset="0,8"
+                          data-bs-placement="top"
+                          data-bs-custom-class="tooltip-dark"
+                          title="More Action"
+                        ></i>
+                      </button>
+                      <ul className="dropdown-menu dropdown-menu-end">
+                        <li>
+                          <a
+                            aria-label="click to  View details"
+                            className="dropdown-item cursor-pointer"
+                          >
+                            <i className="bx bx-detail me-2"></i>
+                            <span className="align-left">View details</span>
+                          </a>
+                        </li>
 
-                      <li>
-                        <a
-                          className="dropdown-item cursor-pointer"
-                          onClick={() =>
-                            setMangeProject({
-                              isOpen: true,
-                              Project: project.id,
-                            })
-                          }
-                        >
-                          <i className="bx bx-pencil me-2"></i>
-                          <span className="align-left">Modify</span>
-                        </a>
-                      </li>
-                      <li onClick={() => handleViewActivities(project.id)}>
-                        <a className="dropdown-item cursor-pointer">
-                          <i className="bx bx-task me-2"></i>
-                          <span className="align-left">Activities</span>
-                        </a>
-                      </li>
-                    </ul>
-                  </div>
+                        <li>
+                          <a
+                            className="dropdown-item cursor-pointer"
+                            onClick={() =>
+                              setMangeProject({
+                                isOpen: true,
+                                Project: project.id,
+                              })
+                            }
+                          >
+                            <i className="bx bx-pencil me-2"></i>
+                            <span className="align-left">Modify</span>
+                          </a>
+                        </li>
+                        <li onClick={() => handleViewActivities(project.id)}>
+                          <a className="dropdown-item cursor-pointer">
+                            <i className="bx bx-task me-2"></i>
+                            <span className="align-left">Activities</span>
+                          </a>
+                        </li>
+                      </ul>
+                    </div>
+                  </td>
+                </tr>
+              ))
+            ) : (
+              <tr
+                className="no-hover"
+                style={{
+                  pointerEvents: "none", 
+                  backgroundColor: "transparent",
+                }}
+              >
+                <td
+                  colSpan={projectColumns.length + 1}
+                  className="text-center align-middle"
+                  style={{ height: "300px", borderBottom: "none" }}
+                >
+                  No Infra projects available
                 </td>
               </tr>
-            ))}
+            )}
           </tbody>
         </table>
       </div>
diff --git a/src/components/ServiceProject/ServiceProjectTeam/ServiceProjectList.jsx b/src/components/ServiceProject/ServiceProjectTeam/ServiceProjectList.jsx
index 9ec5e822..afc48bad 100644
--- a/src/components/ServiceProject/ServiceProjectTeam/ServiceProjectList.jsx
+++ b/src/components/ServiceProject/ServiceProjectTeam/ServiceProjectList.jsx
@@ -105,66 +105,82 @@ const ServiceProjectList = ({ data, currentPage, totalPages, paginate, isCore =
                         </tr>
                     </thead>
                     <tbody>
-                        {data?.map((project) => (
-                            <tr key={project.id}>
-                                {projectColumns.map((col) => (
-                                    <td
-                                        key={col.key}
-                                        colSpan={col.colSpan}
-                                        className={`${col.className} py-5`}
-                                        style={{ paddingTop: "20px", paddingBottom: "20px" }}
-                                    >
-                                        {col.getValue
-                                            ? col.getValue(project)
-                                            : project[col.key] || "N/A"}
-                                    </td>
-                                ))}
-                                <td
-                                    className={`mx-2 ${canManageProject ? "d-sm-table-cell" : "d-none"
-                                        }`}
-                                >
-                                    <div className="dropdown z-2">
-                                        <button
-                                            type="button"
-                                            className="btn btn-icon btn-text-secondary rounded-pill dropdown-toggle hide-arrow p-0"
-                                            data-bs-toggle="dropdown"
-                                            aria-expanded="false"
+                        {data?.length > 0 ? (
+                            data.map((project) => (
+                                <tr key={project.id}>
+                                    {projectColumns.map((col) => (
+                                        <td
+                                            key={col.key}
+                                            colSpan={col.colSpan}
+                                            className={`${col.className} py-5`}
+                                            style={{ paddingTop: "20px", paddingBottom: "20px" }}
                                         >
-                                            <i
-                                                className="bx bx-dots-vertical-rounded bx-sm text-muted"
-                                                data-bs-toggle="tooltip"
-                                                data-bs-offset="0,8"
-                                                data-bs-placement="top"
-                                                data-bs-custom-class="tooltip-dark"
-                                                title="More Action"
-                                            ></i>
-                                        </button>
-                                        <ul className="dropdown-menu dropdown-menu-end">
-                                            <li>
-                                                <a
-                                                    aria-label="click to  View details"
-                                                    className="dropdown-item"
-                                                    onClick={() => handleViewProject(project)}
-
-                                                >
-                                                    <i className="bx bx-detail me-2"></i>
-                                                    <span className="align-left">View details</span>
-                                                </a>
-                                            </li>
-
-                                            <li>
-                                                <a className="dropdown-item" onClick={() => handleManage(project)}
-                                                >
-                                                    <i className="bx bx-pencil me-2"></i>
-                                                    <span className="align-left">Modify</span>
-                                                </a>
-                                            </li>
-                                        </ul>
-                                    </div>
+                                            {col.getValue ? col.getValue(project) : project[col.key] || "N/A"}
+                                        </td>
+                                    ))}
+                                    <td
+                                        className={`mx-2 ${canManageProject ? "d-sm-table-cell" : "d-none"}`}
+                                    >
+                                        <div className="dropdown z-2">
+                                            <button
+                                                type="button"
+                                                className="btn btn-icon btn-text-secondary rounded-pill dropdown-toggle hide-arrow p-0"
+                                                data-bs-toggle="dropdown"
+                                                aria-expanded="false"
+                                            >
+                                                <i
+                                                    className="bx bx-dots-vertical-rounded bx-sm text-muted"
+                                                    data-bs-toggle="tooltip"
+                                                    data-bs-offset="0,8"
+                                                    data-bs-placement="top"
+                                                    data-bs-custom-class="tooltip-dark"
+                                                    title="More Action"
+                                                ></i>
+                                            </button>
+                                            <ul className="dropdown-menu dropdown-menu-end">
+                                                <li>
+                                                    <a
+                                                        aria-label="click to View details"
+                                                        className="dropdown-item"
+                                                        onClick={() => handleViewProject(project)}
+                                                    >
+                                                        <i className="bx bx-detail me-2"></i>
+                                                        <span className="align-left">View details</span>
+                                                    </a>
+                                                </li>
+                                                <li>
+                                                    <a
+                                                        className="dropdown-item"
+                                                        onClick={() => handleManage(project)}
+                                                    >
+                                                        <i className="bx bx-pencil me-2"></i>
+                                                        <span className="align-left">Modify</span>
+                                                    </a>
+                                                </li>
+                                            </ul>
+                                        </div>
+                                    </td>
+                                </tr>
+                            ))
+                        ) : (
+                            <tr
+                                className="no-hover"
+                                style={{
+                                    pointerEvents: "none", 
+                                    backgroundColor: "transparent",
+                                }}
+                            >
+                                <td
+                                    colSpan={projectColumns.length + 1}
+                                    className="text-center align-middle"
+                                    style={{ height: "300px", borderBottom: "none" }}
+                                >
+                                    No Service projects available
                                 </td>
                             </tr>
-                        ))}
+                        )}
                     </tbody>
+
                 </table>
             </div>