article updates for v2.0 web vault navigation

_articles/account/change-your-email.md

@@ -14,11 +14,11 @@ Changing your email address will log you out of all Bitwarden applications.
 {% endwarning %}
 
 1. Log in to the web vault at <https://vault.bitwarden.com>
-2. Click **Settings** on the sidebar 
-3. Click **Change Email** under the **General** panel
+2. Click **Settings** in the top navigation bar
+3. Locate the **Change Email** section under **My Account**
 4. Type in your master password and the email you want to use
-5. Click **Submit**
+5. Click the **Continue** button
 6. Check your email inbox for the verification code from Bitwarden and enter it into the textbox
-7. Click **Change Email**
+7. Click the **Change Email** button
 8. Log back in to confirm that you can log in using the new email
 9. Log out and back in to any other Bitwarden applications that you are using. You will eventually be logged out automatically.

_articles/account/change-your-master-password.md

@@ -14,9 +14,9 @@ Changing your master password will log you out of all Bitwarden applications.
 {% endwarning %}
 
 1. Log in to the web vault at <https://vault.bitwarden.com>
-2. Click **Settings** on the sidebar 
-3. Click **Change Master Password** under the **Master Password** panel
+2. Click **Settings** in the top navigation bar
+3. Locate the **Change Master Password** section under **My Account**
 4. Type in your current password, the new password you want, and then re-type to confirm
-5. Click **Change Password**
+5. Click the **Change Master Password** button
 6. Log back in to confirm that your new password is working
 7. Log out and back in any other Bitwarden applications that you are using. You will eventually be logged out automatically.

_articles/account/delete-your-account.md

@@ -14,9 +14,9 @@ This action is permanent and cannot be undone.
 {% endwarning %}
 
 1. Log in to the web vault at <https://vault.bitwarden.com>
-2. Click **Settings** on the sidebar 
-3. Click **Delete Account** under the **Danger Zone** panel
-4. Type in your master password and click **Delete**. You will be logged out when the delete completes.
+2. Click **Settings** in the top navigation bar
+3. Click the **Delete Account** button under the **Danger Zone** section of **My Account**
+4. Type in your master password and click the **Delete Account**. You will be logged out when the delete completes.
 
 ## Delete without logging in
 

_articles/account/export-your-data.md

@@ -7,7 +7,7 @@ popular: false
 tags: [export, accounts, csv]
 ---
 
-Bitwarden allows you to export all of your vault data at any time.
+Bitwarden allows you to export your vault data at any time.
 
 {% warning %}
 Data exports contain your unencrypted data in `.csv` format. You should not store or send the file over unsecure channels (such as email). Delete it immediately after you are done using it.
@@ -16,9 +16,9 @@ Data exports contain your unencrypted data in `.csv` format. You should not stor
 ## From the web vault
 
 1. Log in to the web vault at <https://vault.bitwarden.com>
-2. Click **Tools** on the sidebar 
-3. Click **Export Data** under the **Import/Export** panel
-4. Type in your master password and click **Export**. Your browser will either automatically download the `.csv` file or prompt you to save it
+2. Click **Tools** in the top navigation bar 
+3. Click **Export Vault** under the **Tools** side navigation
+4. Type in your master password and click **Export Vault**. Your browser will either automatically download the `.csv` file or prompt you to save it
 
 ## From the browser extension
 

_articles/account/lost-two-step-device.md

