diff --git a/src/App/components/home/NotFound.php b/src/App/components/home/NotFound.php
index 0b3e4f98fdd5f0cf8e141b754e2657f956cf2361..8342c036631d39786973f592d666ad4218432e16 100644
--- a/src/App/components/home/NotFound.php
+++ b/src/App/components/home/NotFound.php
@@ -3,10 +3,19 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <link rel="stylesheet" href="../../public/styles/home/Home.css">
+ <link rel="stylesheet" href="../../public/styles/Global.css">
<title>404 Not Found</title>
</head>
<body>
- 404 Not Found
+ <?php
+ include(dirname(__DIR__) . '/template/Navbar.php');
+ ?>
+
+ <main>
+ <h1>404 Not Found</h1>
+ <p>The requested page does not exist.</p>
+ </main>
</body>
</html>
\ No newline at end of file
diff --git a/src/App/views/Routing.php b/src/App/views/Routing.php
index 4642cbdfa1d628be94178bd2e47e07625468edaf..f7e227d33dd01a4b1c776746ec7f03b21a291db0 100644
--- a/src/App/views/Routing.php
+++ b/src/App/views/Routing.php
@@ -24,7 +24,7 @@ class Routing {
$filename = str_replace('.php', '', $url[1]);
$filename = ucfirst($filename);
$controllerName = $filename . "Controller";
- $controllerFile = $controllerDir . '/' . $routes[$filename] . '/' . $controllerName . '.php';
+ $controllerFile = $controllerDir . '/' . ($routes[$filename] ?? '') . '/' . $controllerName . '.php';
if(!file_exists($controllerFile)) {
$controllerName = "NotFoundController";
$controllerFile = $controllerDir . '/home/' . $controllerName . '.php';