diff --git a/main.go b/main.go
index 4d78fdf..f1b1f70 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"embed"
 	"fmt"
 	"log"
 	"net/http"
@@ -11,11 +12,14 @@ import (
 	"git.valxntine.dev/valxntine/blog/templates"
 )
 
+//go:embed static/*
+var staticFS embed.FS
+
 func main() {
 	mux := http.NewServeMux()
 
-	fs := http.FileServer(http.Dir("./static/"))
-	mux.Handle("/static/", http.StripPrefix("/static/", fs))
+	staticHandler := http.FileServer(http.FS(staticFS))
+	mux.Handle("/static/", staticHandler)
 
 	mux.HandleFunc("/", handleHome)
 	mux.HandleFunc("/posts/", handlePost)
diff --git a/templates/layout.templ b/templates/layout.templ
index 8f72790..715e6d3 100644
--- a/templates/layout.templ
+++ b/templates/layout.templ
@@ -13,13 +13,21 @@ templ Layout(title string) {
 		<body>
 			{ children... }
 			<script>
-      document.body.addEventListener('htmx:beforeRequest', function(e) {
-        e.detail.elt.classList.add('loading');
-      });
-
-      document.body.addEventListener('htmx:afterRequest', function(e) {
-        e.detail.elt.classList.remove('loading');
-      });
+		    document.body.addEventListener('htmx:beforeRequest', function(evt) {
+	        evt.detail.elt.classList.add('loading');
+		    });
+    
+		    document.body.addEventListener('htmx:afterRequest', function(evt) {
+		        document.querySelectorAll('.loading').forEach(el => {
+		            el.classList.remove('loading');
+		        });
+		    });
+    
+		    document.body.addEventListener('htmx:beforeSwap', function(evt) {
+		        document.querySelectorAll('.loading').forEach(el => {
+		            el.classList.remove('loading');
+		        });
+		    });
     </script>
 		</body>
 	</html>
diff --git a/templates/layout_templ.go b/templates/layout_templ.go
index e96aeb1..ac11c9b 100644
--- a/templates/layout_templ.go
+++ b/templates/layout_templ.go
@@ -50,7 +50,7 @@ func Layout(title string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<script>\n      document.body.addEventListener('htmx:beforeRequest', function(e) {\n        e.detail.elt.classList.add('loading');\n      });\n\n      document.body.addEventListener('htmx:afterRequest', function(e) {\n        e.detail.elt.classList.remove('loading');\n      });\n    </script></body></html>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<script>\n\t\t    document.body.addEventListener('htmx:beforeRequest', function(evt) {\n\t        evt.detail.elt.classList.add('loading');\n\t\t    });\n    \n\t\t    document.body.addEventListener('htmx:afterRequest', function(evt) {\n\t\t        document.querySelectorAll('.loading').forEach(el => {\n\t\t            el.classList.remove('loading');\n\t\t        });\n\t\t    });\n    \n\t\t    document.body.addEventListener('htmx:beforeSwap', function(evt) {\n\t\t        document.querySelectorAll('.loading').forEach(el => {\n\t\t            el.classList.remove('loading');\n\t\t        });\n\t\t    });\n    </script></body></html>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
