diff --git a/handlers/draw_handler.go b/handlers/draw_handler.go
index 5126464..05eb615 100644
--- a/handlers/draw_handler.go
+++ b/handlers/draw_handler.go
@@ -26,6 +26,7 @@ func Home(db *sql.DB) http.HandlerFunc {
 			log.Println("❌ DB error:", err)
 			return
 		}
+		defer rows.Close()
 
 		var results []models.ThunderballResult
 
@@ -48,14 +49,15 @@ func Home(db *sql.DB) http.HandlerFunc {
 			results = append(results, res)
 		}
 
+		context := helpers.TemplateContext(w, r)
+		context["Data"] = results
+
 		tmpl := template.Must(template.ParseFiles(
 			"templates/layout.html",
 			"templates/index.html",
 		))
 
-		err = tmpl.ExecuteTemplate(w, "layout", map[string]interface{}{
-			"Data": results,
-		})
+		err = tmpl.ExecuteTemplate(w, "layout", context)
 		if err != nil {
 			log.Println("❌ Template error:", err)
 			http.Error(w, "Error rendering homepage", http.StatusInternalServerError)