diff --git a/app/views/setup/new.html.erb b/app/views/setup/new.html.erb
index bcfb20e..2aaae85 100644
--- a/app/views/setup/new.html.erb
+++ b/app/views/setup/new.html.erb
@@ -1,38 +1,39 @@
-<%= form_with url: setup_path, method: :post, class: "main-area" do |f| %>
-  <fieldset>
-    <legend><%= t(".admin_account") %></legend>
+<%= form_with url: setup_path, method: :post, class: "labeled-form main-area" do %>
 
-    <label for="admin_email"><%= t(".admin_email") %></label>
-    <%= email_field_tag :admin_email, params[:admin_email],
-          id: "admin_email", required: true, size: 30, autofocus: true,
-          autocomplete: "email" %>
+  <h3 style="grid-column: 1 / -1; text-align: left; margin: 0;">
+    <%= t(".admin_account") %>
+  </h3>
 
-    <label for="admin_password"><%= t(".admin_password") %></label>
-    <%= password_field_tag :admin_password, nil,
-          id: "admin_password", required: true, size: 30,
-          autocomplete: "new-password" %>
+  <label for="admin_email"><%= t(".admin_email") %></label>
+  <%= email_field_tag :admin_email, params[:admin_email],
+        id: "admin_email", required: true, size: 30, autofocus: true,
+        autocomplete: "email" %>
 
-    <label for="admin_password_confirmation"><%= t(".admin_password_confirmation") %></label>
-    <%= password_field_tag :admin_password_confirmation, nil,
-          id: "admin_password_confirmation", required: true, size: 30,
-          autocomplete: "off" %>
-  </fieldset>
+  <label for="admin_password"><%= t(".admin_password") %></label>
+  <%= password_field_tag :admin_password, nil,
+        id: "admin_password", required: true, size: 30,
+        autocomplete: "new-password" %>
 
-  <fieldset>
-    <legend><%= t(".options") %></legend>
+  <label for="admin_password_confirmation"><%= t(".admin_password_confirmation") %></label>
+  <%= password_field_tag :admin_password_confirmation, nil,
+        id: "admin_password_confirmation", required: true, size: 30,
+        autocomplete: "off" %>
 
-    <label for="skip_email_confirmation">
-      <%= check_box_tag :skip_email_confirmation, "1",
-            params[:skip_email_confirmation] == "1",
-            id: "skip_email_confirmation" %>
-      <%= t(".skip_email_confirmation") %>
-    </label>
+  <h3 style="grid-column: 1 / -1; text-align: left; margin: 0.5em 0 0 0;">
+    <%= t(".options") %>
+  </h3>
 
-    <label for="seed_units">
-      <%= check_box_tag :seed_units, "1", true, id: "seed_units" %>
-      <%= t(".seed_units") %>
-    </label>
-  </fieldset>
+  <label for="skip_email_confirmation" style="grid-column: 1 / 3; text-align: left;">
+    <%= check_box_tag :skip_email_confirmation, "1",
+          params[:skip_email_confirmation] == "1",
+          id: "skip_email_confirmation" %>
+    <%= t(".skip_email_confirmation") %>
+  </label>
+
+  <label for="seed_units" style="grid-column: 1 / 3; text-align: left;">
+    <%= check_box_tag :seed_units, "1", true, id: "seed_units" %>
+    <%= t(".seed_units") %>
+  </label>
 
   <%= submit_tag t(".submit") %>
 <% end %>