diff --git a/docs/_includes/themes/zeppelin/_navigation.html b/docs/_includes/themes/zeppelin/_navigation.html
index 498a2d36782..b5703afac82 100644
--- a/docs/_includes/themes/zeppelin/_navigation.html
+++ b/docs/_includes/themes/zeppelin/_navigation.html
@@ -43,7 +43,7 @@
Usage
Interpreter Installation
- Dynamic Interpreter Loading
+
Interpreter Dependency Management
Available Interpreters
diff --git a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-agg-multi-bucket-pie.png b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-agg-multi-bucket-pie.png
index 291e6ab951e..0c5512a45d6 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-agg-multi-bucket-pie.png and b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-agg-multi-bucket-pie.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-agg-multi-value-metric.png b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-agg-multi-value-metric.png
index 311c0d20f80..35cf18d544e 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-agg-multi-value-metric.png and b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-agg-multi-value-metric.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-config.png b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-config.png
index ce6883671a8..b5f7ddab3c0 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-config.png and b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-config.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-count-with-query.png b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-count-with-query.png
index ca2f9406e9b..c4fe56503a2 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-count-with-query.png and b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-count-with-query.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-count.png b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-count.png
index 7514e6310dd..5339c0e43b5 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-count.png and b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-count.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-get.png b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-get.png
index a3b4107cce0..752923cfa7b 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-get.png and b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-get.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-query-string.png b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-query-string.png
index c351e8e18c7..02d30dc4634 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-query-string.png and b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-query-string.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-query-with-fields-param.png b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-query-with-fields-param.png
index bf62409cdd9..28a763aef94 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-query-with-fields-param.png and b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-query-with-fields-param.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-search-json-query-table.png b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-search-json-query-table.png
index bcec2e5ec67..963df95a177 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-search-json-query-table.png and b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-search-json-query-table.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-search-pie.png b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-search-pie.png
index 81b711bf741..2283a96316a 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-search-pie.png and b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-search-pie.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-search-table.png b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-search-table.png
index fba99665cf6..3a875788e7c 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-search-table.png and b/docs/assets/themes/zeppelin/img/docs-img/elasticsearch-search-table.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/ignite-interpreter-binding.png b/docs/assets/themes/zeppelin/img/docs-img/ignite-interpreter-binding.png
index d9e10d52b7d..9f6d5ab3fd0 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/ignite-interpreter-binding.png and b/docs/assets/themes/zeppelin/img/docs-img/ignite-interpreter-binding.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/ignite-interpreter-setting.png b/docs/assets/themes/zeppelin/img/docs-img/ignite-interpreter-setting.png
index 06674bff9bd..feec0ccf396 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/ignite-interpreter-setting.png and b/docs/assets/themes/zeppelin/img/docs-img/ignite-interpreter-setting.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/ignite-scala-example.png b/docs/assets/themes/zeppelin/img/docs-img/ignite-scala-example.png
index f2410a45ae1..ffa1c260bf3 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/ignite-scala-example.png and b/docs/assets/themes/zeppelin/img/docs-img/ignite-scala-example.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/ignite-sql-example.png b/docs/assets/themes/zeppelin/img/docs-img/ignite-sql-example.png
index eb050670471..9f43bd29285 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/ignite-sql-example.png and b/docs/assets/themes/zeppelin/img/docs-img/ignite-sql-example.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/insufficient_privileges.png b/docs/assets/themes/zeppelin/img/docs-img/insufficient_privileges.png
index 80d80f5efd8..ddc7fc6d6a4 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/insufficient_privileges.png and b/docs/assets/themes/zeppelin/img/docs-img/insufficient_privileges.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/interpreter-add-repo1.png b/docs/assets/themes/zeppelin/img/docs-img/interpreter-add-repo1.png
index d992e23be44..5c88e352e33 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/interpreter-add-repo1.png and b/docs/assets/themes/zeppelin/img/docs-img/interpreter-add-repo1.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/interpreter-add-repo2.png b/docs/assets/themes/zeppelin/img/docs-img/interpreter-add-repo2.png
index 2f117c10bd2..bc7c2ebc2b6 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/interpreter-add-repo2.png and b/docs/assets/themes/zeppelin/img/docs-img/interpreter-add-repo2.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/interpreter-dependency-loading.png b/docs/assets/themes/zeppelin/img/docs-img/interpreter-dependency-loading.png
index 749d3910193..ab345fb26dc 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/interpreter-dependency-loading.png and b/docs/assets/themes/zeppelin/img/docs-img/interpreter-dependency-loading.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/lens-interpreter-binding.png b/docs/assets/themes/zeppelin/img/docs-img/lens-interpreter-binding.png
index 11b96ed3c8d..b1642b3802b 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/lens-interpreter-binding.png and b/docs/assets/themes/zeppelin/img/docs-img/lens-interpreter-binding.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/lens-interpreter-setting.png b/docs/assets/themes/zeppelin/img/docs-img/lens-interpreter-setting.png
index 867e1d642e8..fc08d12c7bc 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/lens-interpreter-setting.png and b/docs/assets/themes/zeppelin/img/docs-img/lens-interpreter-setting.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/lens-result.png b/docs/assets/themes/zeppelin/img/docs-img/lens-result.png
index e5d48f65f55..adefadab899 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/lens-result.png and b/docs/assets/themes/zeppelin/img/docs-img/lens-result.png differ
diff --git a/docs/assets/themes/zeppelin/img/docs-img/permission_setting.png b/docs/assets/themes/zeppelin/img/docs-img/permission_setting.png
index ed8094183a2..3be73db8bb3 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/permission_setting.png and b/docs/assets/themes/zeppelin/img/docs-img/permission_setting.png differ
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 b379c810baf..90ac28ed8e3 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/assets/themes/zeppelin/img/notebook.png b/docs/assets/themes/zeppelin/img/notebook.png
index de79bf182bd..5995bf22a41 100644
Binary files a/docs/assets/themes/zeppelin/img/notebook.png and b/docs/assets/themes/zeppelin/img/notebook.png differ
diff --git a/docs/assets/themes/zeppelin/img/screenshots/homepage_notebook_id.png b/docs/assets/themes/zeppelin/img/screenshots/homepage_notebook_id.png
index ac6ceef42b1..142047a3d44 100644
Binary files a/docs/assets/themes/zeppelin/img/screenshots/homepage_notebook_id.png and b/docs/assets/themes/zeppelin/img/screenshots/homepage_notebook_id.png differ
diff --git a/docs/assets/themes/zeppelin/img/screenshots/interpreter_binding.png b/docs/assets/themes/zeppelin/img/screenshots/interpreter_binding.png
index 8b7bb05f8fb..536783c31bb 100644
Binary files a/docs/assets/themes/zeppelin/img/screenshots/interpreter_binding.png and b/docs/assets/themes/zeppelin/img/screenshots/interpreter_binding.png differ
diff --git a/docs/assets/themes/zeppelin/img/screenshots/publish.png b/docs/assets/themes/zeppelin/img/screenshots/publish.png
index 089e78dc080..d01f93624ec 100644
Binary files a/docs/assets/themes/zeppelin/img/screenshots/publish.png and b/docs/assets/themes/zeppelin/img/screenshots/publish.png differ
diff --git a/docs/assets/themes/zeppelin/img/ui-img/about_menu.png b/docs/assets/themes/zeppelin/img/ui-img/about_menu.png
new file mode 100644
index 00000000000..18ed125c9b0
Binary files /dev/null and b/docs/assets/themes/zeppelin/img/ui-img/about_menu.png differ
diff --git a/docs/assets/themes/zeppelin/img/ui-img/configuration_menu.png b/docs/assets/themes/zeppelin/img/ui-img/configuration_menu.png
index 935b81a9898..267de0318f9 100644
Binary files a/docs/assets/themes/zeppelin/img/ui-img/configuration_menu.png and b/docs/assets/themes/zeppelin/img/ui-img/configuration_menu.png differ
diff --git a/docs/assets/themes/zeppelin/img/ui-img/credential_menu.png b/docs/assets/themes/zeppelin/img/ui-img/credential_menu.png
new file mode 100644
index 00000000000..5530b892ea9
Binary files /dev/null and b/docs/assets/themes/zeppelin/img/ui-img/credential_menu.png differ
diff --git a/docs/assets/themes/zeppelin/img/ui-img/homepage.png b/docs/assets/themes/zeppelin/img/ui-img/homepage.png
index d7ab88bd358..45617e15815 100644
Binary files a/docs/assets/themes/zeppelin/img/ui-img/homepage.png and b/docs/assets/themes/zeppelin/img/ui-img/homepage.png differ
diff --git a/docs/assets/themes/zeppelin/img/ui-img/interpreter_menu.png b/docs/assets/themes/zeppelin/img/ui-img/interpreter_menu.png
index ea5212ea6ec..31fbcbc81ea 100644
Binary files a/docs/assets/themes/zeppelin/img/ui-img/interpreter_menu.png and b/docs/assets/themes/zeppelin/img/ui-img/interpreter_menu.png differ
diff --git a/docs/assets/themes/zeppelin/img/ui-img/note_commands.png b/docs/assets/themes/zeppelin/img/ui-img/note_commands.png
index 7f1a8693d4b..4689e8c22cd 100644
Binary files a/docs/assets/themes/zeppelin/img/ui-img/note_commands.png and b/docs/assets/themes/zeppelin/img/ui-img/note_commands.png differ
diff --git a/docs/assets/themes/zeppelin/img/ui-img/note_configuration.png b/docs/assets/themes/zeppelin/img/ui-img/note_configuration.png
index 5ce54b075d1..3def4f7b7a7 100644
Binary files a/docs/assets/themes/zeppelin/img/ui-img/note_configuration.png and b/docs/assets/themes/zeppelin/img/ui-img/note_configuration.png differ
diff --git a/docs/assets/themes/zeppelin/img/ui-img/note_paragraph_layout.png b/docs/assets/themes/zeppelin/img/ui-img/note_paragraph_layout.png
index 1d9de9f1944..0833dab5dc5 100644
Binary files a/docs/assets/themes/zeppelin/img/ui-img/note_paragraph_layout.png and b/docs/assets/themes/zeppelin/img/ui-img/note_paragraph_layout.png differ
diff --git a/docs/assets/themes/zeppelin/img/ui-img/note_toolbar.png b/docs/assets/themes/zeppelin/img/ui-img/note_toolbar.png
index b4c587b56b9..fabdcb1ead6 100644
Binary files a/docs/assets/themes/zeppelin/img/ui-img/note_toolbar.png and b/docs/assets/themes/zeppelin/img/ui-img/note_toolbar.png differ
diff --git a/docs/assets/themes/zeppelin/img/ui-img/notebook_menu.png b/docs/assets/themes/zeppelin/img/ui-img/notebook_menu.png
index c959333f15f..b05ac5aaaa7 100644
Binary files a/docs/assets/themes/zeppelin/img/ui-img/notebook_menu.png and b/docs/assets/themes/zeppelin/img/ui-img/notebook_menu.png differ
diff --git a/docs/assets/themes/zeppelin/img/ui-img/settings_menu.png b/docs/assets/themes/zeppelin/img/ui-img/settings_menu.png
new file mode 100644
index 00000000000..f4e81546371
Binary files /dev/null and b/docs/assets/themes/zeppelin/img/ui-img/settings_menu.png differ
diff --git a/docs/index.md b/docs/index.md
index 3053f428443..9847aa497c4 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -139,11 +139,10 @@ Join to our [Mailing list](https://zeppelin.apache.org/community.html) and repor
####Interpreter
* [Interpreters in Apache Zeppelin](./manual/interpreters.html): what is interpreter group? how can you set interpreters in Apache Zeppelin?
-* Available Interpreters: currently, about 20 interpreters are available in Apache Zeppelin.
* Usage
- * [Dynamic Interpreter Loading](./manual/dynamicinterpreterload.html) using REST API
+ * [Interpreter Installation](./manual/interpreterinstallation.html): Install not only community managed interpreters but also 3rd party interpreters
* [Interpreter Dependency Management](./manual/dependencymanagement.html) when you include external libraries to interpreter
-
+* Available Interpreters: currently, about 20 interpreters are available in Apache Zeppelin.
####Display System
diff --git a/docs/manual/notebookashomepage.md b/docs/manual/notebookashomepage.md
index 957e61a4d52..22697c60048 100644
--- a/docs/manual/notebookashomepage.md
+++ b/docs/manual/notebookashomepage.md
@@ -47,7 +47,7 @@ the code sections.
To set the notebook id in the config file, you should copy it from the last word in the notebook url.
For example,
-
+
Set the notebook id to the ```ZEPPELIN_NOTEBOOK_HOMESCREEN``` environment variable
or ```zeppelin.notebook.homescreen``` property.
diff --git a/docs/quickstart/explorezeppelinui.md b/docs/quickstart/explorezeppelinui.md
index 9e1890724bf..3340bb9d77f 100644
--- a/docs/quickstart/explorezeppelinui.md
+++ b/docs/quickstart/explorezeppelinui.md
@@ -29,7 +29,7 @@ The first time you connect to Zeppelin, you'll land at the main page similar to
On the left of the page are listed all existing notes. Those notes are stored by default in the `$ZEPPELIN_HOME/notebook` folder.
-You can filter them by name using the input text form. You can also create an new note, refresh the list of existing notes
+You can filter them by name using the input text form. You can also create a new note, refresh the list of existing notes
(in case you manually copy them into the `$ZEPPELIN_HOME/notebook` folder) and import a note.
@@ -54,7 +54,19 @@ The `Notebook` menu proposes almost the same features as the note management sec
-### Interpreter
+### Settings
+This menu gives you access to settings and displays information about Zeppelin. User name is set to `anonymous` if you use default shiro configuration. If you want to set up authentification, see [Shiro authentication](../security/shiroauthentication.html).
+
+
+
+
+#### About Zeppelin
+
+You can check Zeppelin version in this menu.
+
+
+
+#### Interpreter
In this menu you can:
@@ -63,7 +75,13 @@ In this menu you can:
-### Configuration
+#### Credential
+
+This menu allows you to save credentials for data sources which are passed to interpreters.
+
+
+
+#### Configuration
This menu displays all the Zeppelin configuration that are set in the config file `$ZEPPELIN_HOME/conf/zeppelin-site.xml`
@@ -137,4 +155,4 @@ On the right of the note tool bar you can find configuration icons:
* configure the note permissions
* switch the node display mode between `default`, `simple` and `report`
-
\ No newline at end of file
+