diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 5c7aab0fc..adc166d96 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -84,6 +84,11 @@ body.admin {
     color: $admin-color;
   }
 
+  .tabs-panel {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
   #proposals {
     width: 100% !important;
   }
@@ -155,9 +160,11 @@ body.admin {
   }
 }
 
-.admin .tabs-panel {
-  padding-left: 0;
-  padding-right: 0;
+.input-group {
+
+  .input-group-button {
+    padding-bottom: rem-calc(16);
+  }
 }
 
 // 02. Sidebar
diff --git a/app/views/admin/poll/questions/_filter.html.erb b/app/views/admin/poll/questions/_filter.html.erb
index c12c62f2d..0fd800067 100644
--- a/app/views/admin/poll/questions/_filter.html.erb
+++ b/app/views/admin/poll/questions/_filter.html.erb
@@ -1,8 +1,7 @@
-<div class="small-12 medium-6">
-  <%= form_tag '', method: :get do %>
-    <%= select_tag "poll_id",
-                   poll_select_options(true),
-                   prompt: t("admin.questions.index.select_poll"),
-                   class: "js-location-changer" %>
-  <% end %>
-</div>
\ No newline at end of file
+<%= form_tag '', method: :get do %>
+  <%= label_tag :poll_id, t("admin.questions.index.filter_poll") %>
+  <%= select_tag "poll_id",
+                 poll_select_options(true),
+                 prompt: t("admin.questions.index.select_poll"),
+                 class: "js-location-changer" %>
+<% end %>
diff --git a/app/views/admin/poll/questions/_form.html.erb b/app/views/admin/poll/questions/_form.html.erb
index f9362995b..dbc8883e3 100644
--- a/app/views/admin/poll/questions/_form.html.erb
+++ b/app/views/admin/poll/questions/_form.html.erb
@@ -7,15 +7,19 @@
   <div class="row">
 
     <div class="small-12 column">
-      <div class="small-12 medium-6">
-          <%= f.select :poll_id,
-                        options_for_select(Poll.pluck(:name, :id)),
-                        prompt: t("admin.questions.index.select_poll") %>
+      <div class="small-12 medium-6 large-4">
+        <%= f.select :poll_id,
+                      options_for_select(Poll.pluck(:name, :id)),
+                      prompt: t("admin.questions.index.select_poll"),
+                      label: t("admin.questions.new.poll_label") %>
       </div>
 
       <%= f.text_field :title, maxlength: Poll::Question.title_max_length %>
 
-      <%= f.text_field :valid_answers %>
+      <%= f.label :valid_answers %>
+      <p class="note"><%= t("admin.questions.new.valid_answers_note") %></p>
+      <%= f.text_field :valid_answers, label: false %>
+
 
       <%= f.text_area :summary, rows: 4, maxlength: 200 %>
 
diff --git a/app/views/admin/poll/questions/_search.html.erb b/app/views/admin/poll/questions/_search.html.erb
index 30cf0d6e5..7ee1308f7 100644
--- a/app/views/admin/poll/questions/_search.html.erb
+++ b/app/views/admin/poll/questions/_search.html.erb
@@ -1,12 +1,10 @@
 <%= form_tag(admin_questions_path, method: :get) do |f| %>
-  <div class="row">
-    <div class="small-12 medium-6 column">
-      <%= text_field_tag :search,
-                         @search,
-                         placeholder: t("admin.shared.spending_proposal_search.placeholder") %>
-    </div>
-    <div class="form-inline small-12 medium-3 column end">
+  <div class="input-group">
+    <%= text_field_tag :search,
+                       @search,
+                       placeholder: t("admin.shared.spending_proposal_search.placeholder") %>
+    <div class="input-group-button">
       <%= submit_tag t("admin.shared.spending_proposal_search.button"), class: "button" %>
     </div>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/admin/poll/questions/index.html.erb b/app/views/admin/poll/questions/index.html.erb
index 2aef2b6e5..77772fbf7 100644
--- a/app/views/admin/poll/questions/index.html.erb
+++ b/app/views/admin/poll/questions/index.html.erb
@@ -3,11 +3,18 @@
 <%= link_to t('admin.questions.index.create'), new_admin_question_path,
             class: "button success float-right" %>
 
-<%= render 'filter' %>
-<%= render 'search' %>
+<div class="row">
+  <div class="small-12 medium-6 column">
+    <%= render 'search' %>
+  </div>
+</div>
+
+<div class="small-12 medium-4 large-3">
+  <%= render 'filter' %>
+</div>
 
 <% if @questions.count == 0 %>
-  <div class="callout primary">
+  <div class="callout primary margin-top">
     <%= t('admin.questions.index.no_questions') %>
   </div>
 <% else %>
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index 4c498a280..09f5e16fb 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -194,11 +194,14 @@ en:
         title: "Questions"
         create: "Create question"
         no_questions: "There are no questions."
+        filter_poll: Filter by Poll
         select_poll: Select Poll
       edit:
         title: "Edit Question"
       new:
         title: "Create Question"
+        poll_label: "Poll"
+        valid_answers_note: "Enter the answers separated by commas (,)"
       show:
         proposal: Original proposal
         author: Author
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index 2e294147a..f96d2d815 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -194,11 +194,14 @@ es:
         title: "Preguntas ciudadanas"
         create: "Crear pregunta ciudadana"
         no_questions: "No hay ninguna pregunta ciudadana."
-        select_poll: Seleccionar votación
+        filter_poll: "Filtrar por votación"
+        select_poll: "Seleccionar votación"
       edit:
         title: "Editar pregunta ciudadana"
       new:
         title: "Crear pregunta ciudadana"
+        poll_label: "Votación"
+        valid_answers_note: "Escribe las respuestas separadas por comas (,)"
       show:
         proposal: Propuesta ciudadana original
         author: Autor