diff --git a/assets/styles/layouts/_article.scss b/assets/styles/layouts/_article.scss
index d6c630dfb..013185878 100644
--- a/assets/styles/layouts/_article.scss
+++ b/assets/styles/layouts/_article.scss
@@ -117,6 +117,7 @@
           "article/tags",
           "article/telegraf-plugins",
           "article/truncate",
+          "article/video",
           "article/warn";
 
 
diff --git a/assets/styles/layouts/article/_video.scss b/assets/styles/layouts/article/_video.scss
new file mode 100644
index 000000000..a5e9d3bb6
--- /dev/null
+++ b/assets/styles/layouts/article/_video.scss
@@ -0,0 +1,5 @@
+.video {
+  width: 100%;
+  max-width: 620px;
+  margin: 2rem 0;
+}
diff --git a/content/v2.0/get-started.md b/content/v2.0/get-started.md
index 4caa652de..abe182d25 100644
--- a/content/v2.0/get-started.md
+++ b/content/v2.0/get-started.md
@@ -463,7 +463,7 @@ For information about using the InfluxDB v2 API, `influx` CLI, and client librar
 see [Write data to InfluxDB](/v2.0/write-data/).
 
 #### Demo data
-If using **{{< cloud-name "short" >}}**, [add a demo data bucket](/v2.0/write-data/sample-data/demo-data/)
+If using **{{< cloud-name "short" >}}**, [add a demo data bucket](/v2.0/reference/sample-data/#influxdb-cloud-demo-data)
 for quick, **free** access to time series data.
 
 ### Query data
diff --git a/content/v2.0/reference/glossary.md b/content/v2.0/reference/glossary.md
index 0c9a97443..0536c07af 100644
--- a/content/v2.0/reference/glossary.md
+++ b/content/v2.0/reference/glossary.md
@@ -2,7 +2,7 @@
 title: Glossary
 description: >
   Terms related to InfluxData products and platforms.
-weight: 7
+weight: 8
 menu:
   v2_0_ref:
     name: Glossary
diff --git a/content/v2.0/reference/sample-data.md b/content/v2.0/reference/sample-data.md
index ee10e2e61..88b47a752 100644
--- a/content/v2.0/reference/sample-data.md
+++ b/content/v2.0/reference/sample-data.md
@@ -6,17 +6,18 @@ description: >
   and InfluxDB Cloud.
 aliases:
   - /v2.0/write-data/sample-data/
-menu:
-  v2_0:
-    parent: Reference
-weight: 105
+menu: v2_0_ref
+weight: 7
 ---
 
 Use sample data to familiarize yourself with time series data and InfluxDB.
 InfluxData provides many sample time series datasets to use with **InfluxDB Cloud** and **InfluxDB**.
 
 ## InfluxDB Cloud demo data
-Use [InfluxDB Cloud demo data buckets](/v2.0/write-data/quick-start) for quick, free access to different types of sample data.
+Use [InfluxDB Cloud demo data buckets](/v2.0/write-data/quick-start) for quick,
+free access to different types of sample data.
+
+{{< youtube GSaByPC1Bdc >}}
 
 ## Sample data sets
 The following sample data sets are used as examples in [InfluxDB query guides](/v2.0/query-data/flux)
diff --git a/content/v2.0/write-data/_index.md b/content/v2.0/write-data/_index.md
index dcd4c3c03..f97ef2860 100644
--- a/content/v2.0/write-data/_index.md
+++ b/content/v2.0/write-data/_index.md
@@ -132,7 +132,7 @@ After adding a demo data bucket, view the pre-built dashboard specific to the de
 
 {{% note %}}
 #### Other sample data sets
-See [Sample data](/v2.0/write-data/sample-data) for more sample InfluxDB data sets.
+See [Sample data](/v2.0/reference/sample-data) for more sample InfluxDB data sets.
 {{% /note %}}
 
 ## Quick Start for InfluxDB OSS
diff --git a/content/v2.0/write-data/development-tools/_index.md b/content/v2.0/write-data/development-tools/_index.md
index e41e9b949..e831571a6 100644
--- a/content/v2.0/write-data/development-tools/_index.md
+++ b/content/v2.0/write-data/development-tools/_index.md
@@ -1,17 +1,16 @@
 ---
-title: Development tools
-seotitle: Write data to InfluxDB with development tools
-list_title: Write data to InfluxDB with development tools
+title: Developer tools
+seotitle: Write data to InfluxDB with developer tools
+list_title: Use developer tools
 weight: 101
 description: >
-  Write data to InfluxDB with development tools.
-aliases:
+  Write data to InfluxDB with developer tools.
 menu:
   v2_0:
-    name : Development tools
+    name: Developer tools
     parent: Write data
 ---
 
-The following options let you write data to InfluxDB without writing any code.
+Write data to InfluxDB with development tools.
 
 {{< children >}}
diff --git a/content/v2.0/write-data/development-tools/api.md b/content/v2.0/write-data/development-tools/api.md
index d203cf410..e0d69f132 100644
--- a/content/v2.0/write-data/development-tools/api.md
+++ b/content/v2.0/write-data/development-tools/api.md
@@ -2,14 +2,13 @@
 title: InfluxDB API
 seotitle: Write data with the InfluxDB API
 list_title: Write data with the InfluxDB API
-weight: 6
+weight: 206
 description: >
   Write data to InfluxDB using the InfluxDB API.
-aliases:
 menu:
   v2_0:
-    name : InfluxDB API
-    parent: Development tools
+    name: InfluxDB API
+    parent: Developer tools
 ---
 Write data to InfluxDB using an HTTP request to the InfluxDB API `/write` endpoint.
 Use the `POST` request method and include the following in your request:
diff --git a/content/v2.0/write-data/development-tools/client-libraries.md b/content/v2.0/write-data/development-tools/client-libraries.md
index 778aac5f1..7a3146536 100644
--- a/content/v2.0/write-data/development-tools/client-libraries.md
+++ b/content/v2.0/write-data/development-tools/client-libraries.md
@@ -2,14 +2,13 @@
 title: Client libraries
 seotitle: Write data with client libraries
 list_title: Write data with client libraries
-weight: 4
+weight: 204
 description: >
   Write data to InfluxDB using client libraries.
-aliases:
 menu:
   v2_0:
-    name : Client libraries
-    parent: Development tools
+    name: Client libraries
+    parent: Developer tools
 ---
 
 Use language-specific client libraries to integrate with the InfluxDB v2 API.
diff --git a/content/v2.0/write-data/development-tools/csv.md b/content/v2.0/write-data/development-tools/csv.md
index 914115bcd..009a9bf02 100644
--- a/content/v2.0/write-data/development-tools/csv.md
+++ b/content/v2.0/write-data/development-tools/csv.md
@@ -7,8 +7,10 @@ description: >
 menu:
   v2_0:
     name: Write CSV data
-    parent: Development tools
-weight: 104
+    parent: Developer tools
+aliases:
+  - /v2.0/write-data/csv/
+weight: 204
 related:
   - /v2.0/reference/syntax/line-protocol/
   - /v2.0/reference/syntax/annotated-csv/
diff --git a/content/v2.0/write-data/development-tools/influx-cli.md b/content/v2.0/write-data/development-tools/influx-cli.md
index d754d1d79..5b1f3e2e6 100644
--- a/content/v2.0/write-data/development-tools/influx-cli.md
+++ b/content/v2.0/write-data/development-tools/influx-cli.md
@@ -2,14 +2,13 @@
 title: Influx CLI
 seotitle: Write data with the influx CLI
 list_title: Write data with the influx CLI
-weight: 5
+weight: 205
 description: >
   Write data to InfluxDB using the `influx` CLI.
-aliases:
 menu:
   v2_0:
-    name : Influx CLI
-    parent: Development tools
+    name: Influx CLI
+    parent: Developer tools
 ---
 
 From the command line, use the [`influx write` command](/v2.0/reference/cli/influx/write/) to write data to InfluxDB.
diff --git a/content/v2.0/write-data/no-code/_index.md b/content/v2.0/write-data/no-code/_index.md
index e6634f14e..f57ce1a5a 100644
--- a/content/v2.0/write-data/no-code/_index.md
+++ b/content/v2.0/write-data/no-code/_index.md
@@ -10,7 +10,7 @@ aliases:
   - /v2.0/collect-data/use-telegraf
 menu:
   v2_0:
-    name : No-code solutions
+    name: No-code solutions
     parent: Write data
 ---
 
diff --git a/content/v2.0/write-data/no-code/scrape-data/_index.md b/content/v2.0/write-data/no-code/scrape-data/_index.md
index a5fb42f2e..46ba45d04 100644
--- a/content/v2.0/write-data/no-code/scrape-data/_index.md
+++ b/content/v2.0/write-data/no-code/scrape-data/_index.md
@@ -13,7 +13,7 @@ v2.0/tags: [scraper]
 menu:
   v2_0:
     name: Scrape data
-    parent: Agent-less options
+    parent: No-code solutions
 products: [oss]
 ---
 
diff --git a/content/v2.0/write-data/no-code/third-party.md b/content/v2.0/write-data/no-code/third-party.md
index 0b797f930..89b65ca59 100644
--- a/content/v2.0/write-data/no-code/third-party.md
+++ b/content/v2.0/write-data/no-code/third-party.md
@@ -9,7 +9,7 @@ aliases:
   - /v2.0/write-data/#third-party-technologies
 menu:
   v2_0:
-    name : Third-party technologies
+    name: Third-party technologies
     parent: No-code solutions
 ---
 
diff --git a/content/v2.0/write-data/no-code/use-telegraf/_index.md b/content/v2.0/write-data/no-code/use-telegraf/_index.md
index 4e669e6a0..b8403e32e 100644
--- a/content/v2.0/write-data/no-code/use-telegraf/_index.md
+++ b/content/v2.0/write-data/no-code/use-telegraf/_index.md
@@ -11,7 +11,7 @@ aliases:
   - /v2.0/collect-data/use-telegraf
 menu:
   v2_0:
-    name : Telegraf (agent-based)
+    name: Telegraf (agent-based)
     parent: No-code solutions
 ---
 
diff --git a/content/v2.0/write-data/no-code/use-telegraf/auto-config/_index.md b/content/v2.0/write-data/no-code/use-telegraf/auto-config/_index.md
index 171de1530..4e1bdcbd2 100644
--- a/content/v2.0/write-data/no-code/use-telegraf/auto-config/_index.md
+++ b/content/v2.0/write-data/no-code/use-telegraf/auto-config/_index.md
@@ -8,7 +8,7 @@ aliases:
   - /v2.0/collect-data/use-telegraf/auto-config
 menu:
   v2_0:
-    parent: Agent-based Telegraf
+    parent: Telegraf (agent-based)
 weight: 201
 ---
 
diff --git a/content/v2.0/write-data/no-code/use-telegraf/use-telegraf-plugins/_index.md b/content/v2.0/write-data/no-code/use-telegraf/use-telegraf-plugins/_index.md
index 2f15b92ef..7b600b02f 100644
--- a/content/v2.0/write-data/no-code/use-telegraf/use-telegraf-plugins/_index.md
+++ b/content/v2.0/write-data/no-code/use-telegraf/use-telegraf-plugins/_index.md
@@ -1,13 +1,16 @@
 ---
 title: Use Telegraf plugins
 description: >
-  Enter a description here.
+  Use Telegraf plugins to capture and write metrics to InfluxDB.
+aliases:
+  - /v2.0/write-data/use-telegraf/use-telegraf-plugins/
 menu:
   v2_0:
     name: Use Telegraf plugins
     parent: Telegraf (agent-based)
 weight: 202
 ---
+
 The following articles guide you through step-by-step Telegraf configuration examples:
 
 {{< children >}}
diff --git a/content/v2.0/write-data/no-code/use-telegraf/use-telegraf-plugins/use-http-plugin.md b/content/v2.0/write-data/no-code/use-telegraf/use-telegraf-plugins/use-http-plugin.md
index c0717a2d2..922f52372 100644
--- a/content/v2.0/write-data/no-code/use-telegraf/use-telegraf-plugins/use-http-plugin.md
+++ b/content/v2.0/write-data/no-code/use-telegraf/use-telegraf-plugins/use-http-plugin.md
@@ -4,6 +4,8 @@ seotitle: Use the Telegraf HTTP input plugin to write data to InfluxDB
 list_title: HTTP input plugin
 description: >
   Write Citi Bike data to your InfluxDB instance with the HTTP plugin.
+aliases:
+  - /v2.0/write-data/use-telegraf/use-telegraf-plugins/use-http-plugin/
 menu:
   v2_0:
     name: HTTP input plugin
diff --git a/layouts/shortcodes/youtube.html b/layouts/shortcodes/youtube.html
new file mode 100644
index 000000000..75f38f577
--- /dev/null
+++ b/layouts/shortcodes/youtube.html
@@ -0,0 +1,11 @@
+{{- $pc := .Page.Site.Config.Privacy.YouTube -}}
+{{- if not $pc.Disable -}}
+{{- $ytHost := cond $pc.PrivacyEnhanced  "www.youtube-nocookie.com" "www.youtube.com" -}}
+{{- $id := .Get "id" | default (.Get 0) -}}
+{{- $class := .Get "class" | default (.Get 1) }}
+<div class="video">
+  <div {{ with $class }}class="{{ . }}"{{ else }}style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden;"{{ end }}>
+    <iframe src="https://{{ $ytHost }}/embed/{{ $id }}{{ with .Get "autoplay" }}{{ if eq . "true" }}?autoplay=1{{ end }}{{ end }}" {{ if not $class }}style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; border:0;" {{ end }}allowfullscreen title="YouTube Video"></iframe>
+  </div>
+</div>
+{{ end -}}