diff --git a/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb b/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb
index d7896446f..57cc8eaf0 100644
--- a/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb
+++ b/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb
@@ -6,27 +6,29 @@
 </td>
 <% if booth_assignment.present? %>
   <td>
-    <span class="verified"><%= t("admin.booth_assignments.manage.status.assigned") %></span>
+    <span class="enabled">
+      <strong><%= t("admin.booth_assignments.manage.status.assigned") %></strong>
+    </span>
   </td>
-  <td class="text-right">
+  <td>
     <%= link_to t("admin.booth_assignments.manage.actions.unassign"),
                 admin_poll_booth_assignment_path(@poll, booth_assignment, booth_id: booth.id),
                 method: :delete,
                 remote: true,
                 title: t("admin.booth_assignments.manage.actions.unassign"),
-                class: "button hollow alert",
+                class: "button hollow alert expanded",
                 data: (booth_assignment.shifts? ? {confirm: "#{t("admin.poll_booth_assignments.alert.shifts")}"} : nil) if !@poll.expired? %>
   </td>
 <% else %>
   <td>
-    <span class="delete"><%= t("admin.booth_assignments.manage.status.unassigned") %></span>
+    <span class="disabled"><%= t("admin.booth_assignments.manage.status.unassigned") %></span>
   </td>
-  <td class="text-right">
+  <td>
     <%= link_to t("admin.booth_assignments.manage.actions.assign"),
                 admin_poll_booth_assignments_path(@poll, booth_id: booth.id),
                 method: :post,
                 remote: true,
                 title: t("admin.booth_assignments.manage.actions.assign"),
-                class: "button" if !@poll.expired? %>
+                class: "button hollow expanded" if !@poll.expired? %>
   </td>
 <% end %>
diff --git a/app/views/admin/poll/booth_assignments/manage.html.erb b/app/views/admin/poll/booth_assignments/manage.html.erb
index b7d619c71..449037b9e 100644
--- a/app/views/admin/poll/booth_assignments/manage.html.erb
+++ b/app/views/admin/poll/booth_assignments/manage.html.erb
@@ -1,9 +1,6 @@
-<%= link_to booth_assignments_admin_polls_path do %>
-  <span class="icon-angle-left"></span> <%= t("shared.back") %>
-<% end %>
-<hr>
+<%= back_link_to booth_assignments_admin_polls_path %>
 
-<h2 class="inline-block"><%= t("admin.booth_assignments.manage.assignments_list", poll: @poll.name) %></h2>
+<h2><%= t("admin.booth_assignments.manage.assignments_list", poll: @poll.name) %></h2>
 
 <% if @booths.empty? %>
   <div class="callout primary">
@@ -15,7 +12,7 @@
       <th><%= t("admin.booths.index.name") %></th>
       <th><%= t("admin.booths.index.location") %></th>
       <th><%= t("admin.booth_assignments.manage.status.assign_status") %></th>
-      <th class="text-right"><%= t("admin.actions.actions") %></th>
+      <th class="small-3"><%= t("admin.actions.actions") %></th>
     </thead>
     <tbody>
     <% @booths.each do |booth| %>
diff --git a/app/views/admin/poll/booths/_form.html.erb b/app/views/admin/poll/booths/_form.html.erb
index 31d60c0f0..5445144af 100644
--- a/app/views/admin/poll/booths/_form.html.erb
+++ b/app/views/admin/poll/booths/_form.html.erb
@@ -1,20 +1,16 @@
-<div class="row">
-  <div class="small-12 medium-6 column">
-    <%= f.text_field :name,
-                     placeholder: t('admin.booths.new.name'),
-                     label:       t("admin.booths.new.name") %>
-  </div>
-
-  <div class="small-12 column">
-    <%= f.text_field :location,
-                     placeholder: t("admin.booths.new.location"),
-                     label:       t("admin.booths.new.location") %>
-  </div>
+<div class="small-12 medium-6 column">
+  <%= f.text_field :name,
+                   placeholder: t('admin.booths.new.name'),
+                   label:       t("admin.booths.new.name") %>
 </div>
 
