diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 2d8805553..1be22b348 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -29,6 +29,7 @@
 @import "management/**/*";
 @import "milestones/**/*";
 @import "moderation/**/*";
+@import "officing/**/*";
 @import "polls/**/*";
 @import "proposals/**/*";
 @import "relationable/**/*";
diff --git a/app/assets/stylesheets/officing/results/form.scss b/app/assets/stylesheets/officing/results/form.scss
new file mode 100644
index 000000000..97649145c
--- /dev/null
+++ b/app/assets/stylesheets/officing/results/form.scss
@@ -0,0 +1,5 @@
+.officing-results-form {
+  legend {
+    @include header-font-size(h3);
+  }
+}
diff --git a/app/components/officing/results/form_component.html.erb b/app/components/officing/results/form_component.html.erb
index 5747876e6..7d32d0439 100644
--- a/app/components/officing/results/form_component.html.erb
+++ b/app/components/officing/results/form_component.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag(officing_poll_results_path(poll), { id: "officer_assignment_form" }) do %>
+<%= form_tag(officing_poll_results_path(poll), { id: "officer_assignment_form", class: "officing-results-form" }) do %>
   <div class="row">
     <div class="small-12 medium-6 column">
       <%= label_tag :officer_assignment_id, t("officing.results.new.booth") %>
@@ -9,17 +9,15 @@
   </div>
 
   <% poll.questions.each do |question| %>
-    <div class="row">
-      <div class="small-12 column">
-        <h3><%= question.title %></h3>
-      </div>
+    <fieldset class="row">
+      <legend class="column"><%= question.title %></legend>
       <% question.question_options.each_with_index do |option, i| %>
         <div class="small-12 medium-6 large-3 column end">
           <%= label_tag "questions_#{question.id}_#{i}", option.title %>
           <%= text_field_tag "questions[#{question.id}][#{i}]", answer_result_value(question.id, i), placeholder: "0" %>
         </div>
       <% end %>
-    </div>
+    </fieldset>
     <hr>
   <% end %>
 
diff --git a/spec/system/officing/results_spec.rb b/spec/system/officing/results_spec.rb
index 7b9ebce80..9eb49ad59 100644
--- a/spec/system/officing/results_spec.rb
+++ b/spec/system/officing/results_spec.rb
@@ -59,11 +59,15 @@ describe "Officing Results", :with_frozen_time do
 
     select booth.name, from: "Booth"
 
-    fill_in "Yes", with: "100"
-    fill_in "No", with: "200"
+    within_fieldset question_1.title do
+      fill_in "Yes", with: "100"
+      fill_in "No", with: "200"
+    end
 
-    fill_in "Today", with: "333"
-    fill_in "Tomorrow", with: "444"
+    within_fieldset question_2.title do
+      fill_in "Today", with: "333"
+      fill_in "Tomorrow", with: "444"
+    end
 
     fill_in "Totally blank ballots", with: "66"
     fill_in "Invalid ballots", with: "77"
@@ -102,8 +106,11 @@ describe "Officing Results", :with_frozen_time do
     booth_name = partial_result.booth_assignment.booth.name
     select booth_name, from: "Booth"
 
-    fill_in "Yes", with: "5555"
-    fill_in "No", with: "200"
+    within_fieldset question_1.title do
+      fill_in "Yes", with: "5555"
+      fill_in "No", with: "200"
+    end
+
     fill_in "Totally blank ballots", with: "6"
     fill_in "Invalid ballots", with: "7"
     fill_in "Valid ballots", with: "8"