diff --git a/content/rancher/v2.x/en/_index.md b/content/rancher/v2.x/en/_index.md
index f29ddb0f597..d805e4dad85 100644
--- a/content/rancher/v2.x/en/_index.md
+++ b/content/rancher/v2.x/en/_index.md
@@ -4,7 +4,6 @@ shortTitle: Rancher 2.0
 insertOneSix: true
 weight: 1
 ---
-# Rancher 2.0 Documentation
 
 ## What's New?
 
diff --git a/content/rancher/v2.x/en/about/_index.md b/content/rancher/v2.x/en/about/_index.md
index e6346173f99..45fc9ffa6be 100644
--- a/content/rancher/v2.x/en/about/_index.md
+++ b/content/rancher/v2.x/en/about/_index.md
@@ -3,8 +3,6 @@
   weight: 5000
 ---
 
-# About
-
 ## Contributing to Rancher
 
 ### Developing
diff --git a/content/rancher/v2.x/en/concepts/alerts-and-notifiers/_index.md b/content/rancher/v2.x/en/concepts/alerts-and-notifiers/_index.md
index 3f3c21509a0..0a00bbc3e37 100644
--- a/content/rancher/v2.x/en/concepts/alerts-and-notifiers/_index.md
+++ b/content/rancher/v2.x/en/concepts/alerts-and-notifiers/_index.md
@@ -2,4 +2,3 @@
 title: Alerts and Notifiers
 weight: 2300
 ---
-# Alerts and Notifiers
diff --git a/content/rancher/v2.x/en/concepts/api-keys/_index.md b/content/rancher/v2.x/en/concepts/api-keys/_index.md
index 0a552b34a9c..252b3b99881 100644
--- a/content/rancher/v2.x/en/concepts/api-keys/_index.md
+++ b/content/rancher/v2.x/en/concepts/api-keys/_index.md
@@ -2,4 +2,3 @@
 title: API Keys
 weight: 2400
 ---
-# API Keys
diff --git a/content/rancher/v2.x/en/concepts/authentication/_index.md b/content/rancher/v2.x/en/concepts/authentication/_index.md
index 370be872e5b..7174024a082 100644
--- a/content/rancher/v2.x/en/concepts/authentication/_index.md
+++ b/content/rancher/v2.x/en/concepts/authentication/_index.md
@@ -3,8 +3,6 @@
   weight:
 ---
 
-# Authentication
-
 One of the key features that {{< product >}} adds to Kubernetes is centralized user authentication. This feature allows your users to use one set of credentials to authenticate with any of your Kubernetes clusters.
 
 This centralized user authentication is accomplished using the {{< product >}} authentication proxy, which is installed with the rest of {{< product >}}. This proxy authenticates your users and forwards their requests to your Kubernetes clusters using a service account.
diff --git a/content/rancher/v2.x/en/concepts/catalogs/_index.md b/content/rancher/v2.x/en/concepts/catalogs/_index.md
index 0e54da2eca3..570d3a001d7 100644
--- a/content/rancher/v2.x/en/concepts/catalogs/_index.md
+++ b/content/rancher/v2.x/en/concepts/catalogs/_index.md
@@ -2,7 +2,6 @@
 title: Catalogs
 weight: 2250
 ---
-# Catalogs
 
 Rancher catalog builds on an enhanced version of Helm. All upstream Helm charts can work on Rancher, but Rancher adds several enhancements to make the user experience better.
 
diff --git a/content/rancher/v2.x/en/concepts/ci-cd-pipelines/_index.md b/content/rancher/v2.x/en/concepts/ci-cd-pipelines/_index.md
index 5c7bf497418..fa26a43fbe5 100644
--- a/content/rancher/v2.x/en/concepts/ci-cd-pipelines/_index.md
+++ b/content/rancher/v2.x/en/concepts/ci-cd-pipelines/_index.md
@@ -3,8 +3,6 @@ title: Pipelines
 weight: 2350
 ---
 
-# Pipelines
-
 Pipelines help you automate the software delivery process. You can integrate Rancher with GitHub to create a pipeline.
 
 You can set up your pipeline to run a series of stages and steps to test your code and deploy it.
