diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx
index ca5982def01d3da1b569b3915dcb4d2ee99ffd52..e18b2c6b9c81efc228994ee532c9c3ab499fdc0c 100644
--- a/src/components/Footer/index.tsx
+++ b/src/components/Footer/index.tsx
@@ -1,6 +1,6 @@
 import { stringToSlug } from "../../utils";
 
-function ExampleFooter() {
+function WikiFooter() {
   const teamYear = import.meta.env.VITE_TEAM_YEAR;
   const teamName = import.meta.env.VITE_TEAM_NAME;
   const teamSlug = stringToSlug(teamName);
@@ -79,4 +79,4 @@ function ExampleFooter() {
   );
 }
 
-export default ExampleFooter;
+export default WikiFooter;
diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx
index ac38e96dc1a5a061fe39829b8564b8a4025bd695..f5018e3be85a4d60c679409cc2454b40cf78ab85 100644
--- a/src/components/Header/index.tsx
+++ b/src/components/Header/index.tsx
@@ -5,7 +5,7 @@ interface HeaderProps {
   lead: string;
 }
 
-const ExampleHeader: React.FC<HeaderProps> = ({ title, lead }) => {
+const WikiHeader: React.FC<HeaderProps> = ({ title, lead }) => {
   return (
     <header className="bg-hero py-5 mb-5">
       <div className="container h-100">
@@ -20,4 +20,4 @@ const ExampleHeader: React.FC<HeaderProps> = ({ title, lead }) => {
   );
 };
 
-export default ExampleHeader;
+export default WikiHeader;
diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx
index afa72e9703c4a9e857c425f64b675b8354efce48..f295fe2240b42e720b59dc7bf781564f72dccf8b 100644
--- a/src/components/Navbar/index.tsx
+++ b/src/components/Navbar/index.tsx
@@ -5,33 +5,39 @@ import NavDropdown from "react-bootstrap/NavDropdown";
 import { Link } from "react-router-dom";
 import Pages from "../../pages.ts";
 
-function ExampleNavbar() {
-  const pages = [];
-  for (const page of Pages) {
-    if ("folder" in page && page.folder) {
-      const folder = [];
-      for (const subpage of page.folder) {
-        if ("path" in subpage && subpage.path) {
-          folder.push(
-            <NavDropdown.Item as={Link} to={subpage.path} target="_blank">
+function WikiNavbar() {
+  const pages = Pages.map((item, pageIndex) => {
+    if ("folder" in item && item.folder) {
+      const folderItems = item.folder.map((subpage, subpageIndex) => {
+        if (subpage.path) {
+          return (
+            <NavDropdown.Item
+              key={`subpage-${pageIndex}-${subpageIndex}`}
+              as={Link}
+              to={subpage.path}
+            >
               {subpage.name}
-            </NavDropdown.Item>,
+            </NavDropdown.Item>
           );
         }
-      }
-      pages.push(
-        <NavDropdown title={page.name} id="basic-nav-dropdown">
-          {folder}
-        </NavDropdown>,
+      });
+      return (
+        <NavDropdown
+          key={`page-${pageIndex}`}
+          title={item.name}
+          id="basic-nav-dropdown"
+        >
+          {folderItems}
+        </NavDropdown>
       );
-    } else if ("path" in page && page.path) {
-      pages.push(
-        <Nav.Link as={Link} to={page.path} target="_blank">
-          {page.name}
-        </Nav.Link>,
+    } else if ("path" in item && item.path) {
+      return (
+        <Nav.Link key={`page-${pageIndex}`} as={Link} to={item.path}>
+          {item.name}
+        </Nav.Link>
       );
     }
-  }
+  });
 
   return (
     <Navbar expand="lg" className="bg-body-tertiary" fixed="top">
@@ -46,4 +52,4 @@ function ExampleNavbar() {
   );
 }
 
-export default ExampleNavbar;
+export default WikiNavbar;
diff --git a/src/components/NotFound/index.tsx b/src/components/NotFound/index.tsx
index 43b085ed34632b9a4cd3eb64da0d8a173eeee973..0df78af6a49b8c0b5a00c3ad461fdf4361bb2ea3 100644
--- a/src/components/NotFound/index.tsx
+++ b/src/components/NotFound/index.tsx
@@ -4,11 +4,11 @@ function NotFound() {
   return (
     <>
       <div className="d-flex flex-column justify-content-center align-items-center">
-        <h1 className="not-found-title" style={{ fontSize: "56pt" }}>
+        <h1 className="not-found-title" style={{ fontSize: "100pt" }}>
           404
         </h1>
-        <div>
-          <Link to="/" className="btn btn-secondary btn-xl">
+        <div className="my-5">
+          <Link to="/" className="btn btn-secondary btn-lg">
             Back to Home
           </Link>
         </div>
diff --git a/src/containers/App/App.tsx b/src/containers/App/App.tsx
index aef83969212ac79c5b0f4e54ec5801af4ee24905..622d79fe334e501d9b2b25719be5f3f89a4d2a54 100644
--- a/src/containers/App/App.tsx
+++ b/src/containers/App/App.tsx
@@ -46,7 +46,7 @@ const App = () => {
               <>
                 <Header
                   title="Not Found"
-                  lead="The page you are looking for does not exist."
+                  lead="The requested URL was not found on this server."
                 />
                 <NotFound />
               </>