diff --git a/middleware/middleware.go b/middleware/middleware.go
index d655d5b..c30578c 100644
--- a/middleware/middleware.go
+++ b/middleware/middleware.go
@@ -64,7 +64,7 @@ func Handler(next http.Handler) http.Handler {
 		writer.Header().Set("Access-Control-Allow-Methods", fmt.Sprintf("%s, OPTIONS", utils.Getenv("CORS_METHODS")))
 		writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Authorization")
 		next.ServeHTTP(wrappedWriter, request)
-		log.Info(fmt.Sprintf("%s %s %s %v \n", utils.ClientIP(request), request.Method, request.RequestURI, wrappedWriter.statusCode))
+		log.Info(fmt.Sprintf("%s %s %s %v", utils.ClientIP(request), request.Method, request.RequestURI, wrappedWriter.statusCode))
 	})
 }
 
diff --git a/routes/routes.go b/routes/routes.go
index a5a3e98..51c46df 100644
--- a/routes/routes.go
+++ b/routes/routes.go
@@ -193,11 +193,6 @@ func SetupRoutes() *http.ServeMux {
 		http.ServeFile(w, r, "public/favicon.ico")
 	})
 
-	//TODO add error message catching to the middleware so we can show the error message at the error page
-	handler.HandleFunc("/test", func(w http.ResponseWriter, r *http.Request) {
-		http.Error(w, "anjay", http.StatusInternalServerError)
-	})
-
 	fileServer := http.FileServer(http.Dir("./public"))
 	handler.Handle("/public/", http.StripPrefix("/public", fileServer))
 
