diff --git a/docs/_includes/themes/zeppelin/_navigation.html b/docs/_includes/themes/zeppelin/_navigation.html
index 72b5e48a037..28700c820f4 100644
--- a/docs/_includes/themes/zeppelin/_navigation.html
+++ b/docs/_includes/themes/zeppelin/_navigation.html
@@ -81,10 +81,10 @@
                 <li><a href="{{BASE_PATH}}/manual/notebookashomepage.html">Notebook as Homepage</a></li>
                 <li role="separator" class="divider"></li>
                 <!-- li><span><b>Notebook Storage</b><span></li -->
-                <li><a href="{{BASE_PATH}}/storage/storage.html#Git">Git Storage</a></li>
-                <li><a href="{{BASE_PATH}}/storage/storage.html#S3">S3 Storage</a></li>
-                <li><a href="{{BASE_PATH}}/storage/storage.html#Azure">Azure Storage</a></li>
-                <li><a href="{{BASE_PATH}}/storage/storage.html#ZeppelinHub">ZeppelinHub Storage</a></li>
+                <li><a href="{{BASE_PATH}}/storage/storage.html#toc_1">Git Storage</a></li>
+                <li><a href="{{BASE_PATH}}/storage/storage.html#toc_2">S3 Storage</a></li>
+                <li><a href="{{BASE_PATH}}/storage/storage.html#toc_6">Azure Storage</a></li>
+                <li><a href="{{BASE_PATH}}/storage/storage.html#toc_7">ZeppelinHub Storage</a></li>
                 <li role="separator" class="divider"></li>
                 <!-- li><span><b>REST API</b><span></li -->
                 <li><a href="{{BASE_PATH}}/rest-api/rest-interpreter.html">Interpreter API</a></li>
diff --git a/docs/storage/storage.md b/docs/storage/storage.md
index 36aae501c20..a2a05870831 100644
--- a/docs/storage/storage.md
+++ b/docs/storage/storage.md
@@ -31,7 +31,7 @@ By default, only first two of them will be automatically kept in sync by Zeppeli
 
 </br>
 
-## Notebook Storage in local Git repository <a name="Git"></a>
+## Notebook Storage in local Git repository
 
 To enable versioning for all your local notebooks though a standard Git repository - uncomment the next property in `zeppelin-site.xml` in order to use GitNotebookRepo class:
 
@@ -45,7 +45,7 @@ To enable versioning for all your local notebooks though a standard Git reposito
 
 </br>
 
-## Notebook Storage in S3 <a name="S3"></a>
+## Notebook Storage in S3
 
 Notebooks may be stored in S3, and optionally encrypted.  The [``DefaultAWSCredentialsProviderChain``](https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html) credentials provider is used for credentials and checks the following:
 
@@ -142,7 +142,7 @@ Or using the following setting in **zeppelin-site.xml**:
 ```   
 
 </br>
-## Notebook Storage  in Azure <a name="Azure"></a>
+## Notebook Storage  in Azure
 
 Using `AzureNotebookRepo` you can connect your Zeppelin with your Azure account for notebook storage.
 
@@ -205,7 +205,7 @@ Optionally, you can specify Azure folder structure name in the file **zeppelin-s
 ```
 
 </br>
-## Storage in ZeppelinHub  <a name="ZeppelinHub"></a>
+## Storage in ZeppelinHub
 
 ZeppelinHub storage layer allows out of the box connection of Zeppelin instance with your ZeppelinHub account. First of all, you need to either comment out the following  property in **zeppelin-site.xml**:
 
diff --git a/zeppelin-web/src/app/home/home.controller.js b/zeppelin-web/src/app/home/home.controller.js
index ddd0f805b45..57d5baf1d6b 100644
--- a/zeppelin-web/src/app/home/home.controller.js
+++ b/zeppelin-web/src/app/home/home.controller.js
@@ -65,4 +65,8 @@ angular.module('zeppelinWebApp').controller('HomeCtrl', function($scope, noteboo
     node.hidden = !node.hidden;
   };
 
+  $rootScope.noteName = function(note) {
+    return arrayOrderingSrv.getNoteName(note);
+  };
+
 });