diff --git a/pkg/web/components/status.templ b/pkg/web/components/status.templ
index 63ea2de..ad255c0 100644
--- a/pkg/web/components/status.templ
+++ b/pkg/web/components/status.templ
@@ -1,7 +1,7 @@
 package components
 
 templ Status() {
-	<div hx-get="/status" hx-trigger="load, click" hx-target="#status" hx-swap="innerHTML">
-		<div id="status"></div>
+	<div id="status" hx-get="/status" hx-trigger="click" hx-target="#status" hx-swap="outerHTML">
+		<button type="button" class="btn btn-outline btn-sm" hx-get="/status/modal" hx-target="#modal-container" hx-swap="innerHTML">Show Task Status</button>
 	</div>
 }
diff --git a/pkg/web/components/status_templ.go b/pkg/web/components/status_templ.go
index 0a2f7e1..451a387 100644
--- a/pkg/web/components/status_templ.go
+++ b/pkg/web/components/status_templ.go
@@ -29,7 +29,7 @@ func Status() templ.Component {
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div hx-get=\"/status\" hx-trigger=\"load, click\" hx-target=\"#status\" hx-swap=\"innerHTML\"><div id=\"status\"></div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div id=\"status\" hx-get=\"/status\" hx-trigger=\"click\" hx-target=\"#status\" hx-swap=\"outerHTML\"><button type=\"button\" class=\"btn btn-outline btn-sm\" hx-get=\"/status/modal\" hx-target=\"#modal-container\" hx-swap=\"innerHTML\">Show Task Status</button></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
diff --git a/pkg/web/handler/task.go b/pkg/web/handler/task.go
index 08984bb..b68b11d 100644
--- a/pkg/web/handler/task.go
+++ b/pkg/web/handler/task.go
@@ -30,7 +30,11 @@ func HandleTaskStatus(w http.ResponseWriter, r *http.Request) {
 
 	hx := HTMX(r)
 	if hx.IsHxRequest() {
-		hx.WriteString(`<a hx-get="/status/modal" hx-target="#modal-container" hx-swap="innerHTML">` + taskFeedback.Message + `</a>`)
+		hx.WriteString(`
+		<div id="status" type="button" hx-get="/status" hx-target="#status" hx-swap="outerHTML">
+				<button class="btn btn-error btn-sm" hx-get="/status/modal" hx-target="#modal-container" hx-swap="innerHTML">` + taskFeedback.Message + `</button>
+		</div>`)
+
 		return
 	}
 
@@ -39,6 +43,7 @@ func HandleTaskStatus(w http.ResponseWriter, r *http.Request) {
 }
 
 func HandleTaskStatusModal(w http.ResponseWriter, r *http.Request) {
+	time.Sleep(100 * time.Millisecond)
 	err := components.Modal(components.ModalProps{
 		ID:      "task-status-modal",
 		Title:   "Task Status",
@@ -59,8 +64,8 @@ func feedbackList(feedback ValidationFeedback) templ.Component {
 			} else {
 				io.WriteString(w, `<p class="my-2 text-sm">`+"✅ "+check.Message+`</p>`)
 			}
-
 		}
+
 		return nil
 	})
 }