diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index cc11557c5..5c7aab0fc 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -155,6 +155,11 @@ body.admin {
   }
 }
 
+.admin .tabs-panel {
+  padding-left: 0;
+  padding-right: 0;
+}
+
 // 02. Sidebar
 // -----------
 
diff --git a/app/views/admin/poll/polls/_booths.html.erb b/app/views/admin/poll/polls/_booths.html.erb
index ae6d28abe..4d52d8a74 100644
--- a/app/views/admin/poll/polls/_booths.html.erb
+++ b/app/views/admin/poll/polls/_booths.html.erb
@@ -1,39 +1,34 @@
-<div class="row">
-  <div class="small-12 column">
-    <% if @poll.booths.empty? %>
-      <div class="callout primary text-center">
-        <%= t("admin.polls.show.no_booths") %>
-      </div>
-    <% else %>
+<h3><%= t("admin.polls.show.booths_title") %></h3>
 
-      <h2><%= t("admin.polls.show.booths_title") %></h2>
-
-      <table>
-        <thead>
-          <th><%= t("admin.polls.show.name") %></th>
-          <th><%= t("admin.polls.show.location") %></th>
-          <th>&nbsp;</th>
-        </thead>
-        <tbody>
-          <% @poll.booths.each do |booth| %>
-            <tr id="booth_<%= booth.id %>" class="booth">
-              <td>
-                <strong>
-                  <%= link_to booth.name, admin_booth_path(booth) %>
-                </strong>
-              </td>
-              <td>
-                <%= booth.location %>
-              </td>
-              <td class="text-right">
-                <%= link_to t("admin.polls.show.remove_booth"),
-                            "#",
-                            class: "button hollow alert" %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    <% end %>
+<% if @poll.booths.empty? %>
+  <div class="callout primary margin-top">
+    <%= t("admin.polls.show.no_booths") %>
   </div>
-</div>
\ No newline at end of file
+<% else %>
+  <table>
+    <thead>
+      <th><%= t("admin.polls.show.name") %></th>
+      <th><%= t("admin.polls.show.location") %></th>
+      <th>&nbsp;</th>
+    </thead>
+    <tbody>
+      <% @poll.booths.each do |booth| %>
+        <tr id="booth_<%= booth.id %>" class="booth">
+          <td>
+            <strong>
+              <%= link_to booth.name, admin_booth_path(booth) %>
+            </strong>
+          </td>
+          <td>
+            <%= booth.location %>
+          </td>
+          <td class="text-right">
+            <%= link_to t("admin.polls.show.remove_booth"),
+                        "#",
+                        class: "button hollow alert" %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
diff --git a/app/views/admin/poll/polls/_filter_subnav.html.erb b/app/views/admin/poll/polls/_filter_subnav.html.erb
index d92cf7235..e55e52f63 100644
--- a/app/views/admin/poll/polls/_filter_subnav.html.erb
+++ b/app/views/admin/poll/polls/_filter_subnav.html.erb
@@ -1,30 +1,20 @@
-<div class="row">
-  <div class="small-12 column">
-    <ul class="tabs" data-tabs id="example-tabs">
-      <li class="tabs-title is-active">
-        <%= link_to "#tab-questions" do %>
-          <h2>
-            <%= t("admin.polls.show.questions_tab") %>
-            <span class="js-comments-count">(<%= @poll.questions.count %>)</span>
-          </h2>
-        <% end %>
-      </li>
-      <li class="tabs-title">
-        <%= link_to "#tab-booths" do %>
-          <h2>
-            <%= t("admin.polls.show.booths_tab") %>
-            (<%= @poll.booths.count %>)
-          </h2>
-        <% end %>
-      </li>
-      <li class="tabs-title">
-        <%= link_to "#tab-officers" do %>
-          <h2>
-            <%= t("admin.polls.show.officers_tab") %>
-            (<%= @poll.officers.count %>)
-          </h2>
-        <% end %>
-      </li>
-    </ul>
-  </div>
-</div>
\ No newline at end of file
+<ul class="tabs" data-tabs id="example-tabs">
+  <li class="tabs-title is-active">
+    <%= link_to "#tab-questions" do %>
+      <%= t("admin.polls.show.questions_tab") %>
+      <span class="js-comments-count">(<%= @poll.questions.count %>)</span>
+    <% end %>
+  </li>
+  <li class="tabs-title">
+    <%= link_to "#tab-booths" do %>
+      <%= t("admin.polls.show.booths_tab") %>
+      (<%= @poll.booths.count %>)
+    <% end %>
+  </li>
+  <li class="tabs-title">
+    <%= link_to "#tab-officers" do %>
+      <%= t("admin.polls.show.officers_tab") %>
+      (<%= @poll.officers.count %>)
+    <% end %>
+  </li>
+</ul>
diff --git a/app/views/admin/poll/polls/_officers.html.erb b/app/views/admin/poll/polls/_officers.html.erb
index 240eb7b1c..11b4cce50 100644
--- a/app/views/admin/poll/polls/_officers.html.erb
+++ b/app/views/admin/poll/polls/_officers.html.erb
@@ -1,33 +1,28 @@
-<div class="row">
-  <div class="small-12 column">
-    <% if @poll.officers.empty? %>
-      <div class="callout primary text-center">
-        <%= t("admin.polls.show.no_officers") %>
-      </div>
-    <% else %>
+<h3><%= t("admin.polls.show.officers_title") %></h3>
 