diff --git a/content/rancher/v2.x/en/concepts/clusters/_index.md b/content/rancher/v2.x/en/concepts/clusters/_index.md
index ee1cfe234f5..f54560e49d2 100644
--- a/content/rancher/v2.x/en/concepts/clusters/_index.md
+++ b/content/rancher/v2.x/en/concepts/clusters/_index.md
@@ -2,7 +2,6 @@
 title: Clusters
 weight: 2100
 ---
-# Clusters
 
 ## What's a Cluster?
 
diff --git a/content/rancher/v2.x/en/concepts/clusters/cloud-providers/_index.md b/content/rancher/v2.x/en/concepts/clusters/cloud-providers/_index.md
index 91fc2856413..0385ddc78c0 100644
--- a/content/rancher/v2.x/en/concepts/clusters/cloud-providers/_index.md
+++ b/content/rancher/v2.x/en/concepts/clusters/cloud-providers/_index.md
@@ -2,9 +2,6 @@
 title: Cloud Providers
 weight: 2110
 ---
-
-# Cloud Providers
-
 A _cloud provider_ is a module in Kubernetes that provides an interface for managing nodes, load balancers, and networking routes. You can configure a cloud provider to automatically provision load balancers or persistent storage devices when launching Kubernetes definitions, provided that the cloud provider you're using supports such automation.
 
 By default, the **Cloud Provider** option is set to `None`. Supported cloud providers are:
diff --git a/content/rancher/v2.x/en/concepts/clusters/cluster-providers/_index.md b/content/rancher/v2.x/en/concepts/clusters/cluster-providers/_index.md
index 41f2a1a95e8..0244b9cffa5 100644
--- a/content/rancher/v2.x/en/concepts/clusters/cluster-providers/_index.md
+++ b/content/rancher/v2.x/en/concepts/clusters/cluster-providers/_index.md
@@ -3,8 +3,6 @@ title: Cluster Providers
 weight: 2105
 ---
 
-# Cluster Providers
-
 ## Rancher Kubernetes Engine (RKE)
 
 RKE is Rancher’s own lightweight Kubernetes installer. It works with any cloud providers, virtualization platforms, or bare metal servers. It integrates with node drivers to automatically provision nodes on AWS, Azure, DigitalOcean, vSphere, OpenStack, etc. Users can add custom nodes to the cluster by running the Rancher agent on these nodes.
diff --git a/content/rancher/v2.x/en/home/_index.md b/content/rancher/v2.x/en/home/_index.md
index a18bc48bbdd..fb9ec769344 100644
--- a/content/rancher/v2.x/en/home/_index.md
+++ b/content/rancher/v2.x/en/home/_index.md
@@ -3,8 +3,6 @@ title: Home
 aliases: [/rancher/v2.x/en/]
 weight: 1
 ---
-# Rancher 2.0 Documentation
-
 ## What's New?
 
 The previous version of Rancher, version 1.6, was a container management platform built on Docker. Rancher 2.0 builds on the success and experience of Rancher 1.6.
diff --git a/content/rancher/v2.x/en/home/overview/_index.md b/content/rancher/v2.x/en/home/overview/_index.md
index a6296f276a2..1202ed219c8 100644
--- a/content/rancher/v2.x/en/home/overview/_index.md
+++ b/content/rancher/v2.x/en/home/overview/_index.md
@@ -2,8 +2,6 @@
 title: Overview
 weight: 1
 ---
-# Rancher Overview
-
 Rancher is a container management platform built for organizations that deploy containers in production. Rancher makes it easy to run Kubernetes everywhere, meet IT requirements, and empower DevOps teams.
 
 ## Run Kubernetes Everywhere
diff --git a/content/rancher/v2.x/en/installation/_index.md b/content/rancher/v2.x/en/installation/_index.md
index d8e510591f4..7594b9f3add 100644
--- a/content/rancher/v2.x/en/installation/_index.md
+++ b/content/rancher/v2.x/en/installation/_index.md
@@ -2,8 +2,6 @@
 title: Installation
 weight: 50
 ---
