diff --git a/content/v2.0/organizations/buckets/create-bucket.md b/content/v2.0/organizations/buckets/create-bucket.md
index ff8715cb3..c856f2548 100644
--- a/content/v2.0/organizations/buckets/create-bucket.md
+++ b/content/v2.0/organizations/buckets/create-bucket.md
@@ -21,9 +21,9 @@ to create a bucket.
 2. Select **Buckets**.
 3. Click **{{< icon "plus" >}} Create Bucket** in the upper right.
 4. Enter a **Name** for the bucket.
-5. Select **Delete Data older than**:  
+5. Select when to **Delete Data**.
     Select **Never** to retain data forever.  
-    Select **Periodically** to define a specific retention policy.
+    Select **Older than** to choose a specific retention policy.
 5. Click **Create** to create the bucket.
 
 ## Create a bucket using the influx CLI
@@ -32,7 +32,7 @@ Use the [`influx bucket create` command](/v2.0/reference/cli/influx/bucket/creat
 to create a new bucket. A bucket requires the following:
 
 - A name
-- The name or ID of the organization to which it belongs
+- The name or ID of the organization the bucket belongs to
 - A retention period in nanoseconds
 
 ```sh
diff --git a/content/v2.0/organizations/buckets/delete-bucket.md b/content/v2.0/organizations/buckets/delete-bucket.md
index e1652ce12..8c25b4948 100644
--- a/content/v2.0/organizations/buckets/delete-bucket.md
+++ b/content/v2.0/organizations/buckets/delete-bucket.md
@@ -20,7 +20,7 @@ to delete a bucket.
 
 2. Select **Buckets**.
 3. Hover over the bucket you would like to delete.
-4. Click **{{< icon "delete" >}} Delete Bucket** and **Delete** to delete the bucket.
+4. Click **{{< icon "delete" >}} Delete Bucket** and **Confirm** to delete the bucket.
 
 ## Delete a bucket using the influx CLI
 
diff --git a/content/v2.0/organizations/buckets/update-bucket.md b/content/v2.0/organizations/buckets/update-bucket.md
index 76e5b11f7..0bbfef353 100644
--- a/content/v2.0/organizations/buckets/update-bucket.md
+++ b/content/v2.0/organizations/buckets/update-bucket.md
@@ -8,6 +8,7 @@ menu:
     parent: Manage buckets
 weight: 202
 ---
+
 Use the `influx` command line interface (CLI) or the InfluxDB user interface (UI) to update a bucket.
 
 Note that updating an bucket's name will affect any assets that reference the bucket by name, including the following:
@@ -28,10 +29,9 @@ If you change a bucket name, be sure to update the bucket in the above places as
     {{< nav-icon "load data" >}}
 
 2. Select **Buckets**.
-3. Hover over the name of the bucket you want to rename in the list.
-4. Click **Rename**.
-5. Review the information in the window that appears and click **I understand, let's rename my bucket**.
-6. Update the bucket's name and click **Change Bucket Name**.
+3. Click **Rename** under the bucket you want to rename.
+4. Review the information in the window that appears and click **I understand, let's rename my bucket**.
+5. Update the bucket's name and click **Change Bucket Name**.
 
 ## Update a bucket's retention policy in the InfluxDB UI
 
@@ -50,7 +50,7 @@ Use the [`influx bucket update` command](/v2.0/reference/cli/influx/bucket/updat
 to update a bucket. Updating a bucket requires the following:
 
 - The bucket ID _(provided in the output of `influx bucket find`)_
-- The name or ID of the organization to which the bucket belongs
+- The name or ID of the organization the bucket belongs to.
 
 ##### Update the name of a bucket
 ```sh
diff --git a/content/v2.0/organizations/buckets/view-buckets.md b/content/v2.0/organizations/buckets/view-buckets.md
index 2fd8049e9..5dd6e91a9 100644
--- a/content/v2.0/organizations/buckets/view-buckets.md
+++ b/content/v2.0/organizations/buckets/view-buckets.md
@@ -21,8 +21,7 @@ weight: 202
 ## View buckets using the influx CLI
 
 Use the [`influx bucket find` command](/v2.0/reference/cli/influx/bucket/find)
-to view a buckets in an organization. Viewing bucket requires the following:
-
+to view a buckets in an organization. 
 
 ```sh
 influx bucket find
diff --git a/content/v2.0/write-data/_index.md b/content/v2.0/write-data/_index.md
index d5b856dd8..542844b19 100644
--- a/content/v2.0/write-data/_index.md
+++ b/content/v2.0/write-data/_index.md
@@ -119,24 +119,43 @@ influx write -b bucketName -o orgName -p s @/path/to/line-protocol.txt
     {{< nav-icon "load data" >}}
 
 2. Select **Buckets**.
-3. Hover over the bucket to write data to and click **{{< icon "plus" >}} Add Data**.
-4. Select **Line Protocol**.
-   _You can also [use Telegraf](/v2.0/write-data/use-telegraf/) or
-   [scrape data](/v2.0/write-data/scrape-data/)._
-5. Select **Upload File** or **Enter Manually**.
+3. Under the bucket you want to write data to, click **{{< icon "plus" >}} Add Data**.
+4. Select from the following options:
 
-    - **Upload File:**
-      Select the time precision of your data.
-      Drag and drop the line protocol file into the UI or click to select the
-      file from your file manager.
-    - **Enter Manually:**
-      Select the time precision of your data.
-      Manually enter line protocol.
+    - [Configure Telegraf Agent](#configure-telegraf-agent)
+    - [Line Protocol](#line-protocol-1)
+    - [Scrape Metrics](#scrape-metrics)
 
-6. Click **Continue**.
-   A message indicates whether data is successfully written to InfluxDB.
-7. To add more data or correct line protocol, click **Previous**.
-8. Click **Finish**.
+    ---
+
+    #### Configure Telegraf Agent  
+    1.  _See [Automatically create a Telegraf configuration](/v2.0/write-data/use-telegraf/auto-config/#create-a-telegraf-configuration)
+        for more details._
+
+    ---
+
+    #### Line Protocol
+    1.  Select **Upload File** or **Enter Manually**.
+        - **Upload File:**
+          Select the time precision of your data.
+          Drag and drop the line protocol file into the UI or click to select the
+          file from your file manager.
+        - **Enter Manually:**
+          Select the time precision of your data.
+          Manually enter line protocol.
+    2. Click **Continue**.
+       A message indicates whether data is successfully written to InfluxDB.
+    3. To add more data or correct line protocol, click **Previous**.
+    4. Click **Finish**.
+
+    ---
+
+    #### Scrape Metrics
+    1.  _See [Create a scraper](/v2.0/write-data/scrape-data/manage-scrapers/create-a-scraper/#create-a-scraper-in-the-influxdb-ui)
+        for more details._
+
+        {{% cloud-msg %}}{{< cloud-name >}} does not support scrapers.
+        {{% /cloud-msg %}}
 
 ## Other ways to write data to InfluxDB
 
diff --git a/content/v2.0/write-data/scrape-data/manage-scrapers/create-a-scraper.md b/content/v2.0/write-data/scrape-data/manage-scrapers/create-a-scraper.md
index c4fcae5b7..5abec8bb1 100644
--- a/content/v2.0/write-data/scrape-data/manage-scrapers/create-a-scraper.md
+++ b/content/v2.0/write-data/scrape-data/manage-scrapers/create-a-scraper.md
@@ -21,7 +21,8 @@ Create a new scraper in the InfluxDB user interface (UI).
 3. Click **{{< icon "plus" >}} Create Scraper**.
 4. Enter a **Name** for the scraper.
 5. Select a **Bucket** to store the scraped data.
-6. Enter the **Target URL** to scrape. The default URL value is `http://localhost:9999/metrics`,
+6. Enter the **Target URL** to scrape.
+   The default URL value is `http://localhost:9999/metrics`,
    which provides InfluxDB-specific metrics in the [Prometheus data format](https://prometheus.io/docs/instrumenting/exposition_formats/).
 7. Click **Create**.
 
diff --git a/content/v2.0/write-data/scrape-data/manage-scrapers/delete-a-scraper.md b/content/v2.0/write-data/scrape-data/manage-scrapers/delete-a-scraper.md
index 4e5580729..e65ea251c 100644
--- a/content/v2.0/write-data/scrape-data/manage-scrapers/delete-a-scraper.md
+++ b/content/v2.0/write-data/scrape-data/manage-scrapers/delete-a-scraper.md
@@ -17,7 +17,6 @@ Delete a scraper from the InfluxDB user interface (UI).
 
     {{< nav-icon "load data" >}}
 
-2. Click **Scrapers**. A listing of any existing scrapers appears with the
-   **Name**, **URL**, and **Bucket** for each scraper.
-3. Hover over the scraper you want to delete and click **Delete**.
-4. Click **Confirm**.
+2. Click **Scrapers**.
+3. Hover over the scraper you want to delete and click the **{{< icon "delete" >}}** icon.
+4. Click **Delete**.
diff --git a/content/v2.0/write-data/scrape-data/manage-scrapers/update-a-scraper.md b/content/v2.0/write-data/scrape-data/manage-scrapers/update-a-scraper.md
index 25a163387..1edb06f29 100644
--- a/content/v2.0/write-data/scrape-data/manage-scrapers/update-a-scraper.md
+++ b/content/v2.0/write-data/scrape-data/manage-scrapers/update-a-scraper.md
@@ -22,7 +22,7 @@ To modify either, [create a new scraper](/v2.0/write-data/scrape-data/manage-scr
 
     {{< nav-icon "load data" >}}
 
-2. Click **Scrapers**. A list of existing scrapers appears.
+2. Click **Scrapers**.
 3. Hover over the scraper you would like to update and click the **{{< icon "pencil" >}}**
    that appears next to the scraper name.
 4. Enter a new name for the scraper. Press Return or click out of the name field to save the change.
diff --git a/content/v2.0/write-data/use-telegraf/_index.md b/content/v2.0/write-data/use-telegraf/_index.md
index e7afee4a9..508516b3e 100644
--- a/content/v2.0/write-data/use-telegraf/_index.md
+++ b/content/v2.0/write-data/use-telegraf/_index.md
@@ -21,7 +21,7 @@ Its vast library of input plugins and "plug-and-play" architecture lets you quic
 and easily collect metrics from many different sources.
 This article describes how to use Telegraf to collect and store data in InfluxDB v2.0.
 
-_See [Telegraf plugins](/v2.0/reference/telegraf-plugins/) for a list of available plugins._
+_For a list of available plugins, see [Telegraf plugins](/v2.0/reference/telegraf-plugins/)._
 
 #### Requirements
 - **Telegraf 1.9.2 or greater**.