diff --git a/index.js b/index.js
index 3705bfc..1301d25 100644
--- a/index.js
+++ b/index.js
@@ -25,6 +25,10 @@ app.use(express.urlencoded({
 app.use("/", express.static('dist/client/'));
 app.use(ssrHandler);
 
+app.get('*', function(req, res){
+  res.status(200).sendFile("404.html", {root: path.resolve("dist/client")});
+});
+
 server.on("request", (req, res) => {
     if (bareServer.shouldRoute(req)) {
       bareServer.routeRequest(req, res);
diff --git a/package.json b/package.json
index 10f406f..e307e5b 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,8 @@
   "type": "module",
   "version": "0.0.1",
   "scripts": {
-    "start": "node ."
+    "start": "node .",
+    "build": "astro build"
   },
   "dependencies": {
     "@astrojs/check": "^0.4.0",
diff --git a/src/components/UVRegistrar.astro b/src/components/UVRegistrar.astro
index d364e4c..3ddb556 100644
--- a/src/components/UVRegistrar.astro
+++ b/src/components/UVRegistrar.astro
@@ -1,31 +1,27 @@
-<script src="/uv/uv.bundle.js" is:inline></script>
-<script src="/uv.config.js" is:inline></script>
-<script>
-declare global {
-  interface Window {
-    __uv$config: any;
-  }
-}
-const form = document.querySelector('form')!;
-const input = document.querySelector('input')!;
-
-window.navigator.serviceWorker.register('/sw.js', {
-    scope: window.__uv$config.prefix
-})
-
-form.addEventListener('submit', (event) => {
-    event.preventDefault();
+<script src="/uv/uv.bundle.js" transition:persist is:inline></script>
+<script src="/uv.config.js" transition:persist is:inline></script>
+<script transition:persist>
+  var form = document.querySelector('form');
+  var input = document.querySelector('input');
+  window.navigator.serviceWorker.register('/sw.js', {
+      scope: window.__uv$config.prefix
+  })
+  
+  form.addEventListener('submit', (event) => {
+      event.preventDefault();
         let url = input.value.trim();
         if (!isUrl(url)) url = 'https://www.google.com/search?q=' + url;
         else if (!(url.startsWith('https://') || url.startsWith('http://'))) url = 'http://' + url;
         let loadingContent = document.getElementById('loading-content');
         if (loadingContent) loadingContent.style.opacity = "1";
-        
-        window.location.href = window.__uv$config.prefix + window.__uv$config.encodeUrl(url);
-});
 
-function isUrl(val = ''){
-    if (/^http(s?):\/\//.test(val) || val.includes('.') && val.substr(0, 1) !== ' ') return true;
-    return false;
-};
-</script>
\ No newline at end of file
+        console.log("here")
+          
+        window.location.href = window.__uv$config.prefix + window.__uv$config.encodeUrl(url);
+  });
+  
+  function isUrl(val = ''){
+      if (/^http(s?):\/\//.test(val) || val.includes('.') && val.substr(0, 1) !== ' ') return true;
+      return false;
+  };
+  </script>
\ No newline at end of file
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 9e69dee..be2fc9b 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -52,4 +52,12 @@ body {
 ::-webkit-scrollbar {
   display: none;
 }
+.main-content {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    width: 100%;
+    height: 60vh;
+}
 </style>
diff --git a/src/pages/404.astro b/src/pages/404.astro
new file mode 100644
index 0000000..7387851
--- /dev/null
+++ b/src/pages/404.astro
@@ -0,0 +1,21 @@
+---
+import Footer from "../components/Footer.astro";
+import Header from "../components/Header.astro";
+import Layout from "../layouts/Layout.astro";
+
+---
+
+<Layout title="404 | Alu">
+    <Header></Header>
+    <div class="main-content error-page">
+        <h1>404!</h1>
+        <p>The content you have requested could not be found!</p>
+    </div>
+    <Footer></Footer>
+</Layout>
+
+<style>
+    .error-page {
+        color: white
+    }
+</style>
\ No newline at end of file
diff --git a/src/pages/index.astro b/src/pages/index.astro
index e66cd49..5fdb3a8 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -7,26 +7,19 @@ import UVRegistrar from '../components/UVRegistrar.astro';
 
 <Layout title="Alu's Unblocker">
 	<Header></Header>
-	<div class="main-content" data-barba="container" data-barba-namespace="home">
+	<div class="main-content">
 		<h1 id="title-text" class="title-text">Welcome to Alu</h1>
 		<form>
 			<input placeholder="Enter a URL...">
 		</form>
 		<p id="loading-content">Loading Content...</p>
 	</div>
-	<UVRegistrar></UVRegistrar>
+  <UVRegistrar></UVRegistrar>
+
 	<Footer></Footer>
 </Layout>
 
 <style>
-.main-content {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	flex-direction: column;
-	width: 100%;
-	height: 60vh;
-}
 form {
   width: 30%;
 }