-# Installation
-
 This section contains instructions for installing Rancher in development and production environments.
 
 Choose from the following installation options:
diff --git a/content/rancher/v2.x/en/installation/after-installation/_index.md b/content/rancher/v2.x/en/installation/after-installation/_index.md
index 53aaf7ed377..051b394bcf8 100644
--- a/content/rancher/v2.x/en/installation/after-installation/_index.md
+++ b/content/rancher/v2.x/en/installation/after-installation/_index.md
@@ -3,7 +3,4 @@ title: After Installation
 weight: 360
 draft: true
 ---
-
-# After Installation
-
 This section contains information about how to perform system maintenance on your Rancher install.
diff --git a/content/rancher/v2.x/en/installation/after-installation/etcd-backup-and-restoration/_index.md b/content/rancher/v2.x/en/installation/after-installation/etcd-backup-and-restoration/_index.md
index 088beb499fe..3ea2a8e236f 100644
--- a/content/rancher/v2.x/en/installation/after-installation/etcd-backup-and-restoration/_index.md
+++ b/content/rancher/v2.x/en/installation/after-installation/etcd-backup-and-restoration/_index.md
@@ -3,9 +3,6 @@ title: Etcd Backup and Restoration
 weight: 370
 draft: true
 ---
-
-# Etcd Backup and Restoration
-
 You can configure a Rancher Kubenettes Engine (RKE) cluster to automatically create backups of etcd. In a disaster scenario, you can restore these backups, which are stored on other cluster nodes.
 
 ## Etcd Regular Backup
diff --git a/content/rancher/v2.x/en/installation/air-gap-installation/_index.md b/content/rancher/v2.x/en/installation/air-gap-installation/_index.md
index 5a7558057fc..6e6006e087d 100644
--- a/content/rancher/v2.x/en/installation/air-gap-installation/_index.md
+++ b/content/rancher/v2.x/en/installation/air-gap-installation/_index.md
@@ -2,9 +2,6 @@
 title: Air Gap Installation
 weight: 345
 ---
