diff --git a/docker/routlin-dash/app/view_page.py b/docker/routlin-dash/app/view_page.py
index a979f5c..bdb2ba5 100644
--- a/docker/routlin-dash/app/view_page.py
+++ b/docker/routlin-dash/app/view_page.py
@@ -609,16 +609,6 @@ def collect_tokens():
             '</tr></thead>'
             f'<tbody>{rows}</tbody>'
             '</table>'
-            '<form method="post" action="/action/actions_cardpendingchanges_applyselected">'
-            f'<input type="hidden" name="config_hash" value="{e(core_hash())}"/>'
-            '<div class="button-row">'
-            '<button type="submit" class="btn btn-primary">Apply Selected</button>'
-            '</div></form>'
-            '<form method="post" action="/action/actions_cardpendingchanges_revertselected">'
-            f'<input type="hidden" name="config_hash" value="{e(core_hash())}"/>'
-            '<div class="button-row" style="margin-top:0.5rem">'
-            '<button type="submit" class="btn btn-secondary">Revert Selected</button>'
-            '</div></form>'
         )
     else:
         pending_html = ''
diff --git a/docker/routlin-dash/data/page_content.json b/docker/routlin-dash/data/page_content.json
index bb683fd..833fc03 100644
--- a/docker/routlin-dash/data/page_content.json
+++ b/docker/routlin-dash/data/page_content.json
@@ -607,8 +607,44 @@
           "client_requirement": "client_is_administrator+",
           "items": [
             {
-              "type": "raw_html",
-              "html": "%PENDING_CHANGES_HTML%"
+              "type": "form",
+              "action": "/action/actions_cardpendingchanges_applyselected",
+              "method": "post",
+              "items": [
+                {
+                  "type": "raw_html",
+                  "html": "%PENDING_CHANGES_HTML%"
+                },
+                {
+                  "type": "button_row",
+                  "items": [
+                    {
+                      "type": "button_primary",
+                      "action": "/action/actions_cardpendingchanges_applyselected",
+                      "method": "post",
+                      "text": "Apply Selected"
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "form",
+              "action": "/action/actions_cardpendingchanges_revertselected",
+              "method": "post",
+              "items": [
+                {
+                  "type": "button_row",
+                  "items": [
+                    {
+                      "type": "button_secondary",
+                      "action": "/action/actions_cardpendingchanges_revertselected",
+                      "method": "post",
+                      "text": "Revert Selected"
+                    }
+                  ]
+                }
+              ]
             }
           ]
         },
@@ -619,7 +655,7 @@
           "items": [
             {
               "type": "form",
-              "action": "/action/general_cardpendingchanges_save",
+              "action": "/action/actions_cardoptions_save",
               "method": "post",
               "items": [
                 {
@@ -635,7 +671,7 @@
                   "items": [
                     {
                       "type": "button_primary",
-                      "action": "/action/general_cardpendingchanges_save",
+                      "action": "/action/actions_cardoptions_save",
                       "method": "post",
                       "text": "Save"
                     },