@@ -12,12 +12,12 @@ If you have lost access to the device or method that you use for two-step login
 The recovery code is a 32 character alpha-numeric code. You can get your two-step login recovery code in the [web vault](https://vault.bitwarden.com) under **Settings** → **Two-step Login**, then click the **View Recovery Code** button. We recommend that your print your recovery code and keep it in a safe place.
 
 {% warning %}
-Without your recovery code, two-step login can permanently lock you out of your Bitwarden account. It is very important to have your recovery code if you plan to use two-step login.
+Without your recovery code, two-step login can permanently lock you out of your Bitwarden account. It is very important to have your recovery code if you plan to use two-step login. Bitwarden support will not be able to assist you if you lose access to your account.
 {% endwarning %}
 
 ## Recovering Your Account
 
-Visit <https://vault.bitwarden.com/#/recover> to complete the recovery process.
+Visit <https://vault.bitwarden.com/#/recover-2fa> to complete the recovery process.
 
 The recovery process will deactivate two-step login on the account so that you can log in without requiring the normal two-step login verification code. You will need to re-enable two-step login in the web vault if you wish to continue using it after recovering the account.
 

_articles/account/setup-two-step-login-duo.md

@@ -41,9 +41,9 @@ Two-step login can permanently lock you out of your account. It is very importan
 
 1. Log in to the web vault at <https://vault.bitwarden.com>.
 2. Depending on your account type:
-  - Premium Users: Click **Settings** on the sidebar. Click **Two-step Login** in the sub-menu that opens under **Settings**.
-  - Enterprise Organizations: Visit the admin area for your organization. Select **Settings** in the sidebar and locate the **Two-step Login Providers** section.
-3. Select the **Duo** option and then type in your master password to continue.
+  - Premium Users: Click **Settings** in the top navigation bar, then click **Two-step Login** from the side menu.
+  - Enterprise Organizations: Visit the admin area for your organization. Select **Settings** in the sub-menu and then click **Two-step Login** from the side menu.
+3. Select the **Manage** button for the **Duo** option and then type in your master password to continue.
    {% image two-step/duo/select.png %}
 4. Enter the configuration information provided from the Duo Admin **Bitwarden** application that was set up earlier: **Integration Key**, **Secret Key**, and **API Hostname**.
    {% image two-step/duo/config.png %}

_articles/account/setup-two-step-login-email.md

@@ -16,8 +16,8 @@ Two-step login can permanently lock you out of your account. It is very importan
 {% endwarning %}
 
 1. Log in to the web vault at <https://vault.bitwarden.com>
-2. Click **Settings** on the sidebar. Click **Two-step Login** in the sub-menu that opens under **Settings**.  
-3. Select the **Email** option and then type in your master password to continue.
+2. Click **Settings** in the top navigation bar, then click **Two-step Login** from the side menu.
+3. Select the **Manage** button for the **Email** option and then type in your master password to continue.
 4. Enter an email address that you would like to use that will receive verification codes during login. You can use the same email address that you use for your Bitwarden account or any other email address. Click the **Send Email** button to send a test verification code to that email address.
 5. Check your email inbox for the verification code and then enter it into Bitwarden for confirmation.
 6. Click the **Enable** button. A green alert will appear at the top stating that two-step login has been enabled.

_articles/account/setup-two-step-login-u2f.md

@@ -25,8 +25,8 @@ Two-step login can permanently lock you out of your account. It is very importan
 {% endwarning %}
 
 1. Log in to the web vault at <https://vault.bitwarden.com>
-2. Click **Settings** on the sidebar. Click **Two-step Login** in the sub-menu that opens under **Settings**.  
-3. Select the **FIDO U2F Security Key** option and then type in your master password to continue.
+2. Click **Settings** in the top navigation bar, then click **Two-step Login** from the side menu.
+3. Select the **Manage** button for the **FIDO U2F Security Key** option and then type in your master password to continue.
    {% image two-step/u2f/select.png %}
 4. Follow the instructions shown:
    - Plug the security key into your computer's USB port.

_articles/account/setup-two-step-login-yubikey.md

@@ -29,17 +29,17 @@ Two-step login can permanently lock you out of your account. It is very importan
 {% endwarning %}
 
 1. Log in to the web vault at <https://vault.bitwarden.com>
-2. Click **Settings** on the sidebar. Click **Two-step Login** in the sub-menu that opens under **Settings**.  
-3. Select the **YubiKey OTP Security Key** option and then type in your master password to continue.
+2. Click **Settings** in the top navigation bar, then click **Two-step Login** from the side menu.
+3. Select the **Manage** button for the **YubiKey OTP Security Key** option and then type in your master password to continue.
    {% image two-step/yubikey/select.png %}
 4. Follow the instructions shown:
    - Plug the YubiKey (NEO or 4 series) into your computer's USB port.
    - Select in the first empty Key input field.
    - Touch the YubiKey's button.
    
-   Repeat this process for each YubiKey you wish to add to your account. You can add up to three YubiKeys to your account.
+   Repeat this process for each YubiKey you wish to add to your account. You can add up to five YubiKeys to your account.
    {% image two-step/yubikey/config.png %}
-5. If you are using a YubiKey that has NFC capabilities (YubiKey NEO), check the **One of my keys supports NFC** checkbox. This option enables the use of your YubiKey on Android devices that support NFC.
+5. If you are using a YubiKey that has NFC capabilities (YubiKey NEO), check the **One of my keys supports NFC** checkbox. This option enables the use of your YubiKey on Android and iOS devices that support NFC.
 6. Click the **Enable** button. A green alert will appear at the top stating that two-step login has been enabled.
 7. Click the **Close** button and confirm that the **YubiKey OTP Security Key** option now shows as **Enabled**.
    {% image two-step/yubikey/enabled.png %}