diff --git a/app/views/admin/moderators/_moderator.html.erb b/app/views/admin/moderators/_moderator.html.erb
index 57a29d2e8..c69b559fc 100644
--- a/app/views/admin/moderators/_moderator.html.erb
+++ b/app/views/admin/moderators/_moderator.html.erb
@@ -1,26 +1,30 @@
-<div class="small-12 column">
-  <table>
-    <tbody>
-      <tr>
-        <td>
-          <%= moderator.name %>
-        </td>
-        <td>
-          <%= moderator.email %>
-        </td>
-        <td class="text-right">
-          <% if moderator.persisted? %>
-            <%= link_to t('admin.moderators.moderator.delete'),
-                        admin_moderator_path(moderator),
-                        method: :delete,
-                        class: "button hollow alert" %>
-          <% else %>
-            <%= link_to t('admin.moderators.moderator.add'),{ controller: "admin/moderators", action: :create, user_id: moderator.user_id },
-                        method: :post,
-                        class: "button success" %>
-          <% end %>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-</div>
+
+<table>
+  <thead>
+    <th scope="col"><%= t("admin.moderators.index.name") %></th>
+    <th scope="col" class="small-6"><%= t("admin.moderators.index.email") %></th>
+    <th scope="col" class="small-3"><%= t("admin.shared.actions") %></th>
+  </thead>
+  <tbody>
+    <tr>
+      <td>
+        <%= moderator.name %>
+      </td>
+      <td>
+        <%= moderator.email %>
+      </td>
+      <td>
+        <% if moderator.persisted? %>
+          <%= link_to t('admin.moderators.moderator.delete'),
+                      admin_moderator_path(moderator),
+                      method: :delete,
+                      class: "button hollow alert expanded" %>
+        <% else %>
+          <%= link_to t('admin.moderators.moderator.add'),{ controller: "admin/moderators", action: :create, user_id: moderator.user_id },
+                      method: :post,
+                      class: "button success expanded" %>
+        <% end %>
+      </td>
+    </tr>
+  </tbody>
+</table>
diff --git a/app/views/admin/moderators/index.html.erb b/app/views/admin/moderators/index.html.erb
index 0fc8703fd..d6a9b50bb 100644
--- a/app/views/admin/moderators/index.html.erb
+++ b/app/views/admin/moderators/index.html.erb
@@ -2,47 +2,61 @@
 
 <h2 class="inline-block"><%= t("admin.moderators.index.title") %></h2>
 
-<div class="row">
+<div class="small-12 medium-6">
   <%= form_tag search_admin_moderators_path, method: :get, remote: true  do %>
-    <div class="small-12 medium-6 column">
+    <div class="input-group">
       <%= text_field_tag :email, '', placeholder: t('admin.moderators.search.email_placeholder') %>
-    </div>
-    <div class="small-12 medium-6 column">
-      <%= submit_tag t('admin.moderators.search.search'), class: 'button' %>
+      <div class="input-group-button">
+        <%= submit_tag t('admin.moderators.search.search'), class: 'button' %>
+      </div>
     </div>
   <% end %>
 </div>
 
-<div id="search-result" class="row"></div>
+<div id="search-result"></div>
 
-<h3><%= page_entries_info @moderators %></h3>
+<% if @moderators.any? %>
 
-<table id="moderators">
-  <% @moderators.each do |moderator| %>
-    <tr>
-      <td>
-        <%= moderator.name %>
-      </td>
-      <td>
-        <%= moderator.email %>
-      </td>
-      <td class="text-right">
-        <% if moderator.persisted? %>
-          <%= link_to t('admin.moderators.moderator.delete'),
-                      admin_moderator_path(moderator),
-                      method: :delete,
-                      class: "button hollow alert"
-          %>
-        <% else %>
-          <%= link_to t('admin.moderators.moderator.add'),
-                      { controller: "admin/moderators", action: :create,
-                        user_id: moderator.user_id },
-                      method: :post,
-                      class: "button success" %>
-        <% end %>
-      </td>
-    </tr>
-  <% end %>
-</table>
+  <h3><%= page_entries_info @moderators %></h3>
 
-<%= paginate @moderators %>
+  <table id="moderators">
+    <thead>
+      <th scope="col"><%= t("admin.moderators.index.name") %></th>
+      <th scope="col" class="small-6"><%= t("admin.moderators.index.email") %></th>
+      <th scope="col" class="small-3"><%= t("admin.shared.actions") %></th>
+    </thead>
+    <tbody>
+      <% @moderators.each do |moderator| %>
+        <tr>
+          <td>
+            <%= moderator.name %>
+          </td>
+          <td>
+            <%= moderator.email %>
+          </td>
+          <td>
+            <% if moderator.persisted? %>
+              <%= link_to t('admin.moderators.moderator.delete'),
+                          admin_moderator_path(moderator),
+                          method: :delete,
+                          class: "button hollow alert expanded"
+              %>
+            <% else %>
+              <%= link_to t('admin.moderators.moderator.add'),
+                          { controller: "admin/moderators", action: :create,
+                            user_id: moderator.user_id },
+                          method: :post,
+                          class: "button success expanded" %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+  <%= paginate @moderators %>
+<% else %>
+  <div class="callout primary">
+    <%= t("admin.moderators.index.no_moderators") %>
+  </div>
+<% end %>
diff --git a/app/views/admin/moderators/user_not_found.js.erb b/app/views/admin/moderators/user_not_found.js.erb
index a8573236c..9667d81ed 100644
--- a/app/views/admin/moderators/user_not_found.js.erb
+++ b/app/views/admin/moderators/user_not_found.js.erb
@@ -1 +1 @@
-$("#search-result").html("<div class=\"small-12 column\"><div class=\"callout alert\"><%= j t('admin.moderators.search.user_not_found') %></div></div>");
+$("#search-result").html("<div class=\"callout alert\"><%= j t('admin.moderators.search.user_not_found') %></div>");
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index a6a407a41..ff1d83cd9 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -446,6 +446,9 @@ en:
     moderators:
       index:
         title: Moderators
+        name: Name
+        email: Email
+        no_moderators: There are no moderators.
       moderator:
         add: Add
         delete: Delete
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 503cdafc3..af3ef5830 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -446,6 +446,9 @@ es:
     moderators:
       index:
         title: Moderadores
+        name: Nombre
+        email: Email
+        no_moderators: No hay moderadores.
       moderator:
         add: Añadir como Moderador
         delete: Borrar