diff --git a/app/views/admin/poll/booths/index.html.erb b/app/views/admin/poll/booths/index.html.erb
index 0dbb62cdf..05044dd0e 100644
--- a/app/views/admin/poll/booths/index.html.erb
+++ b/app/views/admin/poll/booths/index.html.erb
@@ -15,8 +15,7 @@
     <thead>
       <th><%= t("admin.booths.index.name") %></th>
       <th><%= t("admin.booths.index.location") %></th>
-      <th>&nbsp;</th>
-      <th>&nbsp;</th>
+      <th class="text-right"><%= t("admin.actions.actions") %></th>
     </thead>
     <tbody>
     <% @booths.each do |booth| %>
diff --git a/app/views/admin/poll/officer_assignments/index.html.erb b/app/views/admin/poll/officer_assignments/index.html.erb
index 6ffe3f04c..f27f6b2ae 100644
--- a/app/views/admin/poll/officer_assignments/index.html.erb
+++ b/app/views/admin/poll/officer_assignments/index.html.erb
@@ -34,4 +34,4 @@
 
     <%= paginate @officers %>
   <% end %>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/admin/poll/shifts/_form.html.erb b/app/views/admin/poll/shifts/_form.html.erb
index 4311d00fe..f0461855f 100644
--- a/app/views/admin/poll/shifts/_form.html.erb
+++ b/app/views/admin/poll/shifts/_form.html.erb
@@ -5,12 +5,13 @@
     <legend>
     	<%= t("admin.poll_shifts.new.new_shift") %>
     </legend>
-    
-    <div class="small-12 medium-4 column">
-      Officer: <%= @officer.name %>
+
+    <div class="small-12 medium-4 column highlight padding">
+      <strong><%= t("admin.poll_shifts.new.officer") %></strong>
+      <br><%= @officer.name %>
       <%= f.hidden_field :officer_id, value: @officer.id %>
     </div>
-     
+
     <div class="small-12 medium-4 column">
       <label><%= t("admin.poll_shifts.new.date") %></label>
       <%= f.select :date,
@@ -23,7 +24,7 @@
 
     <div class="small-12 medium-4 column">
       <%= f.submit t("admin.poll_shifts.new.add_shift"),
-                     class: "button expanded hollow margin-top" %>
+                     class: "button expanded margin-top" %>
     </div>
   </fieldset>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/admin/poll/shifts/_search_officers.html.erb b/app/views/admin/poll/shifts/_search_officers.html.erb
index 793ac0311..e63d09d41 100644
--- a/app/views/admin/poll/shifts/_search_officers.html.erb
+++ b/app/views/admin/poll/shifts/_search_officers.html.erb
@@ -1,14 +1,14 @@
 <div class="row">
   <div class="small-12 medium-6 column">
-    <%= form_tag search_officers_admin_booth_shifts_path, 
+    <%= form_tag search_officers_admin_booth_shifts_path,
                  method: :get, remote: true do |f| %>
       <div class="input-group">
         <%= text_field_tag :search,
                             @search,
-                            placeholder: t("admin.poll_shifts.new.search_officer_placeholder"), 
+                            placeholder: t("admin.poll_shifts.new.search_officer_placeholder"),
                             id: "search-officers" %>
         <div class="input-group-button">
-          <%= submit_tag t("admin.poll_shifts.new.search_officer_button"), 
+          <%= submit_tag t("admin.poll_shifts.new.search_officer_button"),
                          class: "button" %>
         </div>
       </div>
diff --git a/app/views/admin/poll/shifts/_search_officers_results.html.erb b/app/views/admin/poll/shifts/_search_officers_results.html.erb
index edb96eaf4..70525ba6d 100644
--- a/app/views/admin/poll/shifts/_search_officers_results.html.erb
+++ b/app/views/admin/poll/shifts/_search_officers_results.html.erb
@@ -10,7 +10,7 @@
       <tr>
         <th><%= t("admin.poll_shifts.new.table_name") %></th>
         <th><%= t("admin.poll_shifts.new.table_email") %></th>
-        <th class="text-center">
+        <th class="text-right">
           <%= t("admin.poll_shifts.new.table_shift") %>
         </th>
       </tr>
@@ -24,13 +24,13 @@
         <td>
           <%= user.email %>
         </td>
-        <td class="text-center">
+        <td class="text-right">
           <%= link_to t("admin.poll_shifts.new.edit_shifts"),
                       new_admin_booth_shift_path(officer_id: user.poll_officer.id),
-                      class: "button hollow alert" %>
+                      class: "button hollow" %>
         </td>
       </tr>
       <% end %>
     </tbody>
   </table>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/admin/poll/shifts/new.html.erb b/app/views/admin/poll/shifts/new.html.erb
index 7a01aeaf6..b975c40a9 100644
--- a/app/views/admin/poll/shifts/new.html.erb
+++ b/app/views/admin/poll/shifts/new.html.erb
@@ -3,18 +3,20 @@
 <h2><%= @booth.name %></h2>
 
 <% if @officer.blank? %>
-  <%= t("admin.poll_shifts.new.search_officer_text") %>
+  <p>
+    <%= t("admin.poll_shifts.new.search_officer_text") %>
+  </p>
   <%= render "search_officers" %>
 <% else %>
   <%= render "form" %>
-<% end %> 
+<% end %>
 
 <div id="shifts">
   <% if @shifts.empty? %>
-    <div class="callout primary margin-top">
+    <div class="callout primary">
       <%= t("admin.poll_shifts.new.no_shifts") %>
     </div>
   <% else %>
     <%= render "shifts" %>
   <% end %>
-</div>
\ No newline at end of file
+</div>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 3c82199a5..3e5cb9d31 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -509,7 +509,7 @@ en:
         remove_shift: "Remove"
         search_officer_button: Search
         search_officer_placeholder: Search officer
-        search_officer_text: Please search for an officer to assign a new shift
+        search_officer_text: Search for an officer to assign a new shift
         select_date: "Select day"
         table_shift: "Shift"
         table_email: "Email"
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index f657ae54d..1b98adaf2 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -509,13 +509,13 @@ es:
         remove_shift: "Eliminar turno"
         search_officer_button: Buscar
         search_officer_placeholder: Buscar presidentes de mesa
-        search_officer_text: Por favor busca al presidente de mesa para asignar un turno
+        search_officer_text: Busca al presidente de mesa para asignar un turno
         select_date: "Seleccionar día"
         table_shift: "Turno"
         table_email: "Email"
         table_name: "Nombre"
       flash:
-        create: "Añadido turno de presidente de mesa"   
+        create: "Añadido turno de presidente de mesa"
         destroy: "Eliminado turno de presidente de mesa"
     poll_booth_assignments:
       flash: