diff --git a/docs-parent/TODO b/docs-parent/TODO
index 6615600d..e69de29b 100644
--- a/docs-parent/TODO
+++ b/docs-parent/TODO
@@ -1 +0,0 @@
-- Loading feedback for document (list), document.view, tag.default
diff --git a/docs-web/src/main/webapp/app/docs/controller/Navigation.js b/docs-web/src/main/webapp/app/docs/controller/Navigation.js
index 01b8323d..8d11ae00 100644
--- a/docs-web/src/main/webapp/app/docs/controller/Navigation.js
+++ b/docs-web/src/main/webapp/app/docs/controller/Navigation.js
@@ -3,7 +3,7 @@
 /**
  * Navigation controller.
  */
-App.controller('Navigation', function($scope, $state, $rootScope, User, Restangular) {
+App.controller('Navigation', function($scope, $http, $state, $rootScope, User, Restangular) {
   $rootScope.userInfo = User.userInfo();
   
   /**
@@ -16,4 +16,8 @@ App.controller('Navigation', function($scope, $state, $rootScope, User, Restangu
     });
     $event.preventDefault();
   };
+  
+  $scope.isLoading = function() {
+    return $http.pendingRequests.length > 0;
+  };
 });
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/img/loader.gif b/docs-web/src/main/webapp/img/loader.gif
new file mode 100644
index 00000000..5b33f7e5
Binary files /dev/null and b/docs-web/src/main/webapp/img/loader.gif differ
diff --git a/docs-web/src/main/webapp/index.html b/docs-web/src/main/webapp/index.html
index 0318c5fa..6379ae6c 100644
--- a/docs-web/src/main/webapp/index.html
+++ b/docs-web/src/main/webapp/index.html
@@ -60,6 +60,10 @@
     <div class="navbar" ng-controller="Navigation">
       <div class="navbar-inner">
         <div class="container">
+          <div class="brand loader" ng-class="{hide: !isLoading() }">
+            <img src="img/loader.gif" />
+          </div>
+          
           <a class="brand hidden-phone" href="#">Sismics Docs</a>
           
           <ul class="nav" ng-show="!userInfo.anonymous">
diff --git a/docs-web/src/main/webapp/partial/docs/document.view.html b/docs-web/src/main/webapp/partial/docs/document.view.html
index 4fbad6c8..23441a8c 100644
--- a/docs-web/src/main/webapp/partial/docs/document.view.html
+++ b/docs-web/src/main/webapp/partial/docs/document.view.html
@@ -1,40 +1,44 @@
-<div class="text-right">
-  <div class="btn-group">
-    <button class="btn btn-danger" ng-click="deleteDocument(document)"><span class="icon-trash icon-white"></span> Delete</button>
-    <button class="btn btn-primary" ng-click="editDocument(document.id)"><span class="icon-pencil icon-white"></span> Edit</button>
-  </div>
-</div>
+<img src="img/loader.gif" ng-show="!document" />
 
-<div class="page-header">
-  <h1>{{ document.title }} <small>{{ document.create_date | date: 'yyyy-MM-dd' }}</small></h1>
-  <p>
-    <button class="btn btn-small btn-inverse" ng-click="share()"><span class="icon-share icon-white"></span> Share</button>
-    <button class="btn btn-small" ng-repeat="share in document.shares" ng-click="showShare(share)"><span class="icon-ok"></span> {{ share.name ? share.name : 'shared' }}</button>
-  </p>
-  <ul class="inline">
-    <li ng-repeat="tag in document.tags"><span class="label label-info" ng-style="{ 'background': tag.color }">{{ tag.name }}</span></li>
-  </ul>
-</div>
-
-<p ng-bind-html="document.description | newline"></p>
-
-<ul class="thumbnails thumbnails-file" ui-sortable="fileSortableOptions" ng-model="files" ng-show="files.length > 0">
-  <li class="span2 text-center thumbnail-container" ng-repeat="file in files">
-    <div class="thumbnail">
-      <a ng-click="openFile(file)">
-        <img class="thumbnail-file" ng-src="api/file/{{ file.id }}/data?thumbnail=true" tooltip="{{ file.mimetype }}" tooltip-placement="top" />
-      </a>
-      <div class="caption">
-        <div class="pull-left">
-          <div class="btn handle"><span class="icon-resize-horizontal"></span></div>
-        </div>
-        <p class="pull-right">
-          <button class="btn btn-danger" ng-click="deleteFile(file)"><span class="icon-trash icon-white"></span></button>
-        </p>
-        <div class="clearfix"></div>
-      </div>
-    </div>
-  </li>
-</ul>
-
-<div ui-view="file"></div>
\ No newline at end of file
+<div ng-show="document">
+	<div class="text-right">
+	  <div class="btn-group">
+	    <button class="btn btn-danger" ng-click="deleteDocument(document)"><span class="icon-trash icon-white"></span> Delete</button>
+	    <button class="btn btn-primary" ng-click="editDocument(document.id)"><span class="icon-pencil icon-white"></span> Edit</button>
+	  </div>
+	</div>
+	
+	<div class="page-header">
+	  <h1>{{ document.title }} <small>{{ document.create_date | date: 'yyyy-MM-dd' }}</small></h1>
+	  <p>
+	    <button class="btn btn-small btn-inverse" ng-click="share()"><span class="icon-share icon-white"></span> Share</button>
+	    <button class="btn btn-small" ng-repeat="share in document.shares" ng-click="showShare(share)"><span class="icon-ok"></span> {{ share.name ? share.name : 'shared' }}</button>
+	  </p>
+	  <ul class="inline">
+	    <li ng-repeat="tag in document.tags"><span class="label label-info" ng-style="{ 'background': tag.color }">{{ tag.name }}</span></li>
+	  </ul>
+	</div>
+	
+	<p ng-bind-html="document.description | newline"></p>
+	
+	<ul class="thumbnails thumbnails-file" ui-sortable="fileSortableOptions" ng-model="files" ng-show="files.length > 0">
+	  <li class="span2 text-center thumbnail-container" ng-repeat="file in files">
+	    <div class="thumbnail">
+	      <a ng-click="openFile(file)">
+	        <img class="thumbnail-file" ng-src="api/file/{{ file.id }}/data?thumbnail=true" tooltip="{{ file.mimetype }}" tooltip-placement="top" />
+	      </a>
+	      <div class="caption">
+	        <div class="pull-left">
+	          <div class="btn handle"><span class="icon-resize-horizontal"></span></div>
+	        </div>
+	        <p class="pull-right">
+	          <button class="btn btn-danger" ng-click="deleteFile(file)"><span class="icon-trash icon-white"></span></button>
+	        </p>
+	        <div class="clearfix"></div>
+	      </div>
+	    </div>
+	  </li>
+	</ul>
+	
+	<div ui-view="file"></div>
+</div>
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/partial/docs/tag.html b/docs-web/src/main/webapp/partial/docs/tag.html
index 665ff64c..8082fd39 100644
--- a/docs-web/src/main/webapp/partial/docs/tag.html
+++ b/docs-web/src/main/webapp/partial/docs/tag.html
@@ -27,12 +27,16 @@
       
     </div>
     
-    <div class="span8 well">
+    <div class="span8 well" ng-if="stats.length >= 0">
       <h1>{{ tags.length }} <small>tag{{ tags.length > 1 ? 's' : '' }}</small></h1>
       <dl class="dl-horizontal" ng-repeat="stat in stats | orderBy: '-count'">
         <dt>{{ stat.name }} <span class="badge badge-info" ng-style="{ 'background': stat.color }">{{ stat.count }}</span></dt>
         <dd><progress percent="stat.count / getStatCount() * 100" class="progress-info"></progress></dd>
       </dl>
     </div>
+    
+    <div class="span8 well" ng-if="!stats">
+      <img src="img/loader.gif" />
+    </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/style/main.less b/docs-web/src/main/webapp/style/main.less
index 0aba6508..b7299d7d 100644
--- a/docs-web/src/main/webapp/style/main.less
+++ b/docs-web/src/main/webapp/style/main.less
@@ -43,6 +43,16 @@
 	}
 }
 
+// $http loader
+.loader {
+	position: relative;
+	top: -2px;
+	
+	&.hide {
+	  visibility: hidden;
+	}
+}
+
 // Tags list
 .table-tags {
 	tbody td {