-
-# Air Gap Installation
-
 Rancher supports installing from a private registry. In every [release](https://github.com/rancher/rancher/releases), we provide you with the needed system-images and scripts to mirror those images to your own registry. The system-images are used when nodes are added to a cluster, or when you enable features like pipelines or logging.
 
 >**Prerequisite:** It is assumed you either have your own private registry or other means of distributing docker images to your machine. If you need help with creating a private registry, please refer to the [Docker documentation for private registries](https://docs.docker.com/registry/).
diff --git a/content/rancher/v2.x/en/installation/ha-server-install/_index.md b/content/rancher/v2.x/en/installation/ha-server-install/_index.md
index c304c1dddbf..1fc075ae958 100644
--- a/content/rancher/v2.x/en/installation/ha-server-install/_index.md
+++ b/content/rancher/v2.x/en/installation/ha-server-install/_index.md
@@ -2,8 +2,6 @@
 title: High Availability Installation
 weight: 275
 ---
-# High Availability Installation
-
 This set of instructions creates a new Kubernetes cluster dedicated to running Rancher in a high-availability (HA) configuration. This procedure walks you through setting up a 3-node cluster using the Rancher Kubernetes Engine (RKE). The cluster's sole purpose is running pods for Rancher. The setup is based on:
 
 * Round Robin DNS
diff --git a/content/rancher/v2.x/en/installation/server-tags/_index.md b/content/rancher/v2.x/en/installation/server-tags/_index.md
index a61723dbef0..85941f6137b 100644
--- a/content/rancher/v2.x/en/installation/server-tags/_index.md
+++ b/content/rancher/v2.x/en/installation/server-tags/_index.md
@@ -2,9 +2,6 @@
 title: Server Tags
 weight: 200
 ---
-
-# Rancher Server Tags
-
 {{< product >}} Server is distributed as a Docker image, which have _tags_ attached to them. Tags are used to identify what version is included in the image. Rancher includes additional tags that point to a specific version. Remember that if you use the additional tags, you must explicitly pull a new version of that image tag. Otherwise it will use the cached image on the host.
 
 You can find Rancher images at [DockerHub](https://hub.docker.com/r/rancher/rancher/tags/).
diff --git a/content/rancher/v2.x/en/installation/single-node-install-external-lb/_index.md b/content/rancher/v2.x/en/installation/single-node-install-external-lb/_index.md
index 260ca64da5b..3268cf2738a 100644
--- a/content/rancher/v2.x/en/installation/single-node-install-external-lb/_index.md
+++ b/content/rancher/v2.x/en/installation/single-node-install-external-lb/_index.md
@@ -2,8 +2,6 @@
 title: Single Node Installation with External Load Balancer
 weight: 260
 ---
-# Single Node Installation with External Load Balancer
-
 For development environments, we recommend installing Rancher by running a single Docker container. In this installation scenario, you'll deploy Rancher to a Linux host using a single Docker container. Then you will configure an external load balancer to work with Rancher.
 
 >**Note:**
diff --git a/content/rancher/v2.x/en/installation/single-node-install/_index.md b/content/rancher/v2.x/en/installation/single-node-install/_index.md
index e7c3d424df3..9825ceed930 100644
--- a/content/rancher/v2.x/en/installation/single-node-install/_index.md
+++ b/content/rancher/v2.x/en/installation/single-node-install/_index.md
@@ -2,8 +2,6 @@
 title: Single Node Installation
 weight: 250
 ---
-# Single Node Installation
-
 For development environments, we recommend installing Rancher by running a single Docker container. In this installation scenario, you'll install Docker on a single Linux host, and then install Rancher on your host using a single Docker container.
 
 >**Note:**
diff --git a/content/rancher/v2.x/en/quick-start-guide/_index.md b/content/rancher/v2.x/en/quick-start-guide/_index.md
index 845c04834d5..00a48cad5ca 100644
--- a/content/rancher/v2.x/en/quick-start-guide/_index.md
+++ b/content/rancher/v2.x/en/quick-start-guide/_index.md
@@ -1,10 +1,8 @@
 ---
-title: Quick Start
+title: Quick Start Guide
+short title: Quick Start
 weight: 25
 ---
-
-# Quick Start Guide
-
 >**Note:** This Quick Start Guide will get you up and running in a sandbox environment. It is not intended for a production environment. For more comprehensive instructions, see [Installation]({{< baseurl >}}/rancher/v2.x/en/installation/).
 
 Howdy Partner! This tutorial walks you through:
diff --git a/content/rancher/v2.x/en/tasks/_index.md b/content/rancher/v2.x/en/tasks/_index.md
index 1f525408e02..1bb49b63b49 100644
--- a/content/rancher/v2.x/en/tasks/_index.md
+++ b/content/rancher/v2.x/en/tasks/_index.md
@@ -2,6 +2,4 @@
 title: Tasks
 weight: 3000
 ---
-# Tasks
-
 This section of the docs provide step-by-step instructions on how to accomplish a goal within Rancher.
diff --git a/content/rancher/v2.x/en/tasks/clusters/_index.md b/content/rancher/v2.x/en/tasks/clusters/_index.md
index 8ad422b04ae..9cf00a32ccd 100644
--- a/content/rancher/v2.x/en/tasks/clusters/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/_index.md
@@ -2,5 +2,3 @@
 title: Clusters
 weight: 3175
 ---
-
-# Clusters
diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-a-node/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-a-node/_index.md
index 92a4b3c2f68..22b6749fc45 100644
--- a/content/rancher/v2.x/en/tasks/clusters/adding-a-node/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/adding-a-node/_index.md
@@ -3,9 +3,6 @@ title: Adding a Node
 weight: 3475
 draft: true
 ---
-
-# Adding a Node
-
 Coming Soon
 
 ## By Node/Cloud Provider
diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-alerts/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-alerts/_index.md
index b3f6fd41a9c..cfea82f3542 100644
--- a/content/rancher/v2.x/en/tasks/clusters/adding-alerts/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/adding-alerts/_index.md
@@ -3,6 +3,4 @@ title: Adding Alerts
 weight: 3575
 draft: true
 ---
-# Adding Alerts
-
 Coming Soon
diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-managing-cluster-members/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-managing-cluster-members/_index.md
index b00e4d68bd3..28b5e8cc783 100644
--- a/content/rancher/v2.x/en/tasks/clusters/adding-managing-cluster-members/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/adding-managing-cluster-members/_index.md
@@ -3,6 +3,4 @@ title: Adding/Managing Cluster Members
 weight: 3525
 draft: true
 ---
-# Adding/Managing Cluster Members
-
 Coming Soon
diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-notifiers/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-notifiers/_index.md
index 88e448a19e9..d588a226d26 100644
--- a/content/rancher/v2.x/en/tasks/clusters/adding-notifiers/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/adding-notifiers/_index.md
@@ -3,6 +3,4 @@ title: Adding Notifiers
 weight: 3550
 draft: true
 ---
-# Adding Notifiers
-
 Coming Soon
diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md
index 55ee58acb8a..267608767f3 100644
--- a/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md
@@ -3,9 +3,6 @@ title: Adding Storage
 weight: 3500
 draft: true
 ---
-
-# Adding Storage
-
 Coming Soon
 
 ## Adding Persistent Volumes
diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-users-to-a-cluster/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-users-to-a-cluster/_index.md
index b5bd79f38f9..6ca749c3ab2 100644
--- a/content/rancher/v2.x/en/tasks/clusters/adding-users-to-a-cluster/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/adding-users-to-a-cluster/_index.md
@@ -3,6 +3,4 @@ title: Adding Users to a Cluster
 weight: 3425
 draft: true
 ---
-# Adding Users to a Cluster
-
 Coming Soon
diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/_index.md b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/_index.md
index 8d2315c1257..ce3e45300f4 100644
--- a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/_index.md
@@ -2,6 +2,4 @@
 title: Creating a Cluster
 weight: 3200
 ---
-# Creating a Cluster
-
 Rancher includes a variety of options for getting a Kubernetes cluster up and running using a single Linux node as a temple. Choose from one of the options below to get started!
diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2/_index.md b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2/_index.md
index 9f34f7ea097..ebda0e25e5a 100644
--- a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2/_index.md
@@ -1,10 +1,8 @@
 ---
-title: Amazon EC2
+title: Creating an Amazon EC2 Cluster
+shortTitle: Amazon EC2
 weight: 3250
 ---
-
-# Creating an Amazon EC2 Cluster
-
 Use {{< product >}} to create a Kubernetes cluster in Amazon EC2.
 
 1. From the **Clusters** page, click **Add Cluster**.
diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-azure-container-service/_index.md b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-azure-container-service/_index.md
index cfa158bee6a..2465363251b 100644
--- a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-azure-container-service/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-azure-container-service/_index.md
@@ -1,5 +1,6 @@
 ---
-title: Azure Container Service
+title: Creating an AKS Cluster
+shortTitle: Azure Container Service
 weight: 3350
 ---
 
diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-azure/_index.md b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-azure/_index.md
index ccedc859ecb..ae784b9f315 100644
--- a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-azure/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-azure/_index.md
@@ -1,5 +1,5 @@
 ---
-title: Azure
+shortTitle: Creating an Azure Cluster
 weight: 3300
 ---
 
diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-custom/_index.md b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-custom/_index.md
index f9f7078f011..ec359df617e 100644
--- a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-custom/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-custom/_index.md
@@ -1,5 +1,6 @@
 ---
-title: Custom Cluster
+title: Creating a Custom Cluster
+shortTitle: Custom Cluster
 weight: 3225
 ---
 
@@ -86,7 +87,7 @@ If you have configured your cluster to use Amazon as **Cloud Provider**, tag you
 
 [Amazon Documentation: Tagging Your Amazon EC2 Resources](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html)
 
->**Note:** You can use Amazon EC2 instances without configuring a cloud provider in Kubernetes. You only have to configure the cloud provider if you want to use specific Kubernetes cloud provider functionality. For more information, see [Kubernetes Cloud Providers](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/)	
+>**Note:** You can use Amazon EC2 instances without configuring a cloud provider in Kubernetes. You only have to configure the cloud provider if you want to use specific Kubernetes cloud provider functionality. For more information, see [Kubernetes Cloud Providers](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/)
 
 
 The following resources need to tagged with a `ClusterID`:
diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-digital-ocean/_index.md b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-digital-ocean/_index.md
index 19acb27cf0a..f61f0544162 100644
--- a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-digital-ocean/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-digital-ocean/_index.md
@@ -1,10 +1,8 @@
 ---
-title: DigitalOcean
+title: Creating a DigitalOcean Clusters
+shortTitle: DigitalOcean
 weight: 3275
 ---
-
-# Creating a DigitalOcean Cluster
-
 Use {{< product >}} to create a Kubernetes cluster using DigitalOcean.
 
 1. From the **Clusters** page, click **Add Cluster**.
diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-gke/_index.md b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-gke/_index.md
index 8e21361325a..4f72c17dd61 100644
--- a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-gke/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-gke/_index.md
@@ -1,10 +1,8 @@
 ---
-title: Google Container Engine
+title: Creating a GKE Cluster
+shortTitle: Google Container Engine
 weight: 3325
 ---
-
-# Creating a Google Container Engine Cluster
-
 ## Objectives
 
 1.	[Create a Service Account](#create-a-gke-service-account)
diff --git a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/_index.md b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/_index.md
index 0a57f88896d..03ff66a55e1 100644
--- a/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/_index.md
@@ -1,10 +1,8 @@
 ---
-title: vSphere
+title: Creatomg a vSphere Cluster
+shortTitle: vSphere
 weight: 3375
 ---
-
-# Creating a vSphere Cluster
-
 Use {{< product >}} to create a Kubernetes cluster in vSphere.
 
 1. From the **Clusters** page, click **Add Cluster**.
diff --git a/content/rancher/v2.x/en/tasks/clusters/enabling-cluster-logging/_index.md b/content/rancher/v2.x/en/tasks/clusters/enabling-cluster-logging/_index.md
index c6d187c29f2..873677e6d03 100644
--- a/content/rancher/v2.x/en/tasks/clusters/enabling-cluster-logging/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/enabling-cluster-logging/_index.md
@@ -3,6 +3,4 @@ title: Enabling Cluster Logging
 weight: 3600
 draft: true
 ---
-# Enabling Cluster Logging
-
 Coming Soon
diff --git a/content/rancher/v2.x/en/tasks/clusters/enabling-pipelines-for-projects/_index.md b/content/rancher/v2.x/en/tasks/clusters/enabling-pipelines-for-projects/_index.md
index 5a18c9c5770..06f69364a01 100644
--- a/content/rancher/v2.x/en/tasks/clusters/enabling-pipelines-for-projects/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/enabling-pipelines-for-projects/_index.md
@@ -3,6 +3,4 @@ title: Enabling Pipelines for Projects
 weight: 3625
 draft: true
 ---
-#Enabling Pipelines for Projects
-
 Coming Soon
diff --git a/content/rancher/v2.x/en/tasks/clusters/import-cluster/_index.md b/content/rancher/v2.x/en/tasks/clusters/import-cluster/_index.md
index c40c4c6cc3c..6cd12568ce9 100644
--- a/content/rancher/v2.x/en/tasks/clusters/import-cluster/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/import-cluster/_index.md
@@ -2,9 +2,6 @@
 title: Importing a Cluster
 weight: 3400
 ---
-
-# Importing a Cluster
-
 You can import an existing Kubernetes cluster and then manage it using Rancher.
 
 1. From the **Clusters** page, click **Add Cluster**.
diff --git a/content/rancher/v2.x/en/tasks/clusters/using-kubectl-to-access-a-cluster/_index.md b/content/rancher/v2.x/en/tasks/clusters/using-kubectl-to-access-a-cluster/_index.md
index ca3bc2ab3fa..bd798e35f36 100644
--- a/content/rancher/v2.x/en/tasks/clusters/using-kubectl-to-access-a-cluster/_index.md
+++ b/content/rancher/v2.x/en/tasks/clusters/using-kubectl-to-access-a-cluster/_index.md
@@ -3,8 +3,6 @@ title: Using kubectl to Access a Cluster
 weight: 3450
 draft: true
 ---
-# Using kubectl to Access a Cluster
-
 Coming Soon
 
 ## Using kubectl Shell
diff --git a/content/rancher/v2.x/en/tasks/global-configuration/_index.md b/content/rancher/v2.x/en/tasks/global-configuration/_index.md
index dbe7ef7b9cd..ac174f34f8f 100644
--- a/content/rancher/v2.x/en/tasks/global-configuration/_index.md
+++ b/content/rancher/v2.x/en/tasks/global-configuration/_index.md
@@ -2,6 +2,4 @@
 title: Global Configuration
 weight: 3025
 ---
-# Global Configuration
-
 This section contains step-by-step instruction for configuring Rancher to work in your environment.
diff --git a/content/rancher/v2.x/en/tasks/global-configuration/authentication.md b/content/rancher/v2.x/en/tasks/global-configuration/authentication.md
index 59bbe49ca07..d8cdea2560f 100644
--- a/content/rancher/v2.x/en/tasks/global-configuration/authentication.md
+++ b/content/rancher/v2.x/en/tasks/global-configuration/authentication.md
@@ -2,4 +2,3 @@
 title: Authentication
 weight: 3075
 ---
-# Authentication
diff --git a/content/rancher/v2.x/en/tasks/global-configuration/configure-user-authentication.md b/content/rancher/v2.x/en/tasks/global-configuration/configure-user-authentication.md
index 8bfe2e60ef7..9d92dc4229b 100644
--- a/content/rancher/v2.x/en/tasks/global-configuration/configure-user-authentication.md
+++ b/content/rancher/v2.x/en/tasks/global-configuration/configure-user-authentication.md
@@ -2,9 +2,6 @@
 title: Authentication
 weight: 3075
 ---
-
-# Configuring User Authentication
-
 You have three options for user authentication in {{< product >}}:
 
 -	**Active Directory**: Enterprises can use Active Directory (AD) for authentication, allowing users to sign in using their corporate credentials.
diff --git a/content/rancher/v2.x/en/tasks/global-configuration/node-drivers.md b/content/rancher/v2.x/en/tasks/global-configuration/node-drivers.md
index 7389e73ad0d..50970e9d5e8 100644
--- a/content/rancher/v2.x/en/tasks/global-configuration/node-drivers.md
+++ b/content/rancher/v2.x/en/tasks/global-configuration/node-drivers.md
@@ -2,9 +2,6 @@
 title: Node Drivers
 weight: 3050
 ---
-
-# Node Drivers
-
 ## Adding Custom Node Drivers
 
 If you create a cluster using a cloud provider that {{< product >}} doesn't support out-of-the-box, you may need to add the provider's drivers (or create them yourself) so that your nodes function properly.
diff --git a/content/rancher/v2.x/en/tasks/global-configuration/pod-security-policies.md b/content/rancher/v2.x/en/tasks/global-configuration/pod-security-policies.md
index 7e25f3f6567..4ab77f15b9d 100644
--- a/content/rancher/v2.x/en/tasks/global-configuration/pod-security-policies.md
+++ b/content/rancher/v2.x/en/tasks/global-configuration/pod-security-policies.md
@@ -2,9 +2,6 @@
 title: Adding Pod Security Policies
 weight: 3150
 ---
-
-# Pod Security Policies
-
 ## Adding Pod Security Policies
 
 Using {{< product >}}, you can create a Pod Security Policy using our GUI rather than creating a .yaml file.
diff --git a/content/rancher/v2.x/en/tasks/global-configuration/roles.md b/content/rancher/v2.x/en/tasks/global-configuration/roles.md
index 86abdbc968f..9574766bbdb 100644
--- a/content/rancher/v2.x/en/tasks/global-configuration/roles.md
+++ b/content/rancher/v2.x/en/tasks/global-configuration/roles.md
@@ -2,9 +2,6 @@
 title: Roles
 weight: 3100
 ---
-
-# Roles
-
 While _users_ determine who can log into Rancher, _roles_ determine which Kubernetes API endpoints and Rancher roles that a user can access after login. In other words, roles determine the user's _permissions_ when using Rancher.
 
 ## Adding A Custom Role
diff --git a/content/rancher/v2.x/en/tasks/global-configuration/server-url.md b/content/rancher/v2.x/en/tasks/global-configuration/server-url.md
index d71dee1fb77..c980796ef8a 100644
--- a/content/rancher/v2.x/en/tasks/global-configuration/server-url.md
+++ b/content/rancher/v2.x/en/tasks/global-configuration/server-url.md
@@ -2,8 +2,6 @@
 title: Rancher Server URL
 weight: 3125
 ---
-# Rancher Server URL
-
 ## Updating the {{< product >}} Server URL
 
 The first time that you log into {{< product >}}, the system prompts for the {{< product >}} Server URL, which is the IP address or host name that your Kubernetes nodes register with.
diff --git a/content/rancher/v2.x/en/tasks/miscellaneous/_index.md b/content/rancher/v2.x/en/tasks/miscellaneous/_index.md
index d7aa41d891c..526c54f9de2 100644
--- a/content/rancher/v2.x/en/tasks/miscellaneous/_index.md
+++ b/content/rancher/v2.x/en/tasks/miscellaneous/_index.md
@@ -3,9 +3,6 @@ title: Miscellaneous
 weight: 3725
 draft: true
 ---
-
-# Miscellaneous
-
 Coming Soon
 
 ## Deleting a Node Template
diff --git a/content/rancher/v2.x/en/tasks/pipelines/_index.md b/content/rancher/v2.x/en/tasks/pipelines/_index.md
index 1f65d59ec51..49c9dce509d 100644
--- a/content/rancher/v2.x/en/tasks/pipelines/_index.md
+++ b/content/rancher/v2.x/en/tasks/pipelines/_index.md
@@ -2,8 +2,6 @@
 title:  Pipelines
 weight: 3700
 ---
-# Pipelines
-
 ## Enabling CI Pipelines
 
 1. Select cluster from drop down.
diff --git a/content/rancher/v2.x/en/tasks/projects/_index.md b/content/rancher/v2.x/en/tasks/projects/_index.md
index 0bd0b1c6c89..f55e3bc052a 100644
--- a/content/rancher/v2.x/en/tasks/projects/_index.md
+++ b/content/rancher/v2.x/en/tasks/projects/_index.md
@@ -3,8 +3,6 @@ title: Projects
 weight: 3650
 draft: true
 ---
-# Projects
-
 Coming Soon
 
 ## Creating a Project
diff --git a/content/rancher/v2.x/en/tasks/workloads/_index.md b/content/rancher/v2.x/en/tasks/workloads/_index.md
index 6789ebfd2c0..c8569961c57 100644
--- a/content/rancher/v2.x/en/tasks/workloads/_index.md
+++ b/content/rancher/v2.x/en/tasks/workloads/_index.md
@@ -3,8 +3,6 @@ title: Workloads
 weight: 3675
 draft: true
 ---
-# Workloads
-
 Coming Soon
 
 ## Deploying Workloads
diff --git a/content/rancher/v2.x/en/upgrades/_index.md b/content/rancher/v2.x/en/upgrades/_index.md
index 23c81165674..a87c8350cc0 100644
--- a/content/rancher/v2.x/en/upgrades/_index.md
+++ b/content/rancher/v2.x/en/upgrades/_index.md
@@ -3,9 +3,6 @@ title: Upgrades
 weight: 1000
 draft: true
 ---
-
-# Upgrades
-
 - Upgrading from Rancher 2.x.x
 
 	All Rancher 2.x.x will support upgrades from a previous version.  This section will be updated as soon as the first release post 2.0 is available.