diff --git a/docs-web/src/main/webapp/src/app/docs/controller/Document.js b/docs-web/src/main/webapp/src/app/docs/controller/Document.js
index 4c15e862..6af0d944 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/Document.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/Document.js
@@ -95,20 +95,6 @@ angular.module('docs').controller('Document', function($scope, $timeout, $state,
     $scope.loadDocuments();
   });
   
-  /**
-   * Go to add document form.
-   */
-  $scope.addDocument = function() {
-    $state.transitionTo('document.add');
-  };
-  
-  /**
-   * Go to edit document form.
-   */
-  $scope.editDocument = function(id) {
-    $state.transitionTo('document.edit', { id: id });
-  };
-  
   /**
    * Display a document.
    */
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 762b2ad3..1d773b59 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.html
@@ -2,7 +2,7 @@
   <div class="col-md-4">
     <div class="well">
       <p class="text-center">
-        <button class="btn btn-primary" type="button" ng-click="addDocument()"><span class="glyphicon glyphicon-plus"></span> Add a document</button>
+        <a href="#/document/add" class="btn btn-primary"><span class="glyphicon glyphicon-plus"></span> Add a document</a>
       </p>
 
       <div class="input-group">
@@ -34,7 +34,11 @@
         </thead>
         <tbody>
           <tr ng-click="viewDocument(document.id)" ng-repeat="document in documents">
-            <td>{{ document.title }} ({{ document.file_count }}) <span class="glyphicon glyphicon-share" ng-if="document.shared" tooltip="Shared"></span></td>
+            <td>
+              {{ document.title }} ({{ document.file_count }})
+              <span class="glyphicon glyphicon-share" ng-if="document.shared" tooltip="Shared"></span>
+              <a href="#/document/view/{{ document.id }}" ng-click="$event.stopPropagation()"><span class="glyphicon glyphicon-link"></span></a>
+            </td>
             <td>{{ document.create_date | date: 'yyyy-MM-dd' }}</td>
             <td class="hidden-xs cell-tags">
               <div class="tags">
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.html b/docs-web/src/main/webapp/src/partial/docs/document.view.html
index 4550469c..7eb39f0c 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.view.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.view.html
@@ -4,7 +4,7 @@
 	<div class="text-right">
 	  <div class="btn-group">
 	    <button class="btn btn-danger" ng-click="deleteDocument(document)"><span class="glyphicon glyphicon-trash"></span> Delete</button>
-	    <button class="btn btn-primary" ng-click="editDocument(document.id)"><span class="glyphicon glyphicon-pencil"></span> Edit</button>
+	    <a href="#/document/edit/{{ document.id }}" class="btn btn-primary"><span class="glyphicon glyphicon-pencil"></span> Edit</a>
 	  </div>
 	</div>