diff --git a/app/views/admin/valuators/_valuator.html.erb b/app/views/admin/valuators/_valuator.html.erb
index e5971391b..e4495ba3b 100644
--- a/app/views/admin/valuators/_valuator.html.erb
+++ b/app/views/admin/valuators/_valuator.html.erb
@@ -1,7 +1,11 @@
-<div class="small-12 column">
-  <h3><%= t('admin.valuators.valuator.user_found') %></h3>
+<h3><%= t('admin.valuators.valuator.user_found') %></h3>
 
-  <table>
+<table>
+  <thead>
+    <th scope="col"><%= t("admin.valuators.index.name") %></th>
+    <th scope="col"><%= t("admin.valuators.index.email") %></th>
+  </thead>
+  <tbody>
     <tr>
       <td>
         <%= valuator.name %>
@@ -10,19 +14,21 @@
         <%= valuator.email %>
       </td>
     </tr>
-  </table>
+  </tbody>
+</table>
 
-  <% unless @valuator.persisted? %>
-    <%= form_for @valuator, url: admin_valuators_path do |f| %>
-      <div class="row">
-        <div class="small-12 medium-4 column ">
-          <%= f.text_field :description, label: false, placeholder: t('admin.valuators.valuator.description_placeholder') %>
+<% unless @valuator.persisted? %>
+  <%= form_for @valuator, url: admin_valuators_path do |f| %>
+    <div class="small-12 medium-8">
+      <div class="input-group">
+        <%= f.text_field :description, label: false, placeholder: t('admin.valuators.valuator.description_placeholder') %>
+
+        <div class="input-group-button">
           <%= f.hidden_field :user_id %>
-        </div>
-        <div class="small-12 medium-2 column end" style="border:ddotted 10px red;">
-          <%= f.submit t('admin.valuators.valuator.add'), class: "button success float-left" %>
+          <%= f.submit t('admin.valuators.valuator.add'), class: "button success" %>
         </div>
       </div>
-    <% end %>
+    </div>
+    <hr>
   <% end %>
-</div>
+<% end %>
diff --git a/app/views/admin/valuators/index.html.erb b/app/views/admin/valuators/index.html.erb
index 30132e66f..ca30006c8 100644
--- a/app/views/admin/valuators/index.html.erb
+++ b/app/views/admin/valuators/index.html.erb
@@ -1,36 +1,51 @@
 <h2><%= t("admin.valuators.index.title") %></h2>
 
-<div class="row">
+<div class="small-12 medium-6">
   <%= form_tag search_admin_valuators_path, method: :get, remote: true  do %>
-    <div class="small-12 medium-6 column">
+    <div class="input-group">
       <%= text_field_tag :email, '', placeholder: t('admin.valuators.search.email_placeholder') %>
-    </div>
-    <div class="small-12 medium-6 column">
-      <%= submit_tag t('admin.valuators.search.search'), class: 'button radius' %>
+      <div class="input-group-button">
+        <%= submit_tag t('admin.valuators.search.search'), class: 'button' %>
+      </div>
     </div>
   <% end %>
 </div>
 
-<div id="search-result" class="row"></div>
+<div id="search-result"></div>
 
-<h3><%= page_entries_info @valuators %></h3>
+<% if @valuators.any? %>
+  <h3 class="margin"><%= page_entries_info @valuators %></h3>
 
-<table id="valuators">
-  <% @valuators.each do |valuator| %>
-    <tr>
-      <td>
-        <%= valuator.name %>
-      </td>
-      <td>
-        <%= valuator.email %>
-      </td>
-      <td>
-        <% if valuator.description.present? %>
-          <%= valuator.description %>
-        <% end %>
-      </td>
-    </tr>
-  <% end %>
-</table>
+  <table id="valuators">
+    <thead>
+      <th scope="col"><%= t("admin.valuators.index.name") %></th>
+      <th scope="col"><%= t("admin.valuators.index.email") %></th>
+      <th scope="col"><%= t("admin.valuators.index.description") %></th>
+    </thead>
+    <tbody>
+      <% @valuators.each do |valuator| %>
+        <tr>
+          <td>
+            <%= valuator.name %>
+          </td>
+          <td>
+            <%= valuator.email %>
+          </td>
+          <td>
+            <% if valuator.description.present? %>
+              <%= valuator.description %>
+            <% else %>
+              <%= t("admin.valuators.index.no_description") %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
 
-<%= paginate @valuators %>
+  <%= paginate @valuators %>
+<% else %>
+  <div class="callout primary">
+    <%= t("admin.valuators.index.no_valuators") %>
+  </div>
+<% end %>
diff --git a/app/views/admin/valuators/user_not_found.js.erb b/app/views/admin/valuators/user_not_found.js.erb
index af3f83a3f..11b549382 100644
--- a/app/views/admin/valuators/user_not_found.js.erb
+++ b/app/views/admin/valuators/user_not_found.js.erb
@@ -1 +1 @@
-$("#search-result").html("<div class=\"small-12 column\"><div class=\"callout alert\"><%= j t('admin.valuators.search.user_not_found') %></div></div>");
+$("#search-result").html("<div class=\"callout alert\"><%= j t('admin.valuators.search.user_not_found') %></div>");
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index d92dcbf05..fc79e93e5 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -464,6 +464,11 @@ en:
     valuators:
       index:
         title: Valuators
+        name: Name
+        email: Email
+        description: Description
+        no_description: No description
+        no_valuators: There are no valuators.
       valuator:
         description_placeholder: 'Description (optional)'
         user_found: User found
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 0fe04d2be..74ba800bb 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -464,6 +464,11 @@ es:
     valuators:
       index:
         title: Evaluadores
+        name: Nombre
+        email: Email
+        description: Descripción
+        no_description: Sin descripción
+        no_valuators: No hay evaluadores.
       valuator:
         description_placeholder: "Descripción (opcional)"
         user_found: Usuario encontrado