Index: frontend/src/App.tsx
===================================================================
--- frontend/src/App.tsx	(revision 491a010119327425022533a785e12978d064bcaa)
+++ frontend/src/App.tsx	(revision 3e5cb4a46f9c4dd7b4c1670254f41547a373b9fd)
@@ -11,4 +11,5 @@
 import Home from "./pages/Home";
 import Login from "./pages/Login";
+import NotFound from "./pages/NotFound";
 import Recommendations from "./pages/Recommendations";
 import Register from "./pages/Register";
@@ -77,5 +78,5 @@
 			{
 				path: "*",
-				element: <Home />,
+				element: <NotFound />,
 			},
 		],
Index: frontend/src/pages/NotFound.tsx
===================================================================
--- frontend/src/pages/NotFound.tsx	(revision 3e5cb4a46f9c4dd7b4c1670254f41547a373b9fd)
+++ frontend/src/pages/NotFound.tsx	(revision 3e5cb4a46f9c4dd7b4c1670254f41547a373b9fd)
@@ -0,0 +1,21 @@
+import { Link } from "react-router-dom";
+
+const NotFound = () => {
+	return (
+		<div className="flex flex-col items-center justify-center min-h-[83vh] bg-white text-gray-800">
+			<h1 className="text-6xl font-bold mb-4">404</h1>
+			<h2 className="text-2xl font-semibold mb-2">Страната не постои</h2>
+			<p className="mb-6 text-center max-w-md">
+				Страната која ја бараш не постои или била преместена.
+			</p>
+			<Link
+				to="/"
+				className="px-6 py-2 bg-blue-600 text-white rounded hover:bg-blue-700 transition"
+			>
+				Домашна страна
+			</Link>
+		</div>
+	);
+};
+
+export default NotFound;
Index: frontend/src/pages/SubjectView.tsx
===================================================================
--- frontend/src/pages/SubjectView.tsx	(revision 491a010119327425022533a785e12978d064bcaa)
+++ frontend/src/pages/SubjectView.tsx	(revision 3e5cb4a46f9c4dd7b4c1670254f41547a373b9fd)
@@ -73,11 +73,13 @@
 		return (
 			<div className="flex flex-col items-center justify-center min-h-[83vh] bg-white text-center">
-				<p className="block">Предметот со код '{code}' не е пронајден.</p>
-				<p>
-					Не си сигурен кој е кодот на предметот? Најди го{" "}
-					<Link to="/subjects" className="text-blue-600 underline">
-						тука
-					</Link>
+				<p className="text-2xl font-semibold mb-6">
+					Предметот со код '{code}' не е пронајден.
 				</p>
+				<Link
+					to="/subjects"
+					className="px-6 py-2 bg-blue-600 text-white rounded hover:bg-blue-700 transition"
+				>
+					Кон предмети
+				</Link>
 			</div>
 		);