diff --git a/web/components/project/card.tsx b/web/components/project/card.tsx
index caab8571a..ca746d02e 100644
--- a/web/components/project/card.tsx
+++ b/web/components/project/card.tsx
@@ -186,7 +186,12 @@ export const ProjectCard: React.FC<ProjectCardProps> = observer((props) => {
                 {(isOwner || isMember) && (
                   <button
                     className="flex items-center justify-center p-1 text-custom-text-400 hover:bg-custom-background-80 hover:text-custom-text-200 rounded"
-                    onClick={() => router.push(`/${workspaceSlug}/projects/${project.id}/settings`)}
+                    onClick={(e) => {
+                      e.preventDefault();
+                      e.stopPropagation();
+
+                      router.push(`/${workspaceSlug}/projects/${project.id}/settings`);
+                    }}
                   >
                     <Pencil className="h-3.5 w-3.5" />
                   </button>
diff --git a/web/components/project/index.ts b/web/components/project/index.ts
index 040a0f3df..8fd14b987 100644
--- a/web/components/project/index.ts
+++ b/web/components/project/index.ts
@@ -4,7 +4,6 @@ export * from "./card-list";
 export * from "./card";
 export * from "./create-project-modal";
 export * from "./delete-project-modal";
-export * from "./delete-project-section";
 export * from "./form-loader";
 export * from "./form";
 export * from "./join-project-modal";
diff --git a/web/components/project/delete-project-section.tsx b/web/components/project/settings/delete-project-section.tsx
similarity index 99%
rename from web/components/project/delete-project-section.tsx
rename to web/components/project/settings/delete-project-section.tsx
index ccd0bf571..44d4d7f8f 100644
--- a/web/components/project/delete-project-section.tsx
+++ b/web/components/project/settings/delete-project-section.tsx
@@ -15,6 +15,7 @@ export interface IDeleteProjectSection {
 
 export const DeleteProjectSection: React.FC<IDeleteProjectSection> = (props) => {
   const { projectDetails, handleDelete } = props;
+
   return (
     <Disclosure as="div" className="border-t border-custom-border-400">
       {({ open }) => (
diff --git a/web/components/project/settings/index.ts b/web/components/project/settings/index.ts
index 65333a0e2..0bf79ec17 100644
--- a/web/components/project/settings/index.ts
+++ b/web/components/project/settings/index.ts
@@ -1 +1,2 @@
+export * from "./delete-project-section";
 export * from "./features-list";
diff --git a/web/pages/404.tsx b/web/pages/404.tsx
index e5f5ee7fd..a1f462f2c 100644
--- a/web/pages/404.tsx
+++ b/web/pages/404.tsx
@@ -27,7 +27,7 @@ const PageNotFound: NextPage = () => (
           </p>
         </div>
         <Link href="/">
-          <a className="block">
+          <a className="flex justify-center">
             <Button variant="neutral-primary" size="md">
               Go to Home
             </Button>