diff --git a/app/assets/stylesheets/polls/form.scss b/app/assets/stylesheets/polls/form.scss
index e85879c24..f6129dbf2 100644
--- a/app/assets/stylesheets/polls/form.scss
+++ b/app/assets/stylesheets/polls/form.scss
@@ -1,11 +1,8 @@
 .poll-form {
-  label {
-    @include radio-or-checkbox-and-label-alignment;
-    font-weight: normal;
-
-    &:first-of-type {
-      margin-top: calc($line-height / 2);
-    }
+  fieldset {
+    border: 1px solid $border;
+    border-radius: $global-radius;
+    padding: $line-height;
   }
 
   fieldset + fieldset {
@@ -14,15 +11,45 @@
 
   legend {
     @include header-font-size(h3);
+    float: $global-left;
     margin-bottom: 0;
+
+    + * {
+      clear: $global-left;
+    }
+  }
+
+
+  label {
+    @include radio-or-checkbox-and-label-alignment;
+    font-weight: normal;
+
+    &:first-of-type::before {
+      content: "\A";
+      margin-top: calc($line-height / 2);
+      white-space: pre;
+    }
   }
 
   .help-text {
+    display: block;
     font-size: 1em;
     font-style: normal;
     font-weight: bold;
   }
 
+  .read-more-links {
+    margin-top: calc($line-height / 2);
+
+    * {
+      margin-bottom: 0;
+    }
+
+    * + * {
+      margin-top: calc($line-height / 4);
+    }
+  }
+
   [type=submit] {
     margin-top: calc($line-height * 3 / 4);
   }
diff --git a/app/components/polls/questions/question_component.html.erb b/app/components/polls/questions/question_component.html.erb
index b4c5ea671..075fc4dc1 100644
--- a/app/components/polls/questions/question_component.html.erb
+++ b/app/components/polls/questions/question_component.html.erb
@@ -14,7 +14,7 @@
   <% end %>
 
   <% if question.options_with_read_more? %>
-    <div>
+    <div class="read-more-links">
       <p><%= t("poll_questions.read_more_about") %></p>
       <p><%= options_read_more_links %></p>
     </div>