diff --git a/.gitignore b/.gitignore
index eeb4d3b740d..532891481d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ conf/keystore
 conf/truststore
 conf/interpreter.json
 conf/notebook-authorization.json
+conf/shiro.ini
 
 # other generated files
 spark/dependency-reduced-pom.xml
diff --git a/docs/_includes/themes/zeppelin/_navigation.html b/docs/_includes/themes/zeppelin/_navigation.html
index 1884a238870..9969cda706d 100644
--- a/docs/_includes/themes/zeppelin/_navigation.html
+++ b/docs/_includes/themes/zeppelin/_navigation.html
@@ -94,7 +94,8 @@
                 <li role="separator" class="divider"></li>
                 <!-- li><span><b>Security</b><span></li -->
                 <li><a href="{{BASE_PATH}}/security/overview.html">Security Overview</a></li>
-                <li><a href="{{BASE_PATH}}/security/authentication.html">Authentication</a></li>
+                <li><a href="{{BASE_PATH}}/security/authentication.html">Authentication for NGINX</a></li>
+                <li><a href="{{BASE_PATH}}/security/shiroauthentication.html">Shiro Authentication</a></li>
                 <li><a href="{{BASE_PATH}}/security/notebook_authorization.html">Notebook Authorization</a></li>
                 <li><a href="{{BASE_PATH}}/security/interpreter_authorization.html">Interpreter Authorization</a></li>
                 <li role="separator" class="divider"></li>
@@ -102,9 +103,6 @@
                 <li><a href="{{BASE_PATH}}/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
                 <li><a href="{{BASE_PATH}}/development/howtocontribute.html">How to contribute (code)</a></li>
                 <li><a href="{{BASE_PATH}}/development/howtocontributewebsite.html">How to contribute (website)</a></li>
-                <li role="separator" class="divider"></li>
-                <!-- li><span><b>Shiro Security</b><span></li -->
-                <li><a href="{{BASE_PATH}}/manual/shiroauthentication.html">Shiro Authentication</a></li>
               </ul>
             </li>
           </ul>
diff --git a/docs/assets/themes/zeppelin/img/docs-img/zeppelin-login.png b/docs/assets/themes/zeppelin/img/docs-img/zeppelin-login.png
index 522630f0821..b379c810baf 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/zeppelin-login.png and b/docs/assets/themes/zeppelin/img/docs-img/zeppelin-login.png differ
diff --git a/docs/security/authentication.md b/docs/security/authentication.md
index 9d48c58b983..f73ccf7abb5 100644
--- a/docs/security/authentication.md
+++ b/docs/security/authentication.md
@@ -1,7 +1,7 @@
 ---
 layout: page
-title: "Authentication"
-description: "Authentication"
+title: "Authentication for NGINX"
+description: "Authentication for NGINX"
 group: security
 ---
 <!--
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-# Authentication
+# Authentication for NGINX
 
 Authentication is company-specific.
 
diff --git a/docs/manual/shiroauthentication.md b/docs/security/shiroauthentication.md
similarity index 97%
rename from docs/manual/shiroauthentication.md
rename to docs/security/shiroauthentication.md
index 2699130495f..05918e3a493 100644
--- a/docs/manual/shiroauthentication.md
+++ b/docs/security/shiroauthentication.md
@@ -2,7 +2,7 @@
 layout: page
 title: "Shiro Security for Apache Zeppelin"
 description: ""
-group: manual
+group: security
 ---
 <!--
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -59,7 +59,7 @@ Then you can browse Zeppelin at [http://localhost:8080](http://localhost:8080).
 ####4. Login
 Finally, you can login using one of the below **username/password** combinations.
 
-<center><img src="../assets/themes/zeppelin/img/docs-img/zeppelin-login.png" width="40%" height="40%"></center>
+<center><img src="../assets/themes/zeppelin/img/docs-img/zeppelin-login.png"></center>
 
 ```
 admin = password1