diff --git a/app/static/js/nopaque/RessourceLists/CorpusFileList.js b/app/static/js/nopaque/RessourceLists/CorpusFileList.js
index 282488de..6aa3864b 100644
--- a/app/static/js/nopaque/RessourceLists/CorpusFileList.js
+++ b/app/static/js/nopaque/RessourceLists/CorpusFileList.js
@@ -1,15 +1,15 @@
 class CorpusFileList extends RessourceList {
   static options = {
     item: `
-      <tr>
+      <tr class="hoverable">
         <td><span class="filename"></span></td>
         <td><span class="author"></span></td>
         <td><span class="title"></span></td>
         <td><span class="publishing_year"></span></td>
         <td class="right-align">
           <a class="action-button btn-floating red tooltipped waves-effect waves-light" data-action="delete" data-position="top" data-tooltip="Delete"><i class="material-icons">delete</i></a>
-          <a class="action-button btn-floating tooltipped waves-effect waves-light" data-action="download" data-position="top" data-tooltip="View"><i class="material-icons">file_download</i></a>
-          <a class="action-button btn-floating tooltipped waves-effect waves-light" data-action="view" data-position="top" data-tooltip="View"><i class="material-icons">send</i></a>
+          <a class="action-button btn-floating service-color darken tooltipped waves-effect waves-light" data-action="download" data-position="top" data-service="corpus-analysis" data-tooltip="View"><i class="material-icons">file_download</i></a>
+          <a class="action-button btn-floating service-color darken tooltipped waves-effect waves-light" data-action="view" data-position="top" data-service="corpus-analysis" data-tooltip="View"><i class="material-icons">send</i></a>
         </td>
       </tr>
     `.trim(),
diff --git a/app/static/js/nopaque/RessourceLists/CorpusList.js b/app/static/js/nopaque/RessourceLists/CorpusList.js
index 66175a12..7d4eb077 100644
--- a/app/static/js/nopaque/RessourceLists/CorpusList.js
+++ b/app/static/js/nopaque/RessourceLists/CorpusList.js
@@ -1,13 +1,13 @@
 class CorpusList extends RessourceList {
   static options = {
     item: `
-      <tr>
+      <tr class="hoverable">
         <td><a class="btn-floating disabled"><i class="material-icons service-color darken" data-service="corpus-analysis">book</i></a></td>
         <td><b class="title"></b><br><i class="description"></i></td>
         <td><span class="badge new status status-color status-text" data-badge-caption=""></span></td>
         <td class="right-align">
           <a class="action-button btn-floating red tooltipped waves-effect waves-light" data-action="delete" data-position="top" data-tooltip="Delete"><i class="material-icons">delete</i></a>
-          <a class="action-button btn-floating tooltipped waves-effect waves-light" data-action="view" data-position="top" data-tooltip="View"><i class="material-icons">send</i></a>
+          <a class="action-button btn-floating service-color darken tooltipped waves-effect waves-light" data-action="view" data-position="top" data-service="corpus-analysis" data-tooltip="View"><i class="material-icons">send</i></a>
         </td>
       </tr>
     `.trim(),
diff --git a/app/static/js/nopaque/RessourceLists/JobInputList.js b/app/static/js/nopaque/RessourceLists/JobInputList.js
index aaece35b..714f3e59 100644
--- a/app/static/js/nopaque/RessourceLists/JobInputList.js
+++ b/app/static/js/nopaque/RessourceLists/JobInputList.js
@@ -1,7 +1,7 @@
 class JobInputList extends RessourceList {
   static options = {
     item: `
-      <tr>
+      <tr class="hoverable">
         <td><span class="filename"></span></td>
         <td class="right-align">
           <a class="action-button btn-floating tooltipped waves-effect waves-light" data-action="download" data-position="top" data-tooltip="View"><i class="material-icons">file_download</i></a>
diff --git a/app/static/js/nopaque/RessourceLists/JobList.js b/app/static/js/nopaque/RessourceLists/JobList.js
index dc0478f7..ecb84dbd 100644
--- a/app/static/js/nopaque/RessourceLists/JobList.js
+++ b/app/static/js/nopaque/RessourceLists/JobList.js
@@ -1,7 +1,7 @@
 class JobList extends RessourceList {
   static options = {
     item: `
-      <tr class="service-color lighten">
+      <tr class="hoverable service-color lighten">
         <td><a class="btn-floating disabled"><i class="nopaque-icons service-color darken serviceDuplicate1 service-icon"></i></a></td>
         <td><b class="title"></b><br><i class="description"></i></td>
         <td><span class="badge new status status-color status-text" data-badge-caption=""></span></td>
diff --git a/app/static/js/nopaque/RessourceLists/JobResultList.js b/app/static/js/nopaque/RessourceLists/JobResultList.js
index bb496c87..53413f3b 100644
--- a/app/static/js/nopaque/RessourceLists/JobResultList.js
+++ b/app/static/js/nopaque/RessourceLists/JobResultList.js
@@ -1,7 +1,7 @@
 class JobResultList extends RessourceList {
   static options = {
     item: `
-      <tr>
+      <tr class="hoverable">
         <td><span class="description"></span></td>
         <td><span class="filename"></span></td>
         <td class="right-align">
diff --git a/app/static/js/nopaque/RessourceLists/QueryResultList.js b/app/static/js/nopaque/RessourceLists/QueryResultList.js
index f91818d6..429cc70a 100644
--- a/app/static/js/nopaque/RessourceLists/QueryResultList.js
+++ b/app/static/js/nopaque/RessourceLists/QueryResultList.js
@@ -1,7 +1,7 @@
 class QueryResultList extends RessourceList {
   static options = {
     item: `
-      <tr>
+      <tr class="hoverable">
         <td><b class="title"></b><br><i class="description"></i><br></td>
         <td><span class="corpus_title"></span><br><span class="query"></span></td>
         <td class="right-align">
diff --git a/app/static/js/nopaque/RessourceLists/UserList.js b/app/static/js/nopaque/RessourceLists/UserList.js
index a39e580c..e52eac48 100644
--- a/app/static/js/nopaque/RessourceLists/UserList.js
+++ b/app/static/js/nopaque/RessourceLists/UserList.js
@@ -1,7 +1,7 @@
 class UserList extends RessourceList {
   static options = {
     item: `
-      <tr>
+      <tr class="hoverable">
         <td><span class="idDuplicate"></span></td>
         <td><span class="username"></span></td>
         <td><span class="email"></span></td>
diff --git a/app/templates/admin/user.html.j2 b/app/templates/admin/user.html.j2
index 136cf278..9af7e4e0 100644
--- a/app/templates/admin/user.html.j2
+++ b/app/templates/admin/user.html.j2
@@ -46,7 +46,7 @@
             <input id="search-corpus" class="search" type="search"></input>
             <label for="search-corpus">Search corpus</label>
           </div>
-          <table class="highlight ressource-list">
+          <table>
             <thead>
               <tr>
                 <th></th>
@@ -71,7 +71,7 @@
             <input id="search-job" class="search" type="search"></input>
             <label for="search-job">Search job</label>
           </div>
-          <table class="highlight">
+          <table>
             <thead>
               <tr>
                 <th>Service</th>
diff --git a/app/templates/admin/users.html.j2 b/app/templates/admin/users.html.j2
index 43d1f3d9..37899866 100644
--- a/app/templates/admin/users.html.j2
+++ b/app/templates/admin/users.html.j2
@@ -16,7 +16,7 @@
             <input id="search-user" class="search" type="text"></input>
             <label for="search-user">Search user</label>
           </div>
-          <table class="highlight">
+          <table>
             <thead>
               <tr>
                 <th>Id</th>
diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2
index ab1ccd3b..bae6f8d5 100644
--- a/app/templates/corpora/corpus.html.j2
+++ b/app/templates/corpora/corpus.html.j2
@@ -81,7 +81,7 @@
             <input class="search" id="search-corpus-files" type="search"></input>
             <label for="search-corpus-files">Search corpus files</label>
           </div>
-          <table class="highlight responsive-table">
+          <table>
             <thead>
               <tr>
                 <th>Filename</th>
diff --git a/app/templates/jobs/job.html.j2 b/app/templates/jobs/job.html.j2
index f8849b67..f5f70769 100644
--- a/app/templates/jobs/job.html.j2
+++ b/app/templates/jobs/job.html.j2
@@ -96,7 +96,7 @@
               <p>Original input files.</p>
             </div>
             <div class="col s12 m10">
-              <table class="highlight responsive-table">
+              <table>
                 <thead>
                   <tr>
                     <th>Filename</th>
@@ -121,7 +121,7 @@
               <p>Processed result files.</p>
             </div>
             <div class="col s12 m10">
-              <table class="highlight responsive-table">
+              <table>
                 <thead>
                   <tr>
                     <th>Description</th>
diff --git a/app/templates/main/dashboard.html.j2 b/app/templates/main/dashboard.html.j2
index 9dc51017..1e763c3e 100644
--- a/app/templates/main/dashboard.html.j2
+++ b/app/templates/main/dashboard.html.j2
@@ -26,7 +26,7 @@
                 <input id="search-corpus" class="search" type="search"></input>
                 <label for="search-corpus">Search corpus</label>
               </div>
-              <table class="highlight">
+              <table>
                 <thead>
                   <tr>
                     <th></th>
@@ -53,7 +53,7 @@
                 <input id="search-query-results" class="search" type="search"></input>
                 <label for="search-query-results">Search query result</label>
               </div>
-              <table class="highlight">
+              <table>
                 <thead>
                   <tr>
                     <th>Title and Description</th>
@@ -83,7 +83,7 @@
             <input id="search-job" class="search" type="search"></input>
             <label for="search-job">Search job</label>
           </div>
-          <table class="highlight">
+          <table>
             <thead>
               <tr>
                 <th>Service</th>