diff --git a/content/v2.0/visualize-data/dashboards/create-dashboard.md b/content/v2.0/visualize-data/dashboards/create-dashboard.md
index 554582013..69db086f2 100644
--- a/content/v2.0/visualize-data/dashboards/create-dashboard.md
+++ b/content/v2.0/visualize-data/dashboards/create-dashboard.md
@@ -23,7 +23,7 @@ weight: 201
 2. Click the **+Create Dashboard** menu in the upper right and select **New Dashboard**.
 3. Enter a name for your dashboard in the **Name this dashboard** field in the upper left.
 
-**To create a dashboard from a template**:
+**To create a dashboard from a template in the dashboards page**:
 
 1. Click the **Dashboards** icon in the navigation bar.
 
@@ -33,11 +33,20 @@ weight: 201
 3. In the window that appears, select a template and review the template's variables and cells.
 4. Click **Create Dashboard**.
 
+**To create a dashboard from a template in the templates UI**:
+
+1. Click the **Settings** icon in the left navigation.
+
+    {{< nav-icon "settings" >}}
+
+2. Select the **Templates** tab.
+3. Hover over the name of the template you want to create a dashboard from, then click **Create**.
+
 **To import an existing dashboard**:
 
 1. Click the **Dashboards** icon in the navigation bar.
 
-  {{< nav-icon "dashboards" >}}
+    {{< nav-icon "dashboards" >}}
 
 2. Click the **Create Dashboard** menu in the upper right and select **Import Dashboard**.
 3. In the window that appears:
@@ -46,6 +55,27 @@ weight: 201
 4. Select an organization from the **Destination Organization** dropdown.
 5. Click **Import JSON as Dashboard**.
 
+## Create dashboards with templates
+
+**To create a dashboard from a template in the dashboards page**:
+
+1. Click the **Dashboards** icon in the navigation bar.
+
+    {{< nav-icon "dashboards" >}}
+
+2. Click the **+Create Dashboard** menu in the upper right and select **From a Template**.
+3. In the window that appears, select a template and review the template's variables and cells.
+4. Click **Create Dashboard**.
+
+**To create a dashboard from a template in the templates UI**:
+
+1. Click the **Settings** icon in the left navigation.
+
+    {{< nav-icon "settings" >}}
+
+2. Select the **Templates** tab.
+3. Hover over the name of the template you want to create a dashboard from, then click **Create**.
+
 ## Clone a dashboard
 
 1. Hover over the dashboard name in the list of dashboard to show options.
diff --git a/content/v2.0/visualize-data/templates/index.md b/content/v2.0/visualize-data/templates/_index.md
similarity index 70%
rename from content/v2.0/visualize-data/templates/index.md
rename to content/v2.0/visualize-data/templates/_index.md
index 92322c826..f3cf470df 100644
--- a/content/v2.0/visualize-data/templates/index.md
+++ b/content/v2.0/visualize-data/templates/_index.md
@@ -9,6 +9,6 @@ menu:
 weight: 101
 ---
 
-Create, edit, and manage templates
+Templates are a way to create and share dashboards across organizations without starting from scratch.
 
 {{< children >}}
diff --git a/content/v2.0/visualize-data/templates/create-template.md b/content/v2.0/visualize-data/templates/create-template.md
index 3a7a7e7ad..654b40608 100644
--- a/content/v2.0/visualize-data/templates/create-template.md
+++ b/content/v2.0/visualize-data/templates/create-template.md
@@ -11,10 +11,36 @@ weight: 201
 
 ---
 
-## Create a template
+## Import a template
 
 1. Click the **Settings** icon in the left navigation.
 
-    {{nav-icon "settings"}}
+    {{< nav-icon "settings" >}}
 
-## Import a template
+2. Select the **Templates** tab.
+3. Click **Import Template** in the upper right.
+4. In the window that appears:
+  * Select **Upload File** to drag-and-drop or select a file.
+  * Select **Paste JSON** to paste in JSON.
+5. Click **Import JSON as Template**.
+
+
+## Create a template from an existing dashboard
+
+1. Click the **Dashboards** icon in the navigation bar.
+
+    {{< nav-icon "dashboards" >}}
+
+2. Click the settings icon ({{< icon "gear" >}}) next to a dashboard in the list, then click **Export**. The dashboard JSON appears in a new window.
+3. Click **Save as template**.  
+
+
+## Clone a template
+
+1. Click the **Settings** icon in the left navigation.
+
+    {{< nav-icon "settings" >}}
+
+2. Select the **Templates** tab.
+3. Hover over the template you want to clone, then click {{< icon "clone" >}}.
+4. Click **Clone** to confirm. The cloned template appears in your list.
diff --git a/content/v2.0/visualize-data/templates/delete-template.md b/content/v2.0/visualize-data/templates/delete-template.md
index 1b886134e..4f3873b2b 100644
--- a/content/v2.0/visualize-data/templates/delete-template.md
+++ b/content/v2.0/visualize-data/templates/delete-template.md
@@ -1,5 +1,5 @@
 ---
-title: Delete templates
+title: Delete a template
 seotitle: Delete InfluxDB templates
 description: Delete templates in the InfluxDB user interface (UI).
 v2.0/tags: [templates]
@@ -10,3 +10,13 @@ menu:
 weight: 203
 
 ---
+
+To delete a template in the InfluxDB UI:
+
+1. Click the **Settings** icon in the left navigation.
+
+    {{< nav-icon "settings" >}}
+
+2. Select the **Templates** tab.
+3. Hover over the name of the template you want to delete, then click **{{< icon "trash" >}}**.    
+3. Click **Delete** to delete your dashboard.
diff --git a/content/v2.0/visualize-data/templates/view-template.md b/content/v2.0/visualize-data/templates/view-template.md
index 5f17be251..3803d3a4d 100644
--- a/content/v2.0/visualize-data/templates/view-template.md
+++ b/content/v2.0/visualize-data/templates/view-template.md
@@ -10,3 +10,11 @@ menu:
 weight: 202
 
 ---
+To view templates in the InfluxDB UI:
+
+1. Click the **Settings** icon in the left navigation.
+
+    {{< nav-icon "settings" >}}
+
+2. Select the **Templates** tab. The list of templates appears.
+3. Click on the name of a template to view its JSON.