diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 89bed6d21..8403568a9 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -44,11 +44,22 @@ body.admin {
 
     .button {
       margin-top: 0;
+
+      &.margin-top {
+        margin-top: $line-height;
+      }
     }
 
     input[type="text"], textarea {
       width: 100%;
     }
+
+    .fieldset {
+
+      select {
+        height: $line-height*2;
+      }
+    }
   }
 
   table {
@@ -59,6 +70,10 @@ body.admin {
       &.text-center {
         text-align: center;
       }
+
+      &.text-right {
+        text-align: right;
+      }
     }
 
     tr {
diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index a375df091..46332b20e 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -961,7 +961,10 @@
       color: white;
       text-decoration: underline;
     }
+  }
 
+  .back, .icon-angle-left {
+    color: white;
   }
 
   &.poll-show {
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index 09eede256..1b4911412 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -119,16 +119,16 @@
       </ul>
     </li>
 
-    <li <%= 'class=active' if controller_name == 'geozones' %>>
+    <li class="section-title" <%= 'class=active' if controller_name == 'geozones' %>>
       <%= link_to admin_geozones_path do %>
-        <span class="icon-settings"></span><%= t('admin.menu.geozones') %>
+        <strong><%= t('admin.menu.geozones') %></strong>
       <% end %>
     </li>
 
     <% if feature?(:signature_sheets) %>
-      <li <%= "class=active" if controller_name == "signature_sheets" %>>
+      <li class="section-title" <%= "class=active" if controller_name == "signature_sheets" %>>
         <%= link_to admin_signature_sheets_path do %>
-          <span class="icon-budget"></span><%= t("admin.menu.signature_sheets") %>
+          <strong><%= t("admin.menu.signature_sheets") %></strong>
         <% end %>
       </li>
     <% end %>
diff --git a/app/views/admin/poll/officer_assignments/index.html.erb b/app/views/admin/poll/officer_assignments/index.html.erb
index 55e879858..81ac5aa61 100644
--- a/app/views/admin/poll/officer_assignments/index.html.erb
+++ b/app/views/admin/poll/officer_assignments/index.html.erb
@@ -1,4 +1,8 @@
-<%= link_to @poll.name, admin_poll_path(@poll, anchor: 'tab-officers') %>
+<%= link_to admin_poll_path(@poll, anchor: 'tab-officers') do %>
+  <span class="icon-angle-left"></span>
+  <%= @poll.name %>
+<% end %>
+
 <h2><%= @officer.name %> - <%= @officer.email %></h2>
 
 <%= form_tag(admin_officer_assignments_path, {id: "officer_assignment_form"}) do %>
@@ -40,7 +44,8 @@
     <thead>
       <tr>
         <th><%= t("admin.poll_officer_assignments.index.date") %></th>
-        <th colspan="2"><%= t("admin.poll_officer_assignments.index.booth") %></th>
+        <th><%= t("admin.poll_officer_assignments.index.booth") %></th>
+        <th class="text-center"><%= t("admin.poll_officer_assignments.index.assignment") %></th>
       </tr>
     </thead>
     <tbody>
@@ -48,7 +53,7 @@
         <tr id="<%= dom_id officer_assignment %>">
           <td><%= l officer_assignment.date.to_date %></td>
           <td><%= booth_name_with_location(officer_assignment.booth_assignment.booth) %></td>
-          <td class="text-right">
+          <td class="text-center">
             <%= link_to t("admin.poll_officer_assignments.index.remove_assignment"),
                         admin_officer_assignment_path(officer_assignment),
                         method: :delete,
diff --git a/app/views/admin/poll/officers/index.html.erb b/app/views/admin/poll/officers/index.html.erb
index d6e11682b..fd9619167 100644
--- a/app/views/admin/poll/officers/index.html.erb
+++ b/app/views/admin/poll/officers/index.html.erb
@@ -12,40 +12,42 @@
   <%= page_entries_info @officers, entry_name: t('admin.poll_officers.officer.entry_name') %>
 </h3>
 
-<table id="officers">
-  <thead>
-    <tr>
-      <th><%= t('admin.poll_officers.officer.name') %></th>
-      <th colspan="2"><%= t('admin.poll_officers.officer.email') %></th>
-    </tr>
-  </thead>
-  <tbody>
-  <% @officers.each do |officer| %>
-    <tr>
-      <td>
-        <%= officer.name %>
-      </td>
-      <td>
-        <%= officer.email %>
-      </td>
-      <td class="text-right">
-        <% if officer.persisted? %>
-          <%= link_to t('admin.poll_officers.officer.delete'),
-                      admin_officer_path(officer),
-                      method: :delete,
-                      class: "button hollow alert"
-          %>
-        <% else %>
-          <%= link_to t('admin.poll_officers.officer.add'),
-                      { controller: "admin/poll/officers", action: :create,
-                        user_id: officer.user_id },
-                      method: :post,
-                      class: "button success" %>
-        <% end %>
-      </td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
+<% if @officers.any? %>
+  <table id="officers">
+    <thead>
+      <tr>
+        <th><%= t('admin.poll_officers.officer.name') %></th>
+        <th colspan="2"><%= t('admin.poll_officers.officer.email') %></th>
+      </tr>
+    </thead>
+    <tbody>
+    <% @officers.each do |officer| %>
+      <tr>
+        <td>
+          <%= officer.name %>
+        </td>
+        <td>
+          <%= officer.email %>
+        </td>
+        <td class="text-right">
+          <% if officer.persisted? %>
+            <%= link_to t('admin.poll_officers.officer.delete'),
+                        admin_officer_path(officer),
+                        method: :delete,
+                        class: "button hollow alert"
+            %>
+          <% else %>
+            <%= link_to t('admin.poll_officers.officer.add'),
+                        { controller: "admin/poll/officers", action: :create,
+                          user_id: officer.user_id },
+                        method: :post,
+                        class: "button success" %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
 
-<%= paginate @officers %>
+  <%= paginate @officers %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/poll/officers/user_not_found.js.erb b/app/views/admin/poll/officers/user_not_found.js.erb
index 40b6caac5..a6444dc61 100644
--- a/app/views/admin/poll/officers/user_not_found.js.erb
+++ b/app/views/admin/poll/officers/user_not_found.js.erb
@@ -1 +1 @@
-$("#search-result").html("<div class=\"small-12 column\"><div class=\"callout alert\"><%= j t('admin.poll_officers.search.user_not_found') %></div></div>");
+$("#search-result").html("<div class=\"callout alert\"><%= j t('admin.poll_officers.search.user_not_found') %></div>");
diff --git a/app/views/admin/poll/polls/_booths.html.erb b/app/views/admin/poll/polls/_booths.html.erb
index e955565fd..dbd5de3e1 100644
--- a/app/views/admin/poll/polls/_booths.html.erb
+++ b/app/views/admin/poll/polls/_booths.html.erb
@@ -5,11 +5,11 @@
     <%= t("admin.polls.show.no_booths") %>
   </div>
 <% else %>
-  <table>
+  <table class="margin">
     <thead>
-      <th><%= t("admin.polls.show.name") %></th>
-      <th><%= t("admin.polls.show.location") %></th>
-      <th>&nbsp;</th>
+      <th><%= t("admin.polls.show.table_name") %></th>
+      <th><%= t("admin.polls.show.table_location") %></th>
+      <th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
     </thead>
     <tbody>
       <% @poll.booths.each do |booth| %>
@@ -22,7 +22,7 @@
           <td>
             <%= booth.location %>
           </td>
-          <td class="text-right">
+          <td class="text-center">
             <%= link_to t("admin.polls.show.remove_booth"),
                         admin_booth_assignment_path(poll: @poll, booth: booth),
                         method: :delete,
@@ -32,4 +32,4 @@
       <% end %>
     </tbody>
   </table>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/admin/poll/polls/_officers.html.erb b/app/views/admin/poll/polls/_officers.html.erb
index e95d90d24..a3c78c656 100644
--- a/app/views/admin/poll/polls/_officers.html.erb
+++ b/app/views/admin/poll/polls/_officers.html.erb
@@ -5,10 +5,10 @@
     <%= t("admin.polls.show.no_officers") %>
   </div>
 <% else %>
-  <table>
+  <table class="margin">
     <thead>
-      <th><%= t("admin.polls.show.name") %></th>
-      <th><%= t("admin.polls.show.email") %></th>
+      <th><%= t("admin.polls.show.table_name") %></th>
+      <th><%= t("admin.polls.show.table_email") %></th>
     </thead>
     <tbody>
       <% @poll.officers.each do |officer| %>
diff --git a/app/views/admin/poll/polls/_questions.html.erb b/app/views/admin/poll/polls/_questions.html.erb
index 8adf3596e..c4dadba49 100644
--- a/app/views/admin/poll/polls/_questions.html.erb
+++ b/app/views/admin/poll/polls/_questions.html.erb
@@ -5,11 +5,21 @@
     <%= t('admin.polls.show.no_questions') %>
   </div>
 <% else %>
-  <table class="margin-top">
+  <table class="margin">
+    <thead>
+      <tr>
+        <th><%= t('admin.polls.show.table_title') %></th>
+        <th class="text-center"><%= t('admin.polls.show.table_assignment') %></th>
+      </tr>
+    </thead>
     <% @poll.questions.each do |question| %>
       <tr id="<%= dom_id(question) %>">
-        <td><%= link_to question.title, admin_question_path(question) %></td>
-        <td class="text-right">
+        <td>
+          <strong>
+            <%= link_to question.title, admin_question_path(question) %>
+          </strong>
+        </td>
+        <td class="text-center">
           <%= link_to t('admin.polls.show.remove_question'),
                       remove_question_admin_poll_path(poll_id: @poll.id, question_id: question.id),
                       class: "button hollow alert",
diff --git a/app/views/admin/poll/polls/_search_booths.html.erb b/app/views/admin/poll/polls/_search_booths.html.erb
index 56d9cbb12..a02c9e6ec 100644
--- a/app/views/admin/poll/polls/_search_booths.html.erb
+++ b/app/views/admin/poll/polls/_search_booths.html.erb
@@ -1,14 +1,16 @@
-<%= form_tag(search_booths_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
-  <div class="row">
-    <div class="small-12 medium-6 column">
-      <%= text_field_tag :search,
-                         @search,
-                         placeholder: t("admin.shared.booths_search.placeholder"), id: "search-booths" %>
-    </div>
-    <div class="form-inline small-12 medium-3 column end">
-      <%= submit_tag t("admin.shared.booths_search.button"), class: "button" %>
-    </div>
+<div class="row">
+  <div class="small-12 medium-6 column">
+    <%= form_tag(search_booths_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
+      <div class="input-group">
+        <%= text_field_tag :search,
+                           @search,
+                           placeholder: t("admin.shared.booths_search.placeholder"), id: "search-booths" %>
+        <div class="input-group-button">
+          <%= submit_tag t("admin.shared.booths_search.button"), class: "button" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>
 
 <div id="search-booths-results"></div>
diff --git a/app/views/admin/poll/polls/_search_booths_results.html.erb b/app/views/admin/poll/polls/_search_booths_results.html.erb
index 3de4ffca6..3768fa222 100644
--- a/app/views/admin/poll/polls/_search_booths_results.html.erb
+++ b/app/views/admin/poll/polls/_search_booths_results.html.erb
@@ -1,32 +1,44 @@
-<table>
-  <thead>
-    <tr>
-      <th colspan="3"><%= @booths.blank? ? t('admin.polls.show.no_search_results') : t('admin.polls.show.search_results') %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @booths.each do |booth| %>
-    <tr>
-      <td>
-        <%= booth.name %>
-      </td>
-      <td>
-        <%= booth.location %>
-      </td>
-      <td class="text-right">
-        <% if @poll.booth_ids.include?(booth.id) %>
-          <%= link_to t("admin.polls.show.remove_booth"),
-                        admin_booth_assignment_path(poll: @poll, booth: booth),
-                        method: :delete,
-                        class: "button hollow alert" %>
-        <% else %>
-          <%= link_to t("admin.polls.show.add_booth"),
-                        admin_booth_assignments_path(poll: @poll, booth: booth),
-                        method: :post,
-                        class: "button hollow" %>
-        <% end %>
-      </td>
-    </tr>
-    <% end %>
-  </tbody>
-</table>
\ No newline at end of file
+<% if @booths.blank? %>
+  <div class="callout alert margin-bottom">
+    <%= t('admin.polls.show.no_search_results') %>
+  </div>
+<% else %>
+  <h3><%= t('admin.polls.show.search_results') %></h3>
+<% end %>
+
+<% if @booths.any? %>
+  <table>
+    <thead>
+      <tr>
+        <th><%= t("admin.polls.show.table_name") %></th>
+        <th><%= t("admin.polls.show.table_location") %></th>
+        <th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @booths.each do |booth| %>
+      <tr>
+        <td>
+          <%= booth.name %>
+        </td>
+        <td>
+          <%= booth.location %>
+        </td>
+        <td class="text-center">
+          <% if @poll.booth_ids.include?(booth.id) %>
+            <%= link_to t("admin.polls.show.remove_booth"),
+                          admin_booth_assignment_path(poll: @poll, booth: booth),
+                          method: :delete,
+                          class: "button hollow alert" %>
+          <% else %>
+            <%= link_to t("admin.polls.show.add_booth"),
+                          admin_booth_assignments_path(poll: @poll, booth: booth),
+                          method: :post,
+                          class: "button hollow" %>
+          <% end %>
+        </td>
+      </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
diff --git a/app/views/admin/poll/polls/_search_officers.html.erb b/app/views/admin/poll/polls/_search_officers.html.erb
index 45ce9bd8f..b26c98d0c 100644
--- a/app/views/admin/poll/polls/_search_officers.html.erb
+++ b/app/views/admin/poll/polls/_search_officers.html.erb
@@ -1,14 +1,16 @@
-<%= form_tag(search_officers_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
-  <div class="row">
-    <div class="small-12 medium-6 column">
-      <%= text_field_tag :search,
-                         @search,
-                         placeholder: t("admin.shared.poll_officers_search.placeholder"), id: "search-officers" %>
-    </div>
-    <div class="form-inline small-12 medium-3 column end">
-      <%= submit_tag t("admin.shared.poll_officers_search.button"), class: "button" %>
-    </div>
+<div class="row">
+  <div class="small-12 medium-6 column">
+    <%= form_tag(search_officers_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
+      <div class="input-group">
+        <%= text_field_tag :search,
+                           @search,
+                           placeholder: t("admin.shared.poll_officers_search.placeholder"), id: "search-officers" %>
+        <div class="input-group-button">
+          <%= submit_tag t("admin.shared.poll_officers_search.button"), class: "button" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>
 
 <div id="search-officers-results"></div>
diff --git a/app/views/admin/poll/polls/_search_officers_results.html.erb b/app/views/admin/poll/polls/_search_officers_results.html.erb
index 6225ad9c5..818a7fa8d 100644
--- a/app/views/admin/poll/polls/_search_officers_results.html.erb
+++ b/app/views/admin/poll/polls/_search_officers_results.html.erb
@@ -1,30 +1,42 @@
-<table>
-  <thead>
-    <tr>
-      <th colspan="3"><%= @officers.blank? ? t('admin.polls.show.no_search_results') : t('admin.polls.show.search_results') %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @officers.each do |user| %>
-    <tr>
-      <td>
-        <%= user.name %>
-      </td>
-      <td>
-        <%= user.email %>
-      </td>
-      <td class="text-right">
-      <% if @poll.officer_ids.include?(user.poll_officer.id) %>
-          <%= link_to t("admin.polls.show.edit_officer_assignments"),
-                        admin_officer_assignments_path(poll: @poll, officer: user.poll_officer),
-                        class: "button hollow alert" %>
-        <% else %>
-          <%= link_to t("admin.polls.show.add_officer_assignments"),
-                        admin_officer_assignments_path(poll: @poll, officer: user.poll_officer),
-                        class: "button hollow" %>
-        <% end %>
-      </td>
-    </tr>
-    <% end %>
-  </tbody>
-</table>
\ No newline at end of file
+<% if @officers.blank? %>
+  <div class="callout alert margin-bottom">
+    <%= t('admin.polls.show.no_search_results') %>
+  </div>
+<% else %>
+  <h3><%= t('admin.polls.show.search_results') %></h3>
+<% end %>
+
+<% if @officers.any? %>
+  <table>
+    <thead>
+      <tr>
+        <th><%= t("admin.polls.show.table_name") %></th>
+        <th><%= t("admin.polls.show.table_email") %></th>
+        <th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @officers.each do |user| %>
+      <tr>
+        <td>
+          <%= user.name %>
+        </td>
+        <td>
+          <%= user.email %>
+        </td>
+        <td class="text-center">
+        <% if @poll.officer_ids.include?(user.poll_officer.id) %>
+            <%= link_to t("admin.polls.show.edit_officer_assignments"),
+                          admin_officer_assignments_path(poll: @poll, officer: user.poll_officer),
+                          class: "button hollow alert" %>
+          <% else %>
+            <%= link_to t("admin.polls.show.add_officer_assignments"),
+                          admin_officer_assignments_path(poll: @poll, officer: user.poll_officer),
+                          class: "button hollow" %>
+          <% end %>
+        </td>
+      </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
diff --git a/app/views/admin/poll/polls/_search_questions.html.erb b/app/views/admin/poll/polls/_search_questions.html.erb
index 0a6123c1b..659cdcd37 100644
--- a/app/views/admin/poll/polls/_search_questions.html.erb
+++ b/app/views/admin/poll/polls/_search_questions.html.erb
@@ -1,14 +1,17 @@
-<%= form_tag(search_questions_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
-  <div class="row">
-    <div class="small-12 medium-6 column">
-      <%= text_field_tag :search,
-                         @search,
-                         placeholder: t("admin.shared.poll_questions_search.placeholder"), id: "search-questions" %>
-    </div>
-    <div class="form-inline small-12 medium-3 column end">
-      <%= submit_tag t("admin.shared.poll_questions_search.button"), class: "button" %>
-    </div>
+<div class="row">
+  <div class="small-12 medium-6 column">
+    <%= form_tag(search_questions_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
+      <div class="input-group">
+        <%= text_field_tag :search,
+                           @search,
+                           placeholder: t("admin.shared.poll_questions_search.placeholder"), id: "search-questions" %>
+
+        <div class="input-group-button">
+          <%= submit_tag t("admin.shared.poll_questions_search.button"), class: "button" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>
 
 <div id="search-questions-results"></div>
diff --git a/app/views/admin/poll/polls/_search_questions_results.html.erb b/app/views/admin/poll/polls/_search_questions_results.html.erb
index e7012edd3..27dcbb652 100644
--- a/app/views/admin/poll/polls/_search_questions_results.html.erb
+++ b/app/views/admin/poll/polls/_search_questions_results.html.erb
@@ -1,25 +1,37 @@
-<table>
-  <thead>
-    <tr>
-      <th colspan="3"><%= @questions.blank? ? t('admin.polls.show.no_search_results') : t('admin.polls.show.search_results') %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @questions.each do |question| %>
-    <tr>
-      <td>
-        <%= question.title %>
-      </td>
-      <td>
-        <%= question.summary %>
-      </td>
-      <td class="text-right">
-        <%= link_to t("admin.polls.show.add_question"),
-                      add_question_admin_poll_path(poll_id: @poll.id, question_id: question.id),
-                      method: :patch,
-                      class: "button hollow" %>
-      </td>
-    </tr>
-    <% end %>
-  </tbody>
-</table>
\ No newline at end of file
+<% if @questions.blank? %>
+  <div class="callout alert margin-bottom">
+    <%= t('admin.polls.show.no_search_results') %>
+  </div>
+<% else %>
+  <h3><%= t('admin.polls.show.search_results') %></h3>
+<% end %>
+
+<% if @questions.any? %>
+  <table>
+    <thead>
+      <tr>
+        <th><%= t("admin.polls.show.table_name") %></th>
+        <th><%= t("admin.polls.show.table_summary") %></th>
+        <th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @questions.each do |question| %>
+      <tr>
+        <td>
+          <%= question.title %>
+        </td>
+        <td>
+          <%= question.summary %>
+        </td>
+        <td class="text-center">
+          <%= link_to t("admin.polls.show.add_question"),
+                        add_question_admin_poll_path(poll_id: @poll.id, question_id: question.id),
+                        method: :patch,
+                        class: "button hollow" %>
+        </td>
+      </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
diff --git a/app/views/admin/poll/polls/show.html.erb b/app/views/admin/poll/polls/show.html.erb
index e357bc7f4..fdc00b949 100644
--- a/app/views/admin/poll/polls/show.html.erb
+++ b/app/views/admin/poll/polls/show.html.erb
@@ -1,12 +1,15 @@
-<h2 class="inline-block">
-  <%= @poll.name %>
-  <small><%= l @poll.starts_at.to_date %> - <%= l @poll.ends_at.to_date %></small>
-</h2>
-
 <%= link_to t("admin.actions.edit"),
             edit_admin_poll_path(@poll),
             class: "button hollow float-right" %>
 
+<h2 class="inline-block">
+  <%= @poll.name %>
+</h2>
+<br>
+<p class="inline-block">
+  (<%= l @poll.starts_at.to_date %> - <%= l @poll.ends_at.to_date %>)
+</p>
+
 <div id="poll-resources" class="tabs-content" data-tabs-content="assigned-resources-tabs">
   <%= render "filter_subnav" %>
 
diff --git a/app/views/admin/poll/questions/show.html.erb b/app/views/admin/poll/questions/show.html.erb
index 1bf130359..91bf398af 100644
--- a/app/views/admin/poll/questions/show.html.erb
+++ b/app/views/admin/poll/questions/show.html.erb
@@ -7,14 +7,17 @@
 
 <div class="row">
   <div class="small-12 medium-9 column">
-    <% if @question.proposal.present? %>
-      <%= t("admin.questions.show.proposal") %>
-      <%= link_to @question.proposal.title, proposal_path(@question.proposal) %>
-    <% end %>
-
     <strong><%= t("admin.questions.show.title") %></strong>
     <h1><%= @question.title %></h1>
 
+    <% if @question.proposal.present? %>
+      <p>
+        <strong><%= t("admin.questions.show.proposal") %></strong>
+        <br>
+        <%= link_to @question.proposal.title, proposal_path(@question.proposal) %>
+      </p>
+    <% end %>
+
     <p>
       <strong><%= t("admin.questions.show.author") %></strong>
       <br>
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index 42613832b..310a9142e 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -173,12 +173,13 @@ en:
         new_assignment: "New shift"
         date: "Date"
         booth: "Booth"
+        assignment: "Assignment"
         select_date: "Select day"
         select_booth: "Select booth"
         add_assignment: "Add shift"
         remove_assignment: "Remove"
         assignments: "Officing shifts in this poll"
-        no_assignments: "This user has no officing shifts in this poll"
+        no_assignments: "This user has no officing shifts in this poll."
     polls:
       index:
         title: "List of polls"
@@ -200,8 +201,8 @@ en:
         questions_tab: Questions
         booths_tab: Booths
         officers_tab: Officers
-        no_booths: "There are no booths in this poll."
-        no_questions: "There are no questions assigned to this poll yet."
+        no_booths: "There are no booths assigned to this poll."
+        no_questions: "There are no questions assigned to this poll."
         no_officers: "There are no officers assigned to this poll."
         remove_booth: "Remove booth from poll"
         booths_title: "List of booths"
@@ -212,11 +213,14 @@ en:
         add_question: "Include question"
         add_officer_assignments: "Add shifts as officer"
         edit_officer_assignments: "Edit officing shifts"
-        name: "Name"
-        location: "Location"
-        email: "Email"
         search_results: "Search results"
-        no_search_results: "No results found"
+        no_search_results: "No results found."
+        table_title: "Title"
+        table_summary: "Summary"
+        table_assignment: "Assignment"
+        table_name: "Name"
+        table_location: "Location"
+        table_email: "Email"
       flash:
         question_added: "Question added to this poll"
         error_on_question_added: "Question could not be assigned to this poll"
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index 6394c6daa..a461d165e 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -173,12 +173,13 @@ es:
         new_assignment: "Nuevo turno"
         date: "Fecha"
         booth: "Urna"
+        assignment: "Asignación"
         select_date: "Seleccionar día"
         select_booth: "Seleccionar urna"
         add_assignment: "Añadir turno"
         remove_assignment: "Eliminar turno"
         assignments: "Turnos como presidente de mesa en esta votación"
-        no_assignments: "No tiene turnos como presidente de mesa en esta votación"
+        no_assignments: "No tiene turnos como presidente de mesa en esta votación."
     polls:
       index:
         title: "Listado de votaciones"
@@ -200,9 +201,9 @@ es:
         questions_tab: Preguntas
         booths_tab: Urnas
         officers_tab: Presidentes de mesa
-        no_booths: "No hay urnas en esta votación."
-        no_questions: "No hay preguntas asignadas a esta votación todavía."
-        no_officers: "No hay presidentes de mesa asignados."
+        no_booths: "No hay urnas asignadas a esta votación."
+        no_questions: "No hay preguntas asignadas a esta votación."
+        no_officers: "No hay presidentes de mesa asignados a esta votación."
         remove_booth: "Desasignar urna"
         booths_title: "Listado de urnas asignadas"
         officers_title: "Listado de presidentes de mesa asignados"
@@ -212,11 +213,14 @@ es:
         add_question: "Incluir pregunta"
         add_officer_assignments: "Añadir turnos como presidente de mesa"
         edit_officer_assignments: "Editar turnos"
-        name: "Nombre"
-        location: "Ubicación"
-        email: "Email"
         search_results: "Resultados de la búsqueda"
-        no_search_results: "No se han encontrado resultados"
+        no_search_results: "No se han encontrado resultados."
+        table_title: "Título"
+        table_summary: "Resumen"
+        table_assignment: "Asignación"
+        table_name: "Nombre"
+        table_location: "Ubicación"
+        table_email: "Email"
       flash:
         question_added: "Pregunta añadida a esta votación"
         error_on_question_added: "No se pudo asignar la pregunta"
diff --git a/spec/features/admin/poll/booth_assigments_spec.rb b/spec/features/admin/poll/booth_assigments_spec.rb
index ba7f3445a..3f21e0089 100644
--- a/spec/features/admin/poll/booth_assigments_spec.rb
+++ b/spec/features/admin/poll/booth_assigments_spec.rb
@@ -16,7 +16,7 @@ feature 'Admin booths assignments' do
       click_link 'Booths (0)'
     end
 
-    expect(page).to have_content 'There are no booths in this poll'
+    expect(page).to have_content 'There are no booths assigned to this poll.'
 
     fill_in 'search-booths', with: booth.name
     click_button 'Search'
@@ -32,7 +32,7 @@ feature 'Admin booths assignments' do
       click_link 'Booths (1)'
     end
 
-    expect(page).to_not have_content 'There are no booths in this poll'
+    expect(page).to_not have_content 'There are no booths assigned to this poll.'
     expect(page).to have_content booth.name
   end
 
@@ -46,7 +46,7 @@ feature 'Admin booths assignments' do
       click_link 'Booths (1)'
     end
 
-    expect(page).to_not have_content 'There are no booths in this poll'
+    expect(page).to_not have_content 'There are no booths assigned to this poll.'
     expect(page).to have_content booth.name
 
     within("#booth_#{booth.id}") do
@@ -60,7 +60,7 @@ feature 'Admin booths assignments' do
       click_link 'Booths (0)'
     end
 
-    expect(page).to have_content 'There are no booths in this poll'
+    expect(page).to have_content 'There are no booths assigned to this poll.'
     expect(page).to_not have_content booth.name
   end
 end
\ No newline at end of file
diff --git a/spec/features/admin/poll/officers_spec.rb b/spec/features/admin/poll/officers_spec.rb
index 5eac71744..d9ea89638 100644
--- a/spec/features/admin/poll/officers_spec.rb
+++ b/spec/features/admin/poll/officers_spec.rb
@@ -30,9 +30,7 @@ feature 'Admin poll officers' do
   scenario 'Delete' do
     click_link 'Delete position'
 
-    within("#officers") do
-      expect(page).to_not have_content @officer.name
-    end
+    expect(page).to_not have_css '#officers'
   end
 
 end
\ No newline at end of file
diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb
index 31d7f6128..6f4f60a3d 100644
--- a/spec/features/admin/poll/polls_spec.rb
+++ b/spec/features/admin/poll/polls_spec.rb
@@ -103,7 +103,7 @@ feature 'Admin polls' do
         visit admin_poll_path(poll)
         click_link "Booths (0)"
 
-        expect(page).to have_content "There are no booths in this poll."
+        expect(page).to have_content "There are no booths assigned to this poll."
       end
 
       scenario "Booth list", :js do
@@ -122,7 +122,7 @@ feature 'Admin polls' do
             expect(page).to have_content booth.location
           end
         end
-        expect(page).to_not have_content "There are no booths"
+        expect(page).to_not have_content "There are no booths assigned to this poll."
       end
     end
   end