-      <h2><%= t("admin.polls.show.officers_title") %></h2>
-
-      <table>
-        <thead>
-          <th><%= t("admin.polls.show.name") %></th>
-          <th><%= t("admin.polls.show.email") %></th>
-        </thead>
-        <tbody>
-          <% @poll.officers.each do |officer| %>
-            <tr id="officer_<%= officer.id %>" class="officer">
-              <td>
-                <strong>
-                  <%= officer.name %>
-                </strong>
-              </td>
-              <td>
-                <%= officer.email %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    <% end %>
+<% if @poll.officers.empty? %>
+  <div class="callout primary margin-top">
+    <%= t("admin.polls.show.no_officers") %>
   </div>
-</div>
\ No newline at end of file
+<% else %>
+  <table>
+    <thead>
+      <th><%= t("admin.polls.show.name") %></th>
+      <th><%= t("admin.polls.show.email") %></th>
+    </thead>
+    <tbody>
+      <% @poll.officers.each do |officer| %>
+        <tr id="officer_<%= officer.id %>" class="officer">
+          <td>
+            <strong>
+              <%= officer.name %>
+            </strong>
+          </td>
+          <td>
+            <%= officer.email %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
diff --git a/app/views/admin/poll/polls/_questions.html.erb b/app/views/admin/poll/polls/_questions.html.erb
index 91f33196c..08b094ddf 100644
--- a/app/views/admin/poll/polls/_questions.html.erb
+++ b/app/views/admin/poll/polls/_questions.html.erb
@@ -1,29 +1,24 @@
-<div class="row">
-  <div class="small-12 column">
-    <% if @poll.questions.empty? %>
-      <div class="callout primary text-center">
-        <%= t('admin.polls.show.no_questions') %>
-      </div>
-    <% else %>
+<h3><%= t("admin.polls.show.questions_title") %></h3>
 
-      <h2><%= t("admin.polls.show.questions_title") %></h2>
-
-      <table>
-        <% @poll.questions.each do |question| %>
-          <tr id="<%= dom_id(question) %>">
-            <td><%= link_to question.title, admin_question_path(question) %></td>
-            <td class="text-right">
-              <%= link_to t('shared.edit'),
-                          edit_admin_question_path(question),
-                          class: "button hollow" %>
-              <%= link_to t('shared.delete'),
-                          admin_question_path(question),
-                          class: "button hollow alert",
-                          method: :delete %>
-            </td>
-          </tr>
-        <% end %>
-      </table>
-    <% end %>
+<% if @poll.questions.empty? %>
+  <div class="callout primary margin-top">
+    <%= t('admin.polls.show.no_questions') %>
   </div>
-</div>
\ No newline at end of file
+<% else %>
+  <table class="margin-top">
+    <% @poll.questions.each do |question| %>
+      <tr id="<%= dom_id(question) %>">
+        <td><%= link_to question.title, admin_question_path(question) %></td>
+        <td class="text-right">
+          <%= link_to t('shared.edit'),
+                      edit_admin_question_path(question),
+                      class: "button hollow" %>
+          <%= link_to t('shared.delete'),
+                      admin_question_path(question),
+                      class: "button hollow alert",
+                      method: :delete %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>