-<div class="row">
-  <div class="small-12 medium-4 column">
-    <%= f.submit t("admin.booths.#{admin_submit_action(@booth)}.submit_button"),
-                 class: "button success expanded" %>
-  </div>
-</div>
\ No newline at end of file
+<div class="small-12 medium-6 column clear">
+  <%= f.text_field :location,
+                   placeholder: t("admin.booths.new.location"),
+                   label:       t("admin.booths.new.location") %>
+</div>
+
+<div class="small-12 medium-4 large-3 column clear end">
+  <%= f.submit t("admin.booths.#{admin_submit_action(@booth)}.submit_button"),
+               class: "button success expanded" %>
+</div>
diff --git a/app/views/admin/poll/booths/edit.html.erb b/app/views/admin/poll/booths/edit.html.erb
index 66bfa8355..7ed55dd21 100644
--- a/app/views/admin/poll/booths/edit.html.erb
+++ b/app/views/admin/poll/booths/edit.html.erb
@@ -1,6 +1,8 @@
 <%= back_link_to admin_booths_path %>
 
-<h2><%= t("admin.booths.edit.title") %></h2>
+<div class="small-12 column">
+  <h2><%= t("admin.booths.edit.title") %></h2>
+</div>
 
 <%= form_for @booth, url: admin_booth_path(@booth) do |f| %>
   <%= render "form", f: f %>
diff --git a/app/views/admin/poll/booths/index.html.erb b/app/views/admin/poll/booths/index.html.erb
index 95b248b3f..f1a21d06e 100644
--- a/app/views/admin/poll/booths/index.html.erb
+++ b/app/views/admin/poll/booths/index.html.erb
@@ -1,7 +1,7 @@
 <h2 class="inline-block"><%= t("admin.booths.index.title") %></h2>
 
 <% if controller_name == "booths" && action_name != "available" %>
-  <%= link_to t("admin.booths.index.add_booth"), new_admin_booth_path, class: "button success float-right" %>
+  <%= link_to t("admin.booths.index.add_booth"), new_admin_booth_path, class: "button float-right" %>
 <% end %>
 
 <% if @booths.empty? %>
diff --git a/app/views/admin/poll/booths/new.html.erb b/app/views/admin/poll/booths/new.html.erb
index cf9581fa3..54e64c907 100644
--- a/app/views/admin/poll/booths/new.html.erb
+++ b/app/views/admin/poll/booths/new.html.erb
@@ -1,6 +1,8 @@
 <%= back_link_to admin_booths_path %>
 
-<h2><%= t("admin.booths.new.title") %></h2>
+<div class="small-12 column">
+  <h2><%= t("admin.booths.new.title") %></h2>
+</div>
 
 <%= form_for @booth, url: admin_booths_path(@booth) do |f| %>
   <%= render "form", f: f %>
diff --git a/app/views/admin/poll/officers/_officer.html.erb b/app/views/admin/poll/officers/_officer.html.erb
index 3562b4a90..21a5bbdbc 100644
--- a/app/views/admin/poll/officers/_officer.html.erb
+++ b/app/views/admin/poll/officers/_officer.html.erb
@@ -1,8 +1,9 @@
 <table>
   <thead>
     <tr>
-      <th><%= t('admin.poll_officers.officer.name') %></th>
-      <th colspan="2"><%= t('admin.poll_officers.officer.email') %></th>
+      <th><%= t("admin.poll_officers.officer.name") %></th>
+      <th><%= t("admin.poll_officers.officer.email") %></th>
+      <th class="small-3"><%= t("admin.actions.actions") %></th>
     </tr>
   </thead>
   <tbody>
@@ -13,16 +14,16 @@
       <td>
         <%= officer.email %>
       </td>
-      <td class="text-right">
+      <td>
         <% if officer.persisted? %>
-          <%= link_to t('admin.poll_officers.officer.delete'),
+          <%= link_to t("admin.poll_officers.officer.delete"),
                       admin_officer_path(officer),
                       method: :delete,
-                      class: "button hollow alert" %>
+                      class: "button hollow alert expanded" %>
         <% else %>
-          <%= link_to t('admin.poll_officers.officer.add'),{ controller: "admin/poll/officers", action: :create, user_id: officer.user_id },
+          <%= link_to t("admin.poll_officers.officer.add"),{ controller: "admin/poll/officers", action: :create, user_id: officer.user_id },
                       method: :post,
-                      class: "button success" %>
+                      class: "button success expanded" %>
         <% end %>
       </td>
     </tr>
