diff --git a/docs-web/src/main/webapp/src/partial/docs/document.html b/docs-web/src/main/webapp/src/partial/docs/document.html
index 557dfd6a..0f9276a1 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.html
@@ -46,6 +46,19 @@
         </tr>
         </thead>
         <tbody>
+        <tr ng-if="!documents">
+          <td colspan="3" class="text-center">
+            <img src="img/loader.gif" />
+          </td>
+        </tr>
+
+        <tr ng-if="totalDocuments == 0">
+          <td colspan="3" class="text-center">
+            <span ng-if="search.length == 0">No document in the database</span>
+            <span ng-if="search.length > 0">No matches for <strong>"{{ search }}"</strong></span>
+          </td>
+        </tr>
+
         <tr ng-click="viewDocument(document.id)" ng-repeat="document in documents" ng-class="{ active: $stateParams.id == document.id }">
           <td>
             {{ document.title }} ({{ document.file_count }})
@@ -79,8 +92,11 @@
         used on {{ userInfo.storage_quota / 1000000 | number: 0 }}MB
       </div>
 
-      <div class="text-right">
-        {{ totalDocuments }} document{{ totalDocuments > 1 ? 's' : '' }} found
+      <div class="text-right" >
+        <span ng-if="totalDocuments">
+          {{ totalDocuments }} document{{ totalDocuments > 1 ? 's' : '' }} found
+        </span>
+        <span ng-if="!totalDocuments">&nbsp;</span>
       </div>
     </div>
   </div>
diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.group.html b/docs-web/src/main/webapp/src/partial/docs/settings.group.html
index 284706ec..84b6e535 100644
--- a/docs-web/src/main/webapp/src/partial/docs/settings.group.html
+++ b/docs-web/src/main/webapp/src/partial/docs/settings.group.html
@@ -1,4 +1,4 @@
-<h1>Groups <small>management</small> <a class="btn btn-primary" href="#/settings/group/add">Add</a></h1>
+<h1>Groups <small>management</small> <a class="btn btn-primary" href="#/settings/group/add">Add a group</a></h1>
 
 <div class="row">
   <div class="col-md-4 well">
diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.session.html b/docs-web/src/main/webapp/src/partial/docs/settings.session.html
index 8d32a86d..2b5c015b 100644
--- a/docs-web/src/main/webapp/src/partial/docs/settings.session.html
+++ b/docs-web/src/main/webapp/src/partial/docs/settings.session.html
@@ -13,10 +13,12 @@
       <td>{{ session.create_date | date: 'yyyy-MM-dd HH:mm' }}</td>
       <td>{{ session.last_connection_date | date: 'yyyy-MM-dd HH:mm' }}</td>
       <td title="{{ session.user_agent }}">{{ session.ip }}</td>
-      <td><span ng-show="session.current" class="glyphicon glyphicon-ok"></span></td>
+      <td>
+        <span ng-show="session.current" class="glyphicon glyphicon-ok" title="This is the current session"></span>
+      </td>
     </tr>
   </tbody>
 </table>
 <div class="form-actions">
-  <button type="submit" class="btn btn-warning" ng-click="deleteSession()">Clear all other sessions</button>
+  <button type="submit" class="btn btn-warning" title="All other devices connected to this account will be disconnected" ng-click="deleteSession()">Clear all other sessions</button>
 </div>
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.user.html b/docs-web/src/main/webapp/src/partial/docs/settings.user.html
index c4fb3c1b..2f4e991e 100644
--- a/docs-web/src/main/webapp/src/partial/docs/settings.user.html
+++ b/docs-web/src/main/webapp/src/partial/docs/settings.user.html
@@ -1,4 +1,4 @@
-<h1>Users <small>management</small> <a class="btn btn-primary" href="#/settings/user/add">Add</a></h1>
+<h1>Users <small>management</small> <a class="btn btn-primary" href="#/settings/user/add">Add a user</a></h1>
 
 <div class="row">
   <div class="col-md-4 well">