diff --git a/view/auth/auth.templ b/view/auth/auth.templ
index 804944b..413d7fc 100644
--- a/view/auth/auth.templ
+++ b/view/auth/auth.templ
@@ -75,7 +75,7 @@ templ form(err types.Message, title string) {
             </form>
             <div class="text-center text-sm text-white">
               Already have an account?
-              <a class="underline" href="/signin" rel="ugc">
+              <a class="underline" href="/signin" rel="ugc" hx-get="/signin" hx-swap="outerHTML" hx-push-url="true" hx-target="#content">
                 Sign in
               </a>
             </div>
diff --git a/view/error/error.templ b/view/error/error.templ
index 6bf5868..df48245 100644
--- a/view/error/error.templ
+++ b/view/error/error.templ
@@ -13,7 +13,7 @@ templ NotFound(title string){
            </div>
            <a
               class="inline-flex h-10 items-center rounded-md border border-gray-200 border-gray-200 bg-white px-8 text-sm font-medium shadow-sm gap-2 transition-colors hover:bg-gray-100 hover:text-gray-900 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-gray-950"
-              href="/"
+              href="/" hx-get="/" hx-swap="outerHTML" hx-push-url="true" hx-target="#content"
               >
               <svg
                  xmlns="http://www.w3.org/2000/svg"
@@ -47,7 +47,7 @@ templ InternalServerError(title string){
             <div class="grid gap-2">
               <a
                 class="inline-flex h-10 items-center justify-center rounded-md bg-gray-900 px-6 text-sm font-medium text-gray-50 shadow transition-colors hover:bg-gray-900/90 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-gray-950 disabled:pointer-events-none disabled:opacity-50"
-                href="/"
+                href="/" hx-get="/" hx-swap="outerHTML" hx-push-url="true" hx-target="#content"
               >
                 Go back to homepage
               </a>
diff --git a/view/index/index.templ b/view/index/index.templ
index 5de6c4b..ba6b13f 100644
--- a/view/index/index.templ
+++ b/view/index/index.templ
@@ -20,12 +20,12 @@ templ content(title string, user types.User) {
                     <div class="rounded-md shadow">
                         if user.Authenticated {
                         <a class="w-full flex items-center justify-center px-8 py-3 text-base leading-6 font-medium rounded-md text-white bg-pink-400 hover:bg-pink-500 hover:text-white focus:ring ring-offset-2 ring-pink-400 focus:outline-none transition duration-150 ease-in-out md:py-4 md:text-lg md:px-10"
-                            href="/user">
+                            href="/user" hx-get="/user" hx-swap="outerHTML" hx-push-url="true" hx-target="#content">
                             Open Dashboard
                         </a>
                         } else {
                         <a class="w-full flex items-center justify-center px-8 py-3 text-base leading-6 font-medium rounded-md text-white bg-pink-400 hover:bg-pink-500 hover:text-white focus:ring ring-offset-2 ring-pink-400 focus:outline-none transition duration-150 ease-in-out md:py-4 md:text-lg md:px-10"
-                            href="/signup">
+                            href="/signup" hx-get="/signup" hx-swap="outerHTML" hx-push-url="true" hx-target="#content">
                             Get started
                         </a>
                         }
diff --git a/view/layout/base.templ b/view/layout/base.templ
index 6dabc6e..435614f 100644
--- a/view/layout/base.templ
+++ b/view/layout/base.templ
@@ -13,9 +13,12 @@ templ Base(title string){
         <meta name="author" content="Filekeeper" />
         <link href="/public/output.css" rel="stylesheet"/>
         <title>{ title }</title>
+        <script src="https://unpkg.com/htmx.org@1.9.12"></script>
     </head>
     <body>
-        { children... }
+        <div id="content">
+            { children... }
+        </div>
     </body>
     </html>
 }
@@ -70,10 +73,10 @@ templ Navbar(user types.User) {
                 </div>
             </div>
             } else {
-            <a href="/signup" class="text-gray-600 hover:text-gray-800">
+            <a href="/signup" class="text-gray-600 hover:text-gray-800" hx-get="/signup" hx-swap="outerHTML" hx-push-url="true" hx-target="#content">
                 Sign up
             </a>
-            <a href="/signin" class="text-gray-600 hover:text-gray-800">
+            <a href="/signin" class="text-gray-600 hover:text-gray-800" hx-get="/signin" hx-swap="outerHTML" hx-push-url="true" hx-target="#content">
                 Sign in
             </a>
             }
diff --git a/view/signin/signin.templ b/view/signin/signin.templ
index 6f6115b..53d0253 100644
--- a/view/signin/signin.templ
+++ b/view/signin/signin.templ
@@ -29,7 +29,7 @@ templ content(err types.Message, title string) {
               <div class="space-y-2">
                 <div class="flex items-center">
                   <label class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 text-white" for="password">Password</label>
-                  <a class="ml-auto inline-block text-sm underline text-gray-300 dark:text-gray-400" href="/forgot-password" rel="ugc">
+                  <a class="ml-auto inline-block text-sm underline text-gray-300 dark:text-gray-400" href="/forgot-password" rel="ugc" hx-get="/forgot-password" hx-swap="outerHTML" hx-push-url="true" hx-target="#content">
                     Forgot your password?
                   </a>
                 </div>
@@ -52,7 +52,7 @@ templ content(err types.Message, title string) {
             </a>
             <div class="text-center text-sm text-white">
               Don't have an account?
-              <a class="underline" href="/signup" rel="ugc">
+              <a class="underline" href="/signup" rel="ugc" hx-get="/signup" hx-swap="outerHTML" hx-push-url="true" hx-target="#content">
                 Sign up
               </a>
             </div>
diff --git a/view/signup/signup.templ b/view/signup/signup.templ
index 229ee84..c3d36a4 100644
--- a/view/signup/signup.templ
+++ b/view/signup/signup.templ
@@ -81,7 +81,7 @@ templ form(err types.Message, title string) {
             </form>
             <div class="text-center text-sm text-white">
               Already have an account?
-              <a class="underline" href="/signin" rel="ugc">
+              <a class="underline" href="/signin" rel="ugc" hx-get="/signin" hx-swap="outerHTML" hx-push-url="true" hx-target="#content">
                 Sign in
               </a>
             </div>
diff --git a/view/upload/upload.templ b/view/upload/upload.templ
index 6f22ae8..995a3e1 100644
--- a/view/upload/upload.templ
+++ b/view/upload/upload.templ
@@ -18,14 +18,10 @@ templ content(title string) {
                                             stroke-width="2"
                                             d="M13 13h3a3 3 0 0 0 0-6h-.025A5.56 5.56 0 0 0 16 6.5 5.5 5.5 0 0 0 5.207 5.021C5.137 5.017 5.071 5 5 5a4 4 0 0 0 0 8h2.167M10 15V6m0 0L8 8m2-2 2 2" />
                                     </svg>
-                                    <p class="mb-2 text-sm text-gray-400"><span
-                                            class="font-semibold">Click to upload</span> or drag and drop</p>
-                                    <p class="text-xs text-gray-400">SVG, PNG, JPG or GIF (MAX.
-                                        800x400px)</p>
+                                    <p class="mb-2 text-sm text-gray-400 font-semibold">Click to upload or drag and drop</p>
                                 </div>
                                 <input id="dropzone-file" type="file" class="hidden" />
                             </label>
-
                         </div>
                         <div>
                             <div hidden>
diff --git a/view/user/user.templ b/view/user/user.templ
index c84b957..0825dda 100644
--- a/view/user/user.templ
+++ b/view/user/user.templ
@@ -221,12 +221,12 @@ templ content(title string, user types.User, ListSession []*session.SessionInfo)
                             </div>
                             <a
                                 class="hover:bg-gray-200 inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border border-input bg-background hover:bg-accent hover:text-accent-foreground h-10 px-4 py-2"
-                                type="button" href="/upload">
+                                type="button" href="/upload" hx-get="/upload" hx-swap="outerHTML" hx-push-url="true" hx-target="#content">
                                 Upload
                             </a>
                             <a
                                 class="hover:bg-gray-200 inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border border-input bg-background hover:bg-accent hover:text-accent-foreground h-10 px-4 py-2"
-                                type="button" href="/download">
+                                type="button" href="/download" hx-get="/download" hx-swap="outerHTML" hx-push-url="true" hx-target="#content">
                                 Download
                             </a>
                         </div>