diff --git a/_articles/features/custom-fields.md b/_articles/features/custom-fields.md
index dfe87f23..dda20560 100644
--- a/_articles/features/custom-fields.md
+++ b/_articles/features/custom-fields.md
@@ -63,7 +63,9 @@ Follow this procedure to correctly configure a custom field for auto-fill. This
 2. Find and copy the element `id` (find `id="xxx"`, where `xxx` is the element's `id` value).
 3. In the relevant Vault item's **Custom Fields** section, choose the appropriate field type and select the {% icon fa-plus %} **New Custom Field** button:
 
-   {% image /features/custom-fields/types.png %}
+   {% image /features/custom-fields/types.png Select custom field type%}
 4. Paste the copied element `id` in the **Name** field.
 5. Specify the desired information to be auto-filled (in the above example, a PIN) in the **Value** field.
+
+   {% image /features/custom-fields/custom-field-eg.png Custom field example %}
 6. Save the Vault item.
diff --git a/_articles/features/folders.md b/_articles/features/folders.md
index 5e44211e..0850f45b 100644
--- a/_articles/features/folders.md
+++ b/_articles/features/folders.md
@@ -46,3 +46,14 @@ Searching inside a "parent" Folder will not include items in Folders nested insi
 To create a nested Folder, give a new Folder a **Name** that includes the "parent" Folder following by a forward slash (`/`) delimiter, for example `Personal/Email`.
 
 If there is no Folder with the corresponding "parent" name, the Folder won't nest and its title will be displayed in-full.
+
+## Add Items to a Folder
+
+Once you've created a Folder in your Vault, there are a few ways to add items to it:
+
+- From the **Add Item** or **Edit Item** screen on any Bitwarden application, select your new folder from the **Folder** dropdown and **Save** your item:
+
+   {% image manage-items/add-to-folder.png Add item to a Folder%}
+- From the **My Vault** view, select the Vault items you want to move and use the top-level {% icon fa-cog %} gear dropdown to select the {% icon fa-share %} **Move Selected** button. On the Move Selected dialog box, choose the Folder you want to move the item(s) to:
+
+   {% image manage-items/add-to-folder-move.png Move item to a Folder %}
diff --git a/_articles/features/uri-match-detection.md b/_articles/features/uri-match-detection.md
index b1ed5fc4..99dd00eb 100644
--- a/_articles/features/uri-match-detection.md
+++ b/_articles/features/uri-match-detection.md
@@ -40,7 +40,7 @@ Bitwarden Browser Extensions and Mobile Apps can select a **Default match detect
 By default, Bitwarden will use **Base domain** matching as the default option.
 
 
-#### Base domain
+### Base domain
 
 Selecting **Base domain** will prompt Bitwarden to offer auto-fill when the top-level domain and second-level domain of a Login's URI value match the detected resource.
 
@@ -49,7 +49,7 @@ For example, if the URI value `https://google.com` uses base domain match detect
 - **Auto-fill offered** for `http://google.com` & `https://accounts.google.com`
 - **Auto-fill not offered** for `https://google.net` & `http://yahoo.com`
 
-#### Host
+### Host
 
 Selecting **Host** will prompt Bitwarden to offer auto-fill when the hostname and (*if specified*) port of the Login's URI value matches the detected resource.
 
@@ -58,7 +58,7 @@ For example, if the URI value `https://sub.domain.com:4000` uses host match dete
 - **Auto-fill offered** for `http://sub.domain.com:4000` & `https://sub.domain.com:4000/page.html`
 - **Auto-fill not offered** for `https://domain.com`, `https://sub.domain.com`,  `https://sub2.sub.domain.com:4000`, or `https://sub.domain.com:5000`
 
-#### Starts with
+### Starts with
 
 Selecting **Starts with** will prompt Bitwarden to offer auto-fill when the detected resource starts with the Login URI value, regardless of what follows it.
 
@@ -67,7 +67,7 @@ For example, if the URI value `https://sub.domain.com/path/` uses starts with ma
 - **Auto-fill offered** for `https://sub.domain.com/path/` & `https://sub.domain.com/path/page.html`
 - **Auto-fill not offered** for `https://sub.domain.com`, `https://sub.domain.com:4000/path/page.html` (interrupted with a port), or `https://sub.domain.com/path` (absent trailing slash)
 
-#### Regular expression
+### Regular expression
 
 {% callout note %}
 Regular expressions are an advanced option and can be quite dangerous if used incorrectly. You should not use this option if you do not know exactly what you're doing.
@@ -80,7 +80,7 @@ For example, if the URI vault `^https://.*google\.com$` uses regular expression
 - **Auto-fill offered** for `https://google.com`, `https://sub.google.com`, `https://malicious-site.com?q=google.com`
 - **Auto-fill not offered** for `http://google.com` or `https://yahoo.com`
 
-#### Exact
+### Exact
 
 Selecting **Exact** will prompt Bitwarden to offer auto-fill when the Login URI value matches the detected resource exactly.
 
@@ -89,6 +89,6 @@ For example, if the URI value `https://www.google.com/page.html` uses exact matc
 - **Auto-fill offered** for `https://www.google.com/page.html`
 - **Auto-fill not offered** for `http://www.google.com/page.html`, `https://www.google.com/page.html?query=123`, or `https://www.google.com`
 
-#### Never
+### Never
 
 Selecting **Never** will prompt Bitwarden to never offer auto-fill for the Login item.
diff --git a/_articles/hosting/environment-variables.md b/_articles/hosting/environment-variables.md
index 33b29cd4..1d6feeb8 100644
--- a/_articles/hosting/environment-variables.md
+++ b/_articles/hosting/environment-variables.md
@@ -46,4 +46,4 @@ The following variables do not already exist in `global.override.env`, and can b
 |globalSettings__mail__smtp__sslOverride=|Specify `true` to use SSL (not TLS) on port 25.|
 |globalSettings__mail__smtp__startTls=|Specify `true` to force STARTTLS (Opportunistic TLS).|
 |globalSettings__organizationInviteExpirationHours=|Specify the number of hours after which an Organization Invite will expire (`120` by default).|
-|globalSettings__yubico__validationUrls__0=|Primary URL for self-hosted Yubico Validation Server. For example, `globalSettings__yubico__validationUrls__0=https://your.url.com/wsapi/2.0/verify`.<br><br>Add additional Validation Server URLs by creating incremented environment variables, for example `globalSettings__yubico__validationUrls__1=`, `globalSettings__yubico__validationUrls__2=`.|
+|globalSettings__yubico__validationUrls__0=|Primary URL for self-hosted Yubico Validation Server. For example: `=https://your.url.com/wsapi/2.0/verify`.<br><br>Add additional Validation Server URLs by creating incremented environment variables, for example `globalSettings__yubico__validationUrls__1=`, `globalSettings__yubico__validationUrls__2=`.|
diff --git a/images/features/custom-fields/custom-field-eg.png b/images/features/custom-fields/custom-field-eg.png
new file mode 100644
index 00000000..b5db6727
Binary files /dev/null and b/images/features/custom-fields/custom-field-eg.png differ
diff --git a/images/manage-items/add-to-folder-move.png b/images/manage-items/add-to-folder-move.png
new file mode 100644
index 00000000..bab56a9a
Binary files /dev/null and b/images/manage-items/add-to-folder-move.png differ
diff --git a/images/manage-items/add-to-folder.png b/images/manage-items/add-to-folder.png
new file mode 100644
index 00000000..4b762911
Binary files /dev/null and b/images/manage-items/add-to-folder.png differ