diff --git a/source/_includes/asides/developers_navigation.html b/source/_includes/asides/developers_navigation.html
index 613ff5834b41..34f1de46476d 100644
--- a/source/_includes/asides/developers_navigation.html
+++ b/source/_includes/asides/developers_navigation.html
@@ -78,6 +78,7 @@
Development Guide
{% active_link /developers/frontend_add_more_info/ Add More Info Dialog %}
{% active_link /developers/frontend_creating_custom_panels/ Add Custom Panels %}
{% active_link /developers/frontend_creating_custom_ui/ Add Custom UI %}
+ {% active_link /developers/frontend_translation/ Translation %}
diff --git a/source/developers/frontend_translation.markdown b/source/developers/frontend_translation.markdown
index 3d6e452da5a9..feb07d5a2085 100644
--- a/source/developers/frontend_translation.markdown
+++ b/source/developers/frontend_translation.markdown
@@ -1,6 +1,6 @@
---
layout: page
-title: "Translate Home Assistant frontend"
+title: "Frontend Translation"
description: "How to translate the frontend for Home Assistant."
date: 2017-10-27 13:00
sidebar: true
@@ -10,25 +10,32 @@ footer: true
ha_release: 0.57
---
-The translation of the Home Assistant frontend is still a work in progress. More phrases will be available soon.
+## {% linkable_title How to start %}
+[Join the translation team](https://lokalise.co/signup/3420425759f6d6d241f598.13594006/all/) and choose your language. Even if your language is completely translated, extra proofreading is a big help! Please feel free to review the existing translations, and vote for alternatives that might be more appropriate.
-#### {% linkable_title How to start %}
-[Join the translation team](https://lokalise.co/signup/3420425759f6d6d241f598.13594006/all/) and choose your language. If your language is not listed you can request it at [GitHub](https://github.com/home-assistant/home-assistant-polymer/issues/new). Please provide both the English name and the native name for your language. Example: German / Deutsch.
-Note: Languages that differ from the language of the country of origin need a translation for the latter first. Example: `French as used in Canada` requires a generic `French` translation.
-
-Even if your language is completely translated, extra proofreading is a big help! Please feel free to review the existing translations, and vote for alternatives that might be more appropriate.
+First time users may find it helpful to switch between multilanguage and single language view using the
button. For more information about the translation workflow, please see the [Lokalise translation workflow documents](https://docs.lokalise.co/category/iOzEuQPS53-for-team-leads-and-translators).
-For more information about the translation workflow, please see the [Lokalise translation workflow documents](https://docs.lokalise.co/category/iOzEuQPS53-for-team-leads-and-translators).
+
+The translation of the Home Assistant frontend is still a work in progress. More phrases will be available for translation soon.
+
-#### {% linkable_title Rules %}
+## {% linkable_title Rules %}
1. Only native speakers should submit translations.
-2. English is reference language.
-3. Stick to [Material Desing guidelines](https://material.io/guidelines/style/writing.html).
-4. Don't translate or change proper nouns like `Home Assistant`, `Hass.io` or `Hue`.
+2. Stick to [Material Desing guidelines](https://material.io/guidelines/style/writing.html).
+3. Don't translate or change proper nouns like `Home Assistant`, `Hass.io` or `Hue`.
-Tip: Use `Multilanguage view` (eye-symbol) and hide those languages you don't need.
+## {% linkable_title Adding a new language %}
+If your language is not listed you can request it at [GitHub](https://github.com/home-assistant/home-assistant-polymer/issues/new). Please provide both the English name and the native name for your language. For example:
+```
+English Name: German
+Native Name: Deutsch
+```
+
+
+Note: Languages that differ from the language of the country of origin need a translation for the latter first. Example: `French as used in Canada` requires a generic `French` translation.
+
-#### {% linkable_title For maintainers %}
+### {% linkable_title Maintainer steps to add a new language %}
1. Language tags have to follow [BCP 47](https://tools.ietf.org/html/bcp47). A list of most language tags can be found here: [IANA sutbtag registry](http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry). Examples: `fr`, `fr-CA`, `zh-Hans`. Only include the country code if country specific overrides are being included, and the base language is already translated.
2. Add the language tag and native name in `src/translations/translationMetadata.json`. Examples: "Français", "Français (CA)"
3. Add the new language in Lokalize.
diff --git a/source/images/frontend/lokalise-multilanguage-view-button.png b/source/images/frontend/lokalise-multilanguage-view-button.png
new file mode 100644
index 000000000000..12370813300e
Binary files /dev/null and b/source/images/frontend/lokalise-multilanguage-view-button.png differ