diff --git a/main.go b/main.go
index 99923b1..6fdcbe6 100644
--- a/main.go
+++ b/main.go
@@ -49,9 +49,10 @@ func (web Web) watchCreatePost(c *gin.Context) {
 }
 
 func (web Web) deleteWatch(c *gin.Context) {
-	id, err := strconv.Atoi(c.PostForm("id"))
+	id, err := strconv.Atoi(c.PostForm("watch_id"))
 	if err != nil {
-		c.Redirect(http.StatusSeeOther, "/watch/new")
+		log.Println(err)
+		c.Redirect(http.StatusSeeOther, "/")
 		return
 	}
 
@@ -243,12 +244,12 @@ func main() {
 	router.HTMLRender = templates
 
 	router.GET("/", web.index)
-	router.POST("/watch/delete", web.deleteWatch)
 
 	router.GET("/watch/:id", web.watchView)
 	router.GET("/watch/new", web.watchCreate)
 	router.POST("/watch/create", web.watchCreatePost)
 	router.POST("/watch/update", web.watchUpdate)
+	router.POST("/watch/delete", web.deleteWatch)
 
 	router.Run("0.0.0.0:8080")
 }
diff --git a/templates/index.html b/templates/index.html
index 0109a6c..d12eee5 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -13,8 +13,8 @@
             <td class="h3">{{ .Name }}</td>
             <td class="h3">{{ .Interval }}</td>
             <td>
-                <form action="/query/delete" method="post">
-                    <input type="hidden" name="id" value="{{ .ID }}">
+                <form action="/watch/delete" method="post">
+                    <input type="hidden" name="watch_id" value="{{ .ID }}">
                     <input type="submit" class="btn btn-danger" value="Delete">
                 </form>
             </td>
diff --git a/templates/watch/view.html b/templates/watch/view.html
index ce3df7d..91d14e8 100644
--- a/templates/watch/view.html
+++ b/templates/watch/view.html
@@ -59,7 +59,9 @@
                             </div>
                         </div>
                     </form>
-                    <button class="btn btn-primary mt-4"  data-bs-dismiss="modal" id="submitFilterButton">Add Filter</button>
+                    <div>
+                        <button class="btn btn-primary mt-4"  data-bs-dismiss="modal" id="submitFilterButton">Add Filter</button>
+                    </div>
                 </div>
             </div>
         </div>
@@ -111,7 +113,11 @@
                             <input type="hidden" id="connectionsInput" name="connections" value="">
                         </div>
                     </form>
-                    <button class="btn btn-primary mt-4" id="saveButtonModal" data-bs-dismiss="modal" id="submitWatchButton">Save</button>
+                    <button class="btn btn-primary mt-4 float-start" id="saveButtonModal" data-bs-dismiss="modal" id="submitWatchButton">Save</button>
+                    <form action="/watch/delete" method="post">
+                        <input type="hidden" name="watch_id" value="{{ .Watch.ID }}">
+                        <button class="btn btn-danger mt-4 float-end"  data-bs-dismiss="modal" id="deleteFilterButton">Delete Filter</button>
+                    </form>
                 </div>
             </div>
         </div>