diff --git a/app/views/admin/legislation/questions/_form.html.erb b/app/views/admin/legislation/questions/_form.html.erb
index 1843f6c3a..c0b321eed 100644
--- a/app/views/admin/legislation/questions/_form.html.erb
+++ b/app/views/admin/legislation/questions/_form.html.erb
@@ -1,40 +1,41 @@
 <%= form_for [:admin, @process, @question], url: url, html: {data: {watch_changes: true}} do |f| %>
 
   <% if @question.errors.any? %>
-    <div id="error_explanation" data-alert class="callout alert" data-closable>
-      <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-        <span aria-hidden="true">&times;</span>
-      </button>
+    <div class="small-12 medium-9 column">
+      <div id="error_explanation" data-alert class="callout alert" data-closable>
+        <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
+          <span aria-hidden="true">&times;</span>
+        </button>
 
-      <strong>
-        <%= @question.errors.count %>
-        <%= t("admin.legislation.questions.errors.form.error", count: @question.errors.count) %>
-      </strong>
+        <strong>
+          <%= @question.errors.count %>
+          <%= t("admin.legislation.questions.errors.form.error", count: @question.errors.count) %>
+        </strong>
+      </div>
     </div>
   <% end %>
 
-  <div class="small-12 medium-4 column">
-    <%= f.label :title %>
-  </div>
-  <div class="small-12 medium-8 column">
-    <%= f.text_area :title, rows: 5, label: false, placeholder: t('admin.legislation.questions.form.title_placeholder') %>
+  <div class="small-12 medium-9 column">
+    <%= f.label :title, t("admin.legislation.questions.form.title") %>
+    <%= f.text_area :title, rows: 5, label: false, placeholder: t("admin.legislation.questions.form.title_placeholder") %>
   </div>
 
-  <div class="small-12 medium-4 column">
-    <%= f.label :question_options %>
+  <div class="small-12 medium-9 column">
+    <%= f.label :question_options, t("admin.legislation.questions.form.question_options") %>
   </div>
-  <div class="small-12 medium-8 column">
+
+  <div>
     <%= f.fields_for :question_options do |ff| %>
       <%= render 'question_option_fields', f: ff %>
     <% end %>
   </div>
-  <div class="small-12 medium-8 column">
-    <%= link_to_add_association t('.add_option'), f, :question_options %>
+
+  <div class="small-12 medium-9 column margin">
+    <%= link_to_add_association t("admin.legislation.questions.form.add_option"),
+                                f, :question_options, class: "button hollow medium" %>
   </div>
 
-  <div class="row">
-    <div class="actions small-12 medium-3 column legislation-process-save">
-      <%= f.submit(class: "button expanded", value: t("admin.legislation.questions.#{admin_submit_action(@question)}.submit_button")) %>
-    </div>
+  <div class="small-12 medium-6 large-4 column end">
+    <%= f.submit(class: "button expanded", value: t("admin.legislation.questions.#{admin_submit_action(@question)}.submit_button")) %>
   </div>
 <% end %>
diff --git a/app/views/admin/legislation/questions/_question_option_fields.html.erb b/app/views/admin/legislation/questions/_question_option_fields.html.erb
index ef77872fa..6afdfecad 100644
--- a/app/views/admin/legislation/questions/_question_option_fields.html.erb
+++ b/app/views/admin/legislation/questions/_question_option_fields.html.erb
@@ -1,11 +1,12 @@
 <div class="nested-fields">
   <div class="field">
-  <div class="row">
-    <div class="small-12 medium-9 column">
-      <%= f.text_field :value, label: false, placeholder: t('admin.legislation.questions.form.value_placeholder') %>
-    </div>
-    <div class="small-12 medium-3 column">
-      <%= link_to_remove_association "<span class=\"icon-x\" aria-hidden=\"true\"></span> <span>#{t('.remove_option')}</span>".html_safe, f %>
+    <div class="row">
+      <div class="small-12 medium-9 column">
+        <%= f.text_field :value, label: false, placeholder: t("admin.legislation.questions.form.value_placeholder") %>
+      </div>
+      <div class="small-12 medium-3 column">
+        <%= link_to_remove_association "<span class=\"icon-x\" aria-hidden=\"true\"></span> <span>#{t(".remove_option")}</span>".html_safe, f %>
+      </div>
     </div>
   </div>
 </div>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 168b0b933..3137a23e1 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -439,8 +439,10 @@ en:
             error: Error
         form:
           add_option: Add option
-          title_placeholder: Add a title
+          title: Question
+          title_placeholder: Add question
           value_placeholder: Add a closed answer
+          question_options: "Possible answers (optional, by default open answers)"
         index:
           back: Back
           title: Questions associated to this process
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 3cd3eb3f4..3422f4c9c 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -439,8 +439,10 @@ es:
             error: Error
         form:
           add_option: +Añadir respuesta cerrada
+          title: Pregunta
           title_placeholder: Escribe un título a la pregunta
           value_placeholder: Escribe una respuesta cerrada
+          question_options: "Posibles respuestas (opcional, por defecto respuestas abiertas)"
         index:
           back: Volver
           title: Preguntas asociadas a este proceso