diff --git a/views/activitypub-settings.njk b/views/activitypub-settings.njk
index 6859a28..1170c43 100644
--- a/views/activitypub-settings.njk
+++ b/views/activitypub-settings.njk
@@ -11,8 +11,6 @@
     {{ notificationBanner({ type: "success", text: "Settings saved." }) }}
   {% endif %}
 
-  {{ heading({ text: title }) }}
-
   <form method="POST" action="{{ mountPath }}/admin/settings">
     <input type="hidden" name="_csrf" value="{{ csrfToken }}">
 
@@ -47,13 +45,16 @@
 
       {{ radios({
         name: "defaultVisibility",
-        label: "Default post visibility",
+        fieldset: {
+          legend: "Default post visibility"
+        },
         hint: "Default visibility for new posts. Default: " + defaults.defaultVisibility,
         items: [
-          { value: "public", text: "Public", checked: settings.defaultVisibility == "public" },
-          { value: "unlisted", text: "Unlisted", checked: settings.defaultVisibility == "unlisted" },
-          { value: "private", text: "Followers only", checked: settings.defaultVisibility == "private" }
-        ]
+          { value: "public", label: "Public" },
+          { value: "unlisted", label: "Unlisted" },
+          { value: "private", label: "Followers only" }
+        ],
+        values: [settings.defaultVisibility]
       }) }}
 
       {{ input({
@@ -128,14 +129,17 @@
 
       {{ radios({
         name: "logLevel",
-        label: "Federation log level",
+        fieldset: {
+          legend: "Federation log level"
+        },
         hint: "Fedify log verbosity. Default: " + defaults.logLevel,
         items: [
-          { value: "debug", text: "Debug", checked: settings.logLevel == "debug" },
-          { value: "info", text: "Info", checked: settings.logLevel == "info" },
-          { value: "warning", text: "Warning", checked: settings.logLevel == "warning" },
-          { value: "error", text: "Error", checked: settings.logLevel == "error" }
-        ]
+          { value: "debug", label: "Debug" },
+          { value: "info", label: "Info" },
+          { value: "warning", label: "Warning" },
+          { value: "error", label: "Error" }
+        ],
+        values: [settings.logLevel]
       }) }}
     </fieldset>