diff --git a/webui/src/features/views/PersonalViewsPanel.tsx b/webui/src/features/views/PersonalViewsPanel.tsx
index 9c500ac..af4bb9f 100644
--- a/webui/src/features/views/PersonalViewsPanel.tsx
+++ b/webui/src/features/views/PersonalViewsPanel.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useState } from "react";
-import {
+import { ActionToolbar,
   ActionBlockerHint,
   FormField,
   hasScope,
@@ -65,7 +65,7 @@ export default function PersonalViewsPanel({
   return (
     <div className="views-personal-panel">
       {options.length > 1 && (
-        <div className="views-owner-toolbar">
+        <ActionToolbar className="views-owner-toolbar">
           <FormField
             label="i18n:govoplan-views.view_owner"
             documentation={VIEWS_FIELD_DOCUMENTATION}
@@ -81,7 +81,7 @@ export default function PersonalViewsPanel({
               ))}
             </select>
           </FormField>
-        </div>
+        </ActionToolbar>
       )}
       <ViewsAdminPanel
         key={owner.key}
diff --git a/webui/src/features/views/ViewsAdminPanel.tsx b/webui/src/features/views/ViewsAdminPanel.tsx
index 32219b9..9d38a60 100644
--- a/webui/src/features/views/ViewsAdminPanel.tsx
+++ b/webui/src/features/views/ViewsAdminPanel.tsx
@@ -15,7 +15,7 @@ import {
   Square,
   Trash2
 } from "lucide-react";
-import {
+import { FormGrid,
   ActionBlockerHint,
   AdminPageLayout,
   Button,
@@ -869,7 +869,7 @@ export default function ViewsAdminPanel({
           </>
         }
       >
-        <div className="form-grid">
+        <FormGrid columns={1} collapseAt="standard" className="">
           <FormField
             label="i18n:govoplan-views.name"
             documentation={VIEWS_FIELD_DOCUMENTATION}
@@ -902,7 +902,7 @@ export default function ViewsAdminPanel({
           <p className="muted small-note">
             i18n:govoplan-views.first_draft_help
           </p>
-        </div>
+        </FormGrid>
       </Dialog>
 
       <AssignmentDialog
@@ -1244,7 +1244,7 @@ function AssignmentDialog({
         </>
       }
     >
-      <div className="form-grid two responsive-form-grid">
+      <FormGrid columns={2} collapseAt="standard" className="">
         <FormField
           label="i18n:govoplan-views.target_level"
           help={editing !== "new" ? "i18n:govoplan-views.assignment_target_immutable" : undefined}
@@ -1405,7 +1405,7 @@ function AssignmentDialog({
             help="i18n:govoplan-views.pin_revision_help"
           />
         </div>
-      </div>
+      </FormGrid>
       {draft.mode === "required" && (
         <DismissibleAlert
           tone={requiredMissing.length ? "danger" : "warning"}