diff --git a/app/views/admin/poll/officers/index.html.erb b/app/views/admin/poll/officers/index.html.erb
index fd9619167..433d0fdbf 100644
--- a/app/views/admin/poll/officers/index.html.erb
+++ b/app/views/admin/poll/officers/index.html.erb
@@ -1,23 +1,22 @@
 <h2><%= t("admin.poll_officers.index.title") %></h2>
 
-<div class="row">
-  <div class="small-12 medium-6 column">
-    <%= render 'search' %>
-  </div>
+<div class="small-12 medium-6">
+  <%= render 'search' %>
 </div>
 
 <div id="search-result"></div>
 
 <h3>
-  <%= page_entries_info @officers, entry_name: t('admin.poll_officers.officer.entry_name') %>
+  <%= page_entries_info @officers, entry_name: t("admin.poll_officers.officer.entry_name") %>
 </h3>
 
 <% 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>
+        <th><%= t("admin.poll_officers.officer.name") %></th>
+        <th><%= t("admin.poll_officers.officer.email") %></th>
+        <th class="small-3"><%= t("admin.actions.actions") %></th>
       </tr>
     </thead>
     <tbody>
@@ -29,19 +28,19 @@
         <td>
           <%= officer.email %>
         </td>
-        <td class="text-right">
+        <td>
           <% if officer.persisted? %>
-            <%= link_to t('admin.poll_officers.officer.delete'),
+            <%= link_to t("admin.poll_officers.officer.delete"),
                         admin_officer_path(officer),
                         method: :delete,
-                        class: "button hollow alert"
+                        class: "button hollow alert expanded"
             %>
           <% else %>
-            <%= link_to t('admin.poll_officers.officer.add'),
+            <%= link_to t("admin.poll_officers.officer.add"),
                         { controller: "admin/poll/officers", action: :create,
                           user_id: officer.user_id },
                         method: :post,
-                        class: "button success" %>
+                        class: "button success expanded" %>
           <% end %>
         </td>
       </tr>
diff --git a/app/views/admin/poll/shifts/_search_officers.html.erb b/app/views/admin/poll/shifts/_search_officers.html.erb
index e63d09d41..e95090f9c 100644
--- a/app/views/admin/poll/shifts/_search_officers.html.erb
+++ b/app/views/admin/poll/shifts/_search_officers.html.erb
@@ -1,19 +1,17 @@
-<div class="row">
-  <div class="small-12 medium-6 column">
-    <%= 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"),
-                            id: "search-officers" %>
-        <div class="input-group-button">
-          <%= submit_tag t("admin.poll_shifts.new.search_officer_button"),
-                         class: "button" %>
-        </div>
+<div class="small-12 medium-6">
+  <%= 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"),
+                          id: "search-officers" %>
+      <div class="input-group-button">
+        <%= submit_tag t("admin.poll_shifts.new.search_officer_button"),
+                       class: "button" %>
       </div>
-    <% end %>
-  </div>
+    </div>
+  <% end %>
 </div>
 
 <div id="search-officers-results"></div>
diff --git a/app/views/admin/poll/shifts/_shifts.html.erb b/app/views/admin/poll/shifts/_shifts.html.erb
index 63cbe0690..66d64ed22 100644
--- a/app/views/admin/poll/shifts/_shifts.html.erb
+++ b/app/views/admin/poll/shifts/_shifts.html.erb
@@ -5,7 +5,7 @@
       <th><%= t("admin.poll_shifts.new.date") %></th>
       <th><%= t("admin.poll_shifts.new.officer") %></th>
       <th><%= t("admin.poll_shifts.new.task") %></th>
-      <th class="text-right"><%= t("admin.poll_shifts.new.shift") %></th>
+      <th class="small-3"><%= t("admin.poll_shifts.new.shift") %></th>
     </tr>
   </thead>
   <tbody>
@@ -14,11 +14,11 @@
         <td><%= l(shift.date.to_date, format: :long) %></td>
         <td><%= shift.officer_name %></td>
         <td><%= t("admin.poll_shifts.#{shift.task}") %></td>
-        <td class="text-right">
+        <td>
           <%= link_to t("admin.poll_shifts.new.remove_shift"),
                       admin_booth_shift_path(@booth, shift),
                       method: :delete,
-                      class: "button hollow alert" %>
+                      class: "button hollow alert expanded" %>
         </td>
       </tr>
     <% end %>