From 3b7bc89e4189ea9185161724a9e36358459c12ff Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Mon, 23 Apr 2018 16:36:29 -0700
Subject: [PATCH 1/4] more menu setup

---
 content/_index.md                             |   2 +-
 content/os/_index.md                          |   3 +-
 content/os/about/_index.md                    |   3 +-
 content/os/about/faqs/_index.md               |   3 +-
 .../running-rancher-on-rancherOS/_index.md    |   3 +-
 content/os/about/security/_index.md           |   3 +-
 content/os/installation/amazon-ecs/_index.md  |   3 +-
 .../built-in-system-services/_index.md        |   3 +-
 .../boot-process/cloud-init/_index.md         |   3 +-
 .../boot-process/image-preloading/_index.md   |   3 +-
 .../boot-process/logging/_index.md            |   3 +-
 .../os/installation/configuration/_index.md   |   1 -
 .../adding-kernel-parameters/_index.md        |   3 +-
 .../configuration/docker/_index.md            |   3 +-
 .../configuration/hostname/_index.md          |   3 +-
 .../kernel-modules-kernel-headers/_index.md   |   3 +-
 .../loading-kernel-modules/_index.md          |   3 +-
 .../private-registries/_index.md              |   3 +-
 .../resizing-device-partition/_index.md       |   3 +-
 .../configuration/running-commands/_index.md  |   3 +-
 .../setting-up-docker-tls/_index.md           |   3 +-
 .../configuration/ssh-keys/_index.md          |   3 +-
 .../switching-consoles/_index.md              |   3 +-
 .../switching-docker-versions/_index.md       |   3 +-
 .../configuration/sysctl/_index.md            |   3 +-
 .../configuration/users/_index.md             |   3 +-
 .../configuration/write-files/_index.md       |   3 +-
 .../custom-builds/custom-console/_index.md    |   3 +-
 .../custom-builds/custom-kernels/_index.md    |   3 +-
 .../custom-rancheros-iso/_index.md            |   3 +-
 .../os/installation/networking/dns/_index.md  |   3 +-
 .../networking/interfaces/_index.md           |   3 +-
 .../networking/proxy-settings/_index.md       |   3 +-
 .../installation/running-rancheros/_index.md  |   3 +-
 .../running-rancheros/cloud/aws/_index.md     |   3 +-
 .../running-rancheros/cloud/azure/_index.md   |   3 +-
 .../running-rancheros/cloud/do/_index.md      |   3 +-
 .../running-rancheros/cloud/gce/_index.md     |  22 +-
 .../cloud/openstack/_index.md                 |   3 +-
 .../cloud/vmware-esxi/_index.md               |   3 +-
 .../server/install-to-disk/_index.md          |   1 -
 .../running-rancheros/server/pxe/_index.md    |   3 +-
 .../server/raspberry-pi/_index.md             |   3 +-
 .../workstation/boot-from-iso/_index.md       |   3 +-
 .../workstation/docker-machine/_index.md      |   3 +-
 .../storage/additional-mounts/_index.md       |   3 +-
 .../storage/state-partition/_index.md         |   3 +-
 .../installation/storage/using-zfs/_index.md  |   3 +-
 .../adding-system-services/_index.md          |   3 +-
 .../custom-system-services/_index.md          |   3 +-
 .../system-services/environment/_index.md     |   3 +-
 .../system-docker-volumes/_index.md           |   3 +-
 content/os/quick-start-guide/_index.md        |   3 +-
 content/os/upgrading/_index.md                |   3 +-
 content/rancher-example/r-five/_index.md      |  10 -
 .../r-five/five-placeholder.md                |   8 -
 content/rancher-example/r-four/_index.md      |  10 -
 .../r-four/four-placeholder.md                |   8 -
 content/rancher-example/r-one/_index.md       |  10 -
 .../rancher-example/r-one/a-placeholder.md    |   8 -
 .../rancher-example/r-one/b-placeholder.md    |   8 -
 .../rancher-example/r-one/c-placeholder.md    |   8 -
 .../r-one/one-nested/_index.md                |  10 -
 .../r-one/one-nested/two-placeholder.md       |   8 -
 .../rancher-example/r-one/one-placeholder.md  |   8 -
 .../r-one/three-placeholder.md                |   8 -
 .../rancher-example/r-one/two-placeholder.md  |   8 -
 content/rancher-example/r-three/_index.md     |  10 -
 .../r-three/three-placeholder.md              |   8 -
 content/rancher-example/r-two/_index.md       |  10 -
 .../rancher-example/r-two/two-placeholder.md  |   8 -
 content/rancher/_index.md                     |   3 +-
 content/rancher/concepts/_index.md            |   3 +-
 content/rancher/installation/_index.md        |   9 +
 content/rancher/quick-start-guide/_index.md   | 340 +++++++++++++++++-
 content/rancher/tasks/_index.md               |   3 +-
 content/rancher/upgrades/_index.md            |   3 +-
 layouts/_default/backup-sngl.html             |  37 ++
 layouts/_default/list.html                    |   7 +-
 layouts/_default/single.html                  |  96 +++--
 layouts/partials/docs-nav.html                |  40 ++-
 layouts/partials/docs-side-nav.html           |   7 +-
 82 files changed, 599 insertions(+), 273 deletions(-)
 delete mode 100644 content/rancher-example/r-five/_index.md
 delete mode 100644 content/rancher-example/r-five/five-placeholder.md
 delete mode 100644 content/rancher-example/r-four/_index.md
 delete mode 100644 content/rancher-example/r-four/four-placeholder.md
 delete mode 100644 content/rancher-example/r-one/_index.md
 delete mode 100644 content/rancher-example/r-one/a-placeholder.md
 delete mode 100644 content/rancher-example/r-one/b-placeholder.md
 delete mode 100644 content/rancher-example/r-one/c-placeholder.md
 delete mode 100644 content/rancher-example/r-one/one-nested/_index.md
 delete mode 100644 content/rancher-example/r-one/one-nested/two-placeholder.md
 delete mode 100644 content/rancher-example/r-one/one-placeholder.md
 delete mode 100644 content/rancher-example/r-one/three-placeholder.md
 delete mode 100644 content/rancher-example/r-one/two-placeholder.md
 delete mode 100644 content/rancher-example/r-three/_index.md
 delete mode 100644 content/rancher-example/r-three/three-placeholder.md
 delete mode 100644 content/rancher-example/r-two/_index.md
 delete mode 100644 content/rancher-example/r-two/two-placeholder.md
 create mode 100644 content/rancher/installation/_index.md
 create mode 100644 layouts/_default/backup-sngl.html

diff --git a/content/_index.md b/content/_index.md
index 100cbd11156..ae0027cba13 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -1,7 +1,7 @@
 ---
   tag: ["tag1", "tag2", "tag3"]
   category: "category"
-  layout: list-docs
+
   title: homepage
   weight: 4
 ---
diff --git a/content/os/_index.md b/content/os/_index.md
index 1ec9dd2853d..7a2a33860ff 100644
--- a/content/os/_index.md
+++ b/content/os/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "overview"]
+category: ["os"]
 title: RancherOS Documentation
 description: RancherOS is a simplified Linux distribution built from containers, for containers. These documents describe how to install and use RancherOS.
 weight: 1
diff --git a/content/os/about/_index.md b/content/os/about/_index.md
index af1779120c9..5075ce1f199 100644
--- a/content/os/about/_index.md
+++ b/content/os/about/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "faqs"]
+category: "os"
 title: About
 weight: 300
 ---
diff --git a/content/os/about/faqs/_index.md b/content/os/about/faqs/_index.md
index bf27b460803..c8448ba2ed3 100644
--- a/content/os/about/faqs/_index.md
+++ b/content/os/about/faqs/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "faqs"]
+category: "os"
 title: FAQs
 weight: 301
 ---
diff --git a/content/os/about/running-rancher-on-rancherOS/_index.md b/content/os/about/running-rancher-on-rancherOS/_index.md
index 46a4e3f64c8..611fd67513a 100644
--- a/content/os/about/running-rancher-on-rancherOS/_index.md
+++ b/content/os/about/running-rancher-on-rancherOS/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "rancher"]
+category: "os"
 title: Running Rancher on RancherOS
 weight: 302
 ---
diff --git a/content/os/about/security/_index.md b/content/os/about/security/_index.md
index 68d82458802..b8981e5de81 100644
--- a/content/os/about/security/_index.md
+++ b/content/os/about/security/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "security"]
+category: "os"
 title: RancherOS Security
 weight: 303
 ---
diff --git a/content/os/installation/amazon-ecs/_index.md b/content/os/installation/amazon-ecs/_index.md
index 11d45ac8add..735b8dc07de 100644
--- a/content/os/installation/amazon-ecs/_index.md
+++ b/content/os/installation/amazon-ecs/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "custom", "console"]
+category: "os"
 title: Amazon ECS (EC2 Container Service)
 weight: 190
 ---
diff --git a/content/os/installation/boot-process/built-in-system-services/_index.md b/content/os/installation/boot-process/built-in-system-services/_index.md
index f3243befbd2..bdb7e8221dd 100644
--- a/content/os/installation/boot-process/built-in-system-services/_index.md
+++ b/content/os/installation/boot-process/built-in-system-services/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "system services"]
+category: "os"
 title: Built-in System Services
 weight: 150
 ---
diff --git a/content/os/installation/boot-process/cloud-init/_index.md b/content/os/installation/boot-process/cloud-init/_index.md
index 746629e8253..010ffb50a86 100644
--- a/content/os/installation/boot-process/cloud-init/_index.md
+++ b/content/os/installation/boot-process/cloud-init/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "cloud-init"]
+category: "os"
 title: Cloud-Init
 weight: 151
 ---
diff --git a/content/os/installation/boot-process/image-preloading/_index.md b/content/os/installation/boot-process/image-preloading/_index.md
index cb1dd66e879..5f6b3fa3412 100644
--- a/content/os/installation/boot-process/image-preloading/_index.md
+++ b/content/os/installation/boot-process/image-preloading/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os"]
+category: "os"
 title: Image Preloading
 weight: 152
 ---
diff --git a/content/os/installation/boot-process/logging/_index.md b/content/os/installation/boot-process/logging/_index.md
index d3436c708a0..68d1a4d17ee 100644
--- a/content/os/installation/boot-process/logging/_index.md
+++ b/content/os/installation/boot-process/logging/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "logging"]
+category: "os"
 title: System Logging
 weight: 153
 ---
diff --git a/content/os/installation/configuration/_index.md b/content/os/installation/configuration/_index.md
index 5ccdd82bac2..0961a9bf37a 100644
--- a/content/os/installation/configuration/_index.md
+++ b/content/os/installation/configuration/_index.md
@@ -1,5 +1,4 @@
 ---
-layout: list-docs
 title: Configuration
 weight: 120
 ---
diff --git a/content/os/installation/configuration/adding-kernel-parameters/_index.md b/content/os/installation/configuration/adding-kernel-parameters/_index.md
index 9b8ab289eb6..88f69f899fa 100644
--- a/content/os/installation/configuration/adding-kernel-parameters/_index.md
+++ b/content/os/installation/configuration/adding-kernel-parameters/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os"]
+category: "os"
 title: Adding Kernel Parameters
 weight: 133
 ---
diff --git a/content/os/installation/configuration/docker/_index.md b/content/os/installation/configuration/docker/_index.md
index 75443841382..3c18d461baa 100644
--- a/content/os/installation/configuration/docker/_index.md
+++ b/content/os/installation/configuration/docker/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "docker", "system docker"]
+category: "os"
 title: Configuring Docker or System Docker
 weight: 126
 ---
diff --git a/content/os/installation/configuration/hostname/_index.md b/content/os/installation/configuration/hostname/_index.md
index 34215b28d5c..fa1bd3fb8b7 100644
--- a/content/os/installation/configuration/hostname/_index.md
+++ b/content/os/installation/configuration/hostname/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os"]
+category: "os"
 title: Setting the Hostname
 weight: 124
 ---
diff --git a/content/os/installation/configuration/kernel-modules-kernel-headers/_index.md b/content/os/installation/configuration/kernel-modules-kernel-headers/_index.md
index 2b6ad9cba05..dc2baf4e12b 100644
--- a/content/os/installation/configuration/kernel-modules-kernel-headers/_index.md
+++ b/content/os/installation/configuration/kernel-modules-kernel-headers/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os"]
+category: "os"
 title: Installing Kernel Modules with Kernel Headers
 weight: 135
 ---
diff --git a/content/os/installation/configuration/loading-kernel-modules/_index.md b/content/os/installation/configuration/loading-kernel-modules/_index.md
index ca00efd98cd..73c51cd4741 100644
--- a/content/os/installation/configuration/loading-kernel-modules/_index.md
+++ b/content/os/installation/configuration/loading-kernel-modules/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os"]
+category: "os"
 title: Loading Extra Kernel Modules
 weight: 134
 ---
diff --git a/content/os/installation/configuration/private-registries/_index.md b/content/os/installation/configuration/private-registries/_index.md
index 18d8b2b5359..5ecd3894543 100644
--- a/content/os/installation/configuration/private-registries/_index.md
+++ b/content/os/installation/configuration/private-registries/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os"]
+category: "os"
 title: Private Registries
 weight: 128
 ---
diff --git a/content/os/installation/configuration/resizing-device-partition/_index.md b/content/os/installation/configuration/resizing-device-partition/_index.md
index d0b0c6dcb8d..6d837467112 100644
--- a/content/os/installation/configuration/resizing-device-partition/_index.md
+++ b/content/os/installation/configuration/resizing-device-partition/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os"]
+category: "os"
 title: Resizing a Device Partition
 weight: 131
 ---
diff --git a/content/os/installation/configuration/running-commands/_index.md b/content/os/installation/configuration/running-commands/_index.md
index 17875a7167e..32c034c37ed 100644
--- a/content/os/installation/configuration/running-commands/_index.md
+++ b/content/os/installation/configuration/running-commands/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "commands"]
+category: "os"
 title: Running Commands
 weight: 123
 ---
diff --git a/content/os/installation/configuration/setting-up-docker-tls/_index.md b/content/os/installation/configuration/setting-up-docker-tls/_index.md
index af2e97584ff..e17a3284c4a 100644
--- a/content/os/installation/configuration/setting-up-docker-tls/_index.md
+++ b/content/os/installation/configuration/setting-up-docker-tls/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "docker", "tls"]
+category: "os"
 title: Setting up Docker TLS
 weight: 127
 ---
diff --git a/content/os/installation/configuration/ssh-keys/_index.md b/content/os/installation/configuration/ssh-keys/_index.md
index 8086c253fd6..a53a3179560 100644
--- a/content/os/installation/configuration/ssh-keys/_index.md
+++ b/content/os/installation/configuration/ssh-keys/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "ssh"]
+category: "os"
 title: SSH Keys
 weight: 121
 ---
diff --git a/content/os/installation/configuration/switching-consoles/_index.md b/content/os/installation/configuration/switching-consoles/_index.md
index 37e038acc3e..031359f4cca 100644
--- a/content/os/installation/configuration/switching-consoles/_index.md
+++ b/content/os/installation/configuration/switching-consoles/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "consoles"]
+category: "os"
 title: Switching Consoles
 weight: 125
 ---
diff --git a/content/os/installation/configuration/switching-docker-versions/_index.md b/content/os/installation/configuration/switching-docker-versions/_index.md
index 63c8253cc69..b29a5c3f175 100644
--- a/content/os/installation/configuration/switching-docker-versions/_index.md
+++ b/content/os/installation/configuration/switching-docker-versions/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "docker"]
+category: "os"
 title: Switching Docker Versions
 weight: 129
 ---
diff --git a/content/os/installation/configuration/sysctl/_index.md b/content/os/installation/configuration/sysctl/_index.md
index 68d60b2eae7..4a92bb01f05 100644
--- a/content/os/installation/configuration/sysctl/_index.md
+++ b/content/os/installation/configuration/sysctl/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os"]
+category: "os"
 title: sysctl Settings
 weight: 132
 ---
diff --git a/content/os/installation/configuration/users/_index.md b/content/os/installation/configuration/users/_index.md
index ea9c75f2320..b0b3d692c41 100644
--- a/content/os/installation/configuration/users/_index.md
+++ b/content/os/installation/configuration/users/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os"]
+category: "os"
 title: Users
 weight: 130
 ---
diff --git a/content/os/installation/configuration/write-files/_index.md b/content/os/installation/configuration/write-files/_index.md
index 59b28324ae4..25d5b605181 100644
--- a/content/os/installation/configuration/write-files/_index.md
+++ b/content/os/installation/configuration/write-files/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os"]
+category: "os"
 title: Writing Files
 weight: 122
 ---
diff --git a/content/os/installation/custom-builds/custom-console/_index.md b/content/os/installation/custom-builds/custom-console/_index.md
index e89e20ab7bd..4574eff915e 100644
--- a/content/os/installation/custom-builds/custom-console/_index.md
+++ b/content/os/installation/custom-builds/custom-console/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "custom", "console"]
+category: "os"
 title: Custom Console
 weight: 180
 ---
diff --git a/content/os/installation/custom-builds/custom-kernels/_index.md b/content/os/installation/custom-builds/custom-kernels/_index.md
index a3426d55eea..763afa92c08 100644
--- a/content/os/installation/custom-builds/custom-kernels/_index.md
+++ b/content/os/installation/custom-builds/custom-kernels/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "custom", "kernels"]
+category: "os"
 title: Custom Kernels
 weight: 181
 ---
diff --git a/content/os/installation/custom-builds/custom-rancheros-iso/_index.md b/content/os/installation/custom-builds/custom-rancheros-iso/_index.md
index f8007163498..8e2ee418046 100644
--- a/content/os/installation/custom-builds/custom-rancheros-iso/_index.md
+++ b/content/os/installation/custom-builds/custom-rancheros-iso/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "custom", "iso"]
+category: "os"
 title: Custom RancherOS ISO
 weight: 182
 ---
diff --git a/content/os/installation/networking/dns/_index.md b/content/os/installation/networking/dns/_index.md
index 302a7469d51..341926f8f1c 100644
--- a/content/os/installation/networking/dns/_index.md
+++ b/content/os/installation/networking/dns/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "networking", "dns"]
+category: "os"
 title: Configuring DNS
 weight: 171
 ---
diff --git a/content/os/installation/networking/interfaces/_index.md b/content/os/installation/networking/interfaces/_index.md
index 1d6d970e78a..d16b0838bca 100644
--- a/content/os/installation/networking/interfaces/_index.md
+++ b/content/os/installation/networking/interfaces/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "networking", "interfaces"]
+category: "os"
 title: Configuring Network Interfaces
 weight: 170
 ---
diff --git a/content/os/installation/networking/proxy-settings/_index.md b/content/os/installation/networking/proxy-settings/_index.md
index d7a0c116810..80f5dc4516d 100644
--- a/content/os/installation/networking/proxy-settings/_index.md
+++ b/content/os/installation/networking/proxy-settings/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "proxy"]
+category: "os"
 title: Configuring Proxy Settings
 weight: 172
 ---
diff --git a/content/os/installation/running-rancheros/_index.md b/content/os/installation/running-rancheros/_index.md
index af2e38ca300..3b6722bb300 100644
--- a/content/os/installation/running-rancheros/_index.md
+++ b/content/os/installation/running-rancheros/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "installation"]
+category: "os"
 title: Running RancherOS
 weight: 100
 ---
diff --git a/content/os/installation/running-rancheros/cloud/aws/_index.md b/content/os/installation/running-rancheros/cloud/aws/_index.md
index 97637df70ad..d2430f53da4 100644
--- a/content/os/installation/running-rancheros/cloud/aws/_index.md
+++ b/content/os/installation/running-rancheros/cloud/aws/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "amazon", "ec2"]
+category: "os"
 title: Amazon EC2
 weight: 105
 ---
diff --git a/content/os/installation/running-rancheros/cloud/azure/_index.md b/content/os/installation/running-rancheros/cloud/azure/_index.md
index b33b8426d7a..013749505cb 100644
--- a/content/os/installation/running-rancheros/cloud/azure/_index.md
+++ b/content/os/installation/running-rancheros/cloud/azure/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "azure"]
+category: "os"
 title: Azure
 weight: 110
 ---
diff --git a/content/os/installation/running-rancheros/cloud/do/_index.md b/content/os/installation/running-rancheros/cloud/do/_index.md
index 5ec61b0ce41..0c6e5460f25 100644
--- a/content/os/installation/running-rancheros/cloud/do/_index.md
+++ b/content/os/installation/running-rancheros/cloud/do/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "digitalocean"]
+category: "os"
 title: Digital Ocean
 weight: 107
 ---
diff --git a/content/os/installation/running-rancheros/cloud/gce/_index.md b/content/os/installation/running-rancheros/cloud/gce/_index.md
index bd235740c21..57c8aa20440 100644
--- a/content/os/installation/running-rancheros/cloud/gce/_index.md
+++ b/content/os/installation/running-rancheros/cloud/gce/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "gce"]
+category: "os"
 title: Google Cloud Engine (GCE)
 weight: 106
 ---
@@ -14,11 +15,8 @@ weight: 106
 RancherOS is available as an image in GCE, and can be easily run in Google Compute Engine (GCE).  Let’s walk through how to upload GCE image.
 
 1. Download the most recent RancherOS image. The image can be found in the [release artifacts](https://github.com/rancher/os/releases). It is a `.tar.gz` file.
-
 2. Follow Google's instructions on how to [upload the image](https://cloud.google.com/compute/docs/tutorials/building-images#publishingimage). The image must be uploaded into a Google Cloud Storage bucket before it can be added to a project.
-
 3. Follow Google's instructions on how to [import a RAW image](https://cloud.google.com/compute/docs/images/import-existing-image#use_saved_image).
-
 4. Once the image is added to your Google Compute Engine, we can start creating new instances!
 
 ### Launching RancherOS using `gcloud compute`
@@ -81,18 +79,12 @@ Updated [https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/ZONE_OF
 After the image is uploaded, it's easy to use the console to create new instances. You will **not** be able to upload your own cloud config file when creating instances through the console. You can add it after the instance is created using `gcloud compute` commands and resetting the instance.
 
 1. Make sure you are in the project that the image was created in.
-
-    ![RancherOS on GCE 4]({{< baseurl >}}/img/os/Rancher_gce4.png)
-
+![RancherOS on GCE 4]({{< baseurl >}}/img/os/Rancher_gce4.png)
 2. In the navigation bar, click on the **VM instances**, which is located at Compute -> Compute Engine -> Metadata.  Click on **Create instance**.
-
-    ![RancherOS on GCE 5]({{< baseurl >}}/img/os/Rancher_gce5.png)
-
-2.  Fill out the information for your instance. In the **Image** dropdown, your private image will be listed among the public images provided by Google. Select the private image for RancherOS. Click **Create**.
-
-    ![RancherOS on GCE 6]({{< baseurl >}}/img/os/Rancher_gce6.png)
-
-3. Your instance is being created and will be up and running shortly!
+![RancherOS on GCE 5]({{< baseurl >}}/img/os/Rancher_gce5.png)
+3.  Fill out the information for your instance. In the **Image** dropdown, your private image will be listed among the public images provided by Google. Select the private image for RancherOS. Click **Create**.
+![RancherOS on GCE 6]({{< baseurl >}}/img/os/Rancher_gce6.png)
+4. Your instance is being created and will be up and running shortly!
 
 #### Adding SSH keys
 
diff --git a/content/os/installation/running-rancheros/cloud/openstack/_index.md b/content/os/installation/running-rancheros/cloud/openstack/_index.md
index 0e29efcf753..e757876efa4 100644
--- a/content/os/installation/running-rancheros/cloud/openstack/_index.md
+++ b/content/os/installation/running-rancheros/cloud/openstack/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "openstack"]
+category: "os"
 title: OpenStack
 weight: 109
 
diff --git a/content/os/installation/running-rancheros/cloud/vmware-esxi/_index.md b/content/os/installation/running-rancheros/cloud/vmware-esxi/_index.md
index aa02691adf3..347def4fbcd 100644
--- a/content/os/installation/running-rancheros/cloud/vmware-esxi/_index.md
+++ b/content/os/installation/running-rancheros/cloud/vmware-esxi/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "vmware", "esxi"]
+category: "os"
 title: VMware ESXi
 weight: 108
 ---
diff --git a/content/os/installation/running-rancheros/server/install-to-disk/_index.md b/content/os/installation/running-rancheros/server/install-to-disk/_index.md
index d2bb0b1b5c7..6e634dd7e5d 100644
--- a/content/os/installation/running-rancheros/server/install-to-disk/_index.md
+++ b/content/os/installation/running-rancheros/server/install-to-disk/_index.md
@@ -1,5 +1,4 @@
 ---
-layout: list-docs
 title: Installing to Disk
 weight: 111
 ---
diff --git a/content/os/installation/running-rancheros/server/pxe/_index.md b/content/os/installation/running-rancheros/server/pxe/_index.md
index 5c8e24dad07..988c6b6cb49 100644
--- a/content/os/installation/running-rancheros/server/pxe/_index.md
+++ b/content/os/installation/running-rancheros/server/pxe/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "pxe", "ipxe"]
+category: "os"
 title: iPXE
 weight: 112
 ---
diff --git a/content/os/installation/running-rancheros/server/raspberry-pi/_index.md b/content/os/installation/running-rancheros/server/raspberry-pi/_index.md
index 771f8b73496..6bf968a56b5 100644
--- a/content/os/installation/running-rancheros/server/raspberry-pi/_index.md
+++ b/content/os/installation/running-rancheros/server/raspberry-pi/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "raspberry pi"]
+category: "os"
 title: Raspberry Pi
 weight: 113
 ---
diff --git a/content/os/installation/running-rancheros/workstation/boot-from-iso/_index.md b/content/os/installation/running-rancheros/workstation/boot-from-iso/_index.md
index dc70fdce066..2b5b4c13eee 100644
--- a/content/os/installation/running-rancheros/workstation/boot-from-iso/_index.md
+++ b/content/os/installation/running-rancheros/workstation/boot-from-iso/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "iso"]
+category: "os"
 title: Booting from ISO
 weight: 102
 ---
diff --git a/content/os/installation/running-rancheros/workstation/docker-machine/_index.md b/content/os/installation/running-rancheros/workstation/docker-machine/_index.md
index 87dc82e6e0b..5e8494269ed 100644
--- a/content/os/installation/running-rancheros/workstation/docker-machine/_index.md
+++ b/content/os/installation/running-rancheros/workstation/docker-machine/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "docker machine"]
+category: "os"
 title: Using Docker Machine
 weight: 101
 ---
diff --git a/content/os/installation/storage/additional-mounts/_index.md b/content/os/installation/storage/additional-mounts/_index.md
index 1fca2653e20..27340c1ccd7 100644
--- a/content/os/installation/storage/additional-mounts/_index.md
+++ b/content/os/installation/storage/additional-mounts/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "mounts"]
+category: "os"
 title: Additional Mounts
 weight: 161
 ---
diff --git a/content/os/installation/storage/state-partition/_index.md b/content/os/installation/storage/state-partition/_index.md
index fe60ee301c6..e97ae485a4a 100644
--- a/content/os/installation/storage/state-partition/_index.md
+++ b/content/os/installation/storage/state-partition/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os"]
+category: "os"
 title: Persistent State Partition
 weight: 160
 ---
diff --git a/content/os/installation/storage/using-zfs/_index.md b/content/os/installation/storage/using-zfs/_index.md
index 432c866691f..43c333b8264 100644
--- a/content/os/installation/storage/using-zfs/_index.md
+++ b/content/os/installation/storage/using-zfs/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "zfs"]
+category: "os"
 title: Using ZFS
 weight: 162
 ---
diff --git a/content/os/installation/system-services/adding-system-services/_index.md b/content/os/installation/system-services/adding-system-services/_index.md
index 5cec1d0c1e3..cd0b6359dcc 100644
--- a/content/os/installation/system-services/adding-system-services/_index.md
+++ b/content/os/installation/system-services/adding-system-services/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "system services"]
+category: "os"
 title: System Services
 weight: 140
 ---
diff --git a/content/os/installation/system-services/custom-system-services/_index.md b/content/os/installation/system-services/custom-system-services/_index.md
index 12a88c2b8ac..72d53a61277 100644
--- a/content/os/installation/system-services/custom-system-services/_index.md
+++ b/content/os/installation/system-services/custom-system-services/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "system services"]
+category: "os"
 title: Custom System Services
 weight: 141
 ---
diff --git a/content/os/installation/system-services/environment/_index.md b/content/os/installation/system-services/environment/_index.md
index 837b76d3e6a..3fbe80f00ae 100644
--- a/content/os/installation/system-services/environment/_index.md
+++ b/content/os/installation/system-services/environment/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "system services",  "environment"]
+category: "os"
 title: Environment
 weight: 143
 ---
diff --git a/content/os/installation/system-services/system-docker-volumes/_index.md b/content/os/installation/system-services/system-docker-volumes/_index.md
index d6b1759f5e9..d90fb876e45 100644
--- a/content/os/installation/system-services/system-docker-volumes/_index.md
+++ b/content/os/installation/system-services/system-docker-volumes/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "system services"]
+category: "os"
 title: System Docker Volumes
 weight: 142
 ---
diff --git a/content/os/quick-start-guide/_index.md b/content/os/quick-start-guide/_index.md
index f0eeb3bf8b2..c20ff11883a 100644
--- a/content/os/quick-start-guide/_index.md
+++ b/content/os/quick-start-guide/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "quick-start-guide"]
+category: "os"
 title: Quick Start Guide
 weight: 2
 ---
diff --git a/content/os/upgrading/_index.md b/content/os/upgrading/_index.md
index 4591e50542d..af46244d1db 100644
--- a/content/os/upgrading/_index.md
+++ b/content/os/upgrading/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: list-docs
+tag: ["rancheros", "os", "upgrade"]
+category: "os"
 title: Upgrading RancherOS
 weight: 200
 ---
diff --git a/content/rancher-example/r-five/_index.md b/content/rancher-example/r-five/_index.md
deleted file mode 100644
index a7142a335d5..00000000000
--- a/content/rancher-example/r-five/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "category"
-  layout: list-docs
-  title: Five
-  weight: 5
----
-
-
-hello
diff --git a/content/rancher-example/r-five/five-placeholder.md b/content/rancher-example/r-five/five-placeholder.md
deleted file mode 100644
index 78df709eafb..00000000000
--- a/content/rancher-example/r-five/five-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "categories"
-  layout: single-docs
-  title: placeholder
----
-
-# Five tasks placeholder md
diff --git a/content/rancher-example/r-four/_index.md b/content/rancher-example/r-four/_index.md
deleted file mode 100644
index 12040318cf5..00000000000
--- a/content/rancher-example/r-four/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "category"
-  layout: list-docs
-  title: Four
-  weight: 4
----
-
-
-hello
diff --git a/content/rancher-example/r-four/four-placeholder.md b/content/rancher-example/r-four/four-placeholder.md
deleted file mode 100644
index dd22142b087..00000000000
--- a/content/rancher-example/r-four/four-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "categories"
-  layout: single-docs
-  title: placeholder
----
-
-# four tasks placeholder md
diff --git a/content/rancher-example/r-one/_index.md b/content/rancher-example/r-one/_index.md
deleted file mode 100644
index 0c0e0671681..00000000000
--- a/content/rancher-example/r-one/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "category"
-  layout: list-docs
-  title: One
-  weight: 1
----
-
-
-hello
diff --git a/content/rancher-example/r-one/a-placeholder.md b/content/rancher-example/r-one/a-placeholder.md
deleted file mode 100644
index 64245b28a29..00000000000
--- a/content/rancher-example/r-one/a-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "categories"
-  layout: single-docs
-  title: placeholder a
----
-
-# one tasks placeholder md
diff --git a/content/rancher-example/r-one/b-placeholder.md b/content/rancher-example/r-one/b-placeholder.md
deleted file mode 100644
index 4c40643c37e..00000000000
--- a/content/rancher-example/r-one/b-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "categories"
-  layout: single-docs
-  title: placeholder b
----
-
-# two tasks placeholder md
diff --git a/content/rancher-example/r-one/c-placeholder.md b/content/rancher-example/r-one/c-placeholder.md
deleted file mode 100644
index 2b3baed6fac..00000000000
--- a/content/rancher-example/r-one/c-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "categories"
-  layout: single-docs
-  title: placeholder c
----
-
-# three tasks placeholder md
diff --git a/content/rancher-example/r-one/one-nested/_index.md b/content/rancher-example/r-one/one-nested/_index.md
deleted file mode 100644
index 11d50bc7db3..00000000000
--- a/content/rancher-example/r-one/one-nested/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "category"
-  layout: list-docs
-  title: one nested
-  weight: 2
----
-
-
-hello
diff --git a/content/rancher-example/r-one/one-nested/two-placeholder.md b/content/rancher-example/r-one/one-nested/two-placeholder.md
deleted file mode 100644
index e08de18f3e0..00000000000
--- a/content/rancher-example/r-one/one-nested/two-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "categories"
-  layout: single-docs
-  title: one nested a
----
-
-# two tasks placeholder md
diff --git a/content/rancher-example/r-one/one-placeholder.md b/content/rancher-example/r-one/one-placeholder.md
deleted file mode 100644
index 64245b28a29..00000000000
--- a/content/rancher-example/r-one/one-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "categories"
-  layout: single-docs
-  title: placeholder a
----
-
-# one tasks placeholder md
diff --git a/content/rancher-example/r-one/three-placeholder.md b/content/rancher-example/r-one/three-placeholder.md
deleted file mode 100644
index 2b3baed6fac..00000000000
--- a/content/rancher-example/r-one/three-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "categories"
-  layout: single-docs
-  title: placeholder c
----
-
-# three tasks placeholder md
diff --git a/content/rancher-example/r-one/two-placeholder.md b/content/rancher-example/r-one/two-placeholder.md
deleted file mode 100644
index 4c40643c37e..00000000000
--- a/content/rancher-example/r-one/two-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "categories"
-  layout: single-docs
-  title: placeholder b
----
-
-# two tasks placeholder md
diff --git a/content/rancher-example/r-three/_index.md b/content/rancher-example/r-three/_index.md
deleted file mode 100644
index e0467a8c5e8..00000000000
--- a/content/rancher-example/r-three/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "category"
-  layout: list-docs
-  title: Three
-  weight: 3
----
-
-
-hello
diff --git a/content/rancher-example/r-three/three-placeholder.md b/content/rancher-example/r-three/three-placeholder.md
deleted file mode 100644
index da4e9c89bce..00000000000
--- a/content/rancher-example/r-three/three-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "categories"
-  layout: single-docs
-  title: placeholder
----
-
-# three tasks placeholder md
diff --git a/content/rancher-example/r-two/_index.md b/content/rancher-example/r-two/_index.md
deleted file mode 100644
index d24a458db7d..00000000000
--- a/content/rancher-example/r-two/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "category"
-  layout: list-docs
-  title: Two
-  weight: 2
----
-
-
-hello
diff --git a/content/rancher-example/r-two/two-placeholder.md b/content/rancher-example/r-two/two-placeholder.md
deleted file mode 100644
index 11772ff4e88..00000000000
--- a/content/rancher-example/r-two/two-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-  tag: ["tag1", "tag2", "tag3"]
-  category: "categories"
-  layout: single-docs
-  title: two placeholder
----
-
-# two tasks placeholder md
diff --git a/content/rancher/_index.md b/content/rancher/_index.md
index ff26e31f1e9..3859fc44b69 100644
--- a/content/rancher/_index.md
+++ b/content/rancher/_index.md
@@ -1,5 +1,6 @@
 ---
-  layout: single-docs
+  tag: ["rancher", "overview"]
+
   title: Rancher 2.0 Documentation
   weight: 1
 ---
diff --git a/content/rancher/concepts/_index.md b/content/rancher/concepts/_index.md
index 51a36094895..e3d0d2a4b61 100644
--- a/content/rancher/concepts/_index.md
+++ b/content/rancher/concepts/_index.md
@@ -1,5 +1,6 @@
 ---
-  layout: single-docs
+  tag: ["rancher", "concepts"]
+
   title: Rancher Overview
   weight: 2000
 ---
diff --git a/content/rancher/installation/_index.md b/content/rancher/installation/_index.md
new file mode 100644
index 00000000000..2b7df3f8999
--- /dev/null
+++ b/content/rancher/installation/_index.md
@@ -0,0 +1,9 @@
+---
+  tag: ["rancher", "installation"]
+
+  title: Installation
+  weight: 100
+---
+
+Notes:	Installation Scenarios
+A directory of install scenarios. Each scenario offers a synopsis.
diff --git a/content/rancher/quick-start-guide/_index.md b/content/rancher/quick-start-guide/_index.md
index 21f09087df6..3923fea4b33 100644
--- a/content/rancher/quick-start-guide/_index.md
+++ b/content/rancher/quick-start-guide/_index.md
@@ -1,5 +1,6 @@
 ---
-layout: single-docs
+tag: ["rancher", "quick start"]
+category: "rancher"
 title: Quick Start Guide
 weight: 25
 chapter: true
@@ -19,6 +20,7 @@ This Quick Start Guide is divided into different tasks for easier consumption.
 
 1.	[Provision a Linux Host](#provision-a-linux-host)
 
+<<<<<<< HEAD
 	Begin by provisioning a Linux host.
 
 2.	[Install Rancher](#install-rancher)
@@ -52,63 +54,162 @@ Begin creation of a custom cluster by provisioning a Linux host. Your host can b
 - A cloud-host virtual machine (VM)
 - An on-premise VM
 - A bare-metal server
+=======
+1.  [Review Requirements](#host-and-node-requirements)
+
+    Before you do anything, review the requirements.
+
+2.  [Prepare a Linux Host](#prepare-a-linux-host)
+
+    First, you need to provision a Linux host.
+
+3.  [Install Rancher](#install-rancher)
+
+    Run the Docker command for installing Rancher.
+
+4.  [Log In](#log-in)
+
+    Browse to your Linux host to access the Rancher UI.
+
+5.  [Create a Cluster](#create-a-cluster)
+
+    Use Rancher to create your first cluster.
+
+6.  [Deploy a Workload](#deploy-a-workload)
+
+    Create a workload so that Kubernetes can distribute an application and its dependencies among your nodes.
+
+7.  [View Your Application](#view-your-application)
+
+    When your workload finishes deployment, browse to your application to make sure it works.
+
+8.  [What's Next?](#whats-next)
+
+    Now that you've created a cluster and deployed a workload, find out what else you can do with Rancher v2.0.
+>>>>>>> more menu setup
 
 Provision the host according to the requirements below.
 
 #### Hardware Requirements
 
--	Memory: 4GB
+-   Memory: 4GB
 
 #### Software requirements
 
--	Operating System: Ubuntu 16.04 (64-bit)
--	Software: Docker
+-   Operating System: Ubuntu 16.04 (64-bit)
+-   Software: Docker
 
-	<a name="node-requirements"></a>**Supported Versions:**
+    <a name="node-requirements"></a>**Supported Versions:**
 
-	-	`1.12.6`
-	-	`1.13.1`
-	-	`17.03.2`
+    -   `1.12.6`
+    -   `1.13.1`
+    -   `17.03.2`
 
-	>**Notes:**
-	>
-	> * For Docker installation instructions, visit their [documentation](https://docs.docker.com/install/).
-	> * Docker requirements apply to both your Linux host and your cluster nodes.
+    >**Notes:**
+    >
+    > * For Docker installation instructions, visit their [documentation](https://docs.docker.com/install/).
+    > * Docker requirements apply to both your Linux host and your cluster nodes.
 
+<<<<<<< HEAD
+=======
+#### Port Requirements
+
+When provisioning your Linux host, open the ports listed below so that your master and worker nodes can communicate.
+
+##### Master Nodes (etcd and controlplane nodes)
+
+Protocol  | Direction  | Port Range  | Purpose  
+--|---|---|--
+TCP | Inbound | 22  |  SSH server
+TCP | Inbound | 80  | Canal
+TCP | Inbound | 443  | Canal
+TCP | Inbound | 6443  | Kubernetes API server
+TCP | Inbound | 2379-2380  | etcd server client API
+TCP | Inbound | 10250  | kubelet API
+TCP | Inbound | 10251  | scheduler
+TCP | Inbound | 10252  | controller
+TCP | Inbound | 10256  | kubeproxy
+
+##### Worker Nodes
+
+Protocol  | Direction  | Port Range  | Purpose  
+--|---|---|--
+TCP | Inbound | 22  |  SSH Server
+TCP | Inbound | 80  | Canal
+TCP | Inbound | 443  | Canal
+TCP | Inbound | 10250  |  kubelet API
+TCP | Inbound | 10256  |  kubeproxy
+TCP | Inbound | 30000-32767  |  NodePort Services
+
+### Prepare a Linux Host
+
+Begin by provisioning a Linux host to be your Rancher server and a template for your cluster nodes. This host can be:
+
+-   A virtual machine hosted by a cloud service.
+-   An on-premise virtual machine.
+-   An on-premise bare-metal server.
+
+Provision the server according to the [requirements above](#host-and-node-requirements).
+
+>>>>>>> more menu setup
 ### Install Rancher
 
 To install Rancher on your host, connect to it and then use a shell to install.
 
-1.	Log in to your Linux host using your preferred shell, such as PuTTy or a remote Terminal connection.
+1.  Log in to your Linux host using your preferred shell, such as PuTTy or a remote Terminal connection.
 
-2.	From your shell, enter the following command:
+2.  From your shell, enter the following command:
 
+<<<<<<< HEAD
 	```
 	$ sudo docker run -d --restart=unless-stopped -p 80:80 -p 443:443 rancher/server
 	```
 
+=======
+    ```
+    $ sudo docker run -d --restart=unless-stopped -p 80:80 -p 443:443 rancher/server:preview
+    ```
+
+    >**Note:**
+    > Although Rancher v2.0 is in beta, the `preview` tag is still used for installation.
+
+>>>>>>> more menu setup
 **Result:** Rancher is installed.
 
 ### Log In
 
 Log in to Rancher to begin using the application. After you log in, you'll make some one-time configurations.
 
-1.	Open a web browser and enter the IP address of your host:
+1.  Open a web browser and enter the IP address of your host:
 
-	`https://<SERVER_IP>`
+    `https://<SERVER_IP>`
 
-	Replace `<SERVER_IP>` with your host IP address.
+    Replace `<SERVER_IP>` with your host IP address.
 
+<<<<<<< HEAD
 2.	When prompted, create a password for the default `admin` account there cowpoke!
+=======
+    > **Note:** Rancher v2.0 beta:
+    >
+    > - Supports only the HTTPS protocol.
+    > - Uses a self-signed certificate. Due to this signature, the browser prompts you to trust the certificate before login. Following GA, you'll be able to use your own certificate.
+
+2.  When prompted, create a password for the default `admin` account there cowpoke!
+>>>>>>> more menu setup
 
 3. Set the **Rancher Server URL**. The URL can either be an IP address or a host name. However, each node in your cluster must be able to resolve to the URL.
 
+<<<<<<< HEAD
 ## Create the Cluster
+=======
+    ![login](../../../../img/rancher/server-url.png)
+>>>>>>> more menu setup
 
 Welcome to {{< product >}}! Use our application to clone your Linux host and configure them as a Kubernetes cluster.
 
 In this task, use the versatile **Custom** option. This option lets you convert _any_ Linux host (cloud-hosted VM, on-premise VM, or bare-metal) into a cluster.
 
+<<<<<<< HEAD
 1. From the **Clusters** page, click **Add Cluster**.
 
 2. Choose **Custom**.
@@ -130,6 +231,87 @@ In this task, use the versatile **Custom** option. This option lets you convert
 10. When you finish running the command on your Linux host, click **Done**.
 
 {{< result_create-cluster >}}
+=======
+1.  Click **+ Add Cluster**.
+
+    ![add cluster](../../../../img/rancher/click-add-cluster.png)
+
+    **Step Result:** The **Add Cluster** page opens.
+
+2.  From the **Add Cluster** menu, choose a service or source from which to create your first cluster.
+
+    * If you're using a virtual machine hosted on a major cloud service, choose the tile for the service you want to use (e.g. **Digital Ocean**, **Azure Container Service**).
+    * If you're using bare-metal server, an on-premise virtual machine, or a cloud service that isn't explicitly listed, choose **Custom**.
+
+    > **Note:**
+    >
+    > - For Rancher v2.0 beta, Amazon EKS is not supported. This option will be available after GA.
+    > - For this tutorial, the Import option is out of scope. For now, create a cluster using one of the other options. We'll address Import later.
+
+3.  Enter a **Cluster Name**. No spaces allowed.
+
+    > **Tip:** Skip adding **Member Roles** for now. This option isn't essential for your first cluster.
+    >
+    > ![skip member roles](../../../../img/rancher/skip-member-roles.png)
+
+4.  **For those using Google Container Engine or Azure Container Service:**
+
+    Complete the form asking for account information. The form includes links to instructions detailing how to obtain this info.
+
+    ![gce-azure-instructions](../../../../img/rancher/gce-azure-instructions.png)
+
+    **Did you choose one of the other tiles (like Digital Ocean)?** This step doesn't apply to you. Skip to the next step.
+
+5.  Select **Cluster Options**.
+
+    Use these options to choose things like the version of Kubernetes that's installed in your cluster, along with other Kubernetes options such as pod security policies. Some services have more options than others. If you're unsure of what to choose, use the default options.
+
+6.  Add at least one **Node Pool**.
+
+    A *Node Pool* is a group of nodes that are configured identically. Your cluster can contain as many node pools as you'd like. Each object in the grid represents a single node configuration. You can use the node pool to choose the number (i.e. **Count**) of nodes running a given configuration (i.e. **Template**).
+
+    > **Note:** The instructions below don't apply to Google Container Engine, Azure Container Service, or the Custom option.
+    >
+    >*  For Azure Container Server, no additional steps are needed. Proceed to this task's [final step](#create-cluster).
+    >*  For Google Container Engine, complete the Nodes form. The options are pretty self-explanatory. When you're done, proceed to this task's [final step](#create-cluster).
+    >*  For Custom, see [Appendix A: Add Custom Cluster](#appendix-a-add-custom-cluster).
+
+    1.  Enter a **Node Prefix**. When the cluster is created, each node in the pool is named after the prefix. An incremented number is appended to each node.
+
+    2.  Enter the node **Count** for the pool.
+
+    3.  Click **Add Node Template**. A node template is just the a virtual machine configuration you're using to create your nodes (i.e. other virtual machines).
+
+        Depending on the cluster option that you choose, the Rancher UI displays instructions on how to create a template. The process is different for each cloud service. You may need to log in to your cloud service to find the data Rancher needs.
+
+    4.  Choose the **Template** that you just added.
+
+        ![choose template](../../../../img/rancher/choose-template.gif)
+
+    5.  Select roles for the node pool.
+        <a name="roles"></a>
+        Kubernetes functions using different [components](https://kubernetes.io/docs/concepts/overview/components/), which are divided into *master components* and *node components*. When setting up your node pool, select a pool to fill each component role. You can install all components one a single pool, or you can spread them around.
+
+        The roles are:
+
+        - **etcd**: One of the master components. Etcd is a distributed reliable key-value store that stores all Kubernetes states.
+
+        - **Control**: The remaining master components as well as the node components. These nodes help manage the Kubernetes cluster and where your applications can be launched.
+
+        - **Worker**: On these nodes, only node components are launched. These nodes run only applications.
+
+    6.  **Optional:** Click **+ Add Node Pool** to add more pools.
+
+        ![add-second-node-pool](../../../../img/rancher/add-second-node-pool.gif)
+
+    7.  <a name="create-cluster"></a>Click **Create**.
+
+**Result:**
+
+-   Your cluster is created and assigned a state of **Provisioning**. Rancher is standing up your cluster.
+-   You can access your cluster after its state is updated to **Active**.
+-   **Active** clusters are assigned a **Project** and **Namespace**, both of which are named `Default`.
+>>>>>>> more menu setup
 
 ### Deploy a Workload
 
@@ -153,11 +335,19 @@ For this workload, you'll be deploying the application NGINX.
 
 7.	From **Port Mapping**, click **Add Port**.
 
+<<<<<<< HEAD
 8.	From the **Publish on** drop-down, make sure that **Every node** is selected.
+=======
+    ![enter-docker-image](../../../../img/rancher/enter-docker-image.png)
+>>>>>>> more menu setup
 
 8.	From the **Source Port** field, leave the **Random** value in place.
 
+<<<<<<< HEAD
 7. From the **Container Port** field, enter port `80`.
+=======
+    >**Note:** During Rancher v2.0 beta, only port 80 is supported. Other ports will be supported at GA.
+>>>>>>> more menu setup
 
 8. Leave the remaining options on their default setting. We'll tell you about them later.
 
@@ -178,5 +368,121 @@ From the **Workloads** page, click the link underneath your workload. If your de
 
 Congratulations! You have:
 
+<<<<<<< HEAD
 -	Created your first cluster.
 -	Deployed NGINX to your cluster using a workload.
+=======
+-   Created your first cluster.
+-   Deployed an application to your cluster using a workload.
+
+Now you can use the rest of Rancher v2.0 to orchestrate and manage your pods.
+
+(Moooooo-re coming soon!)
+
+![cow](../../../../img/rancher/cow.jpg)
+
+
+### Appendix A: Add Custom Cluster
+
+When creating a custom cluster, follow these instructions to complete its creation. These instructions will create one or more node that will be used to image your cluster.
+
+>**Note:** When creating a custom cluster, make sure each node meets the [Host Requirements](#host-requirements).
+
+1. From **Node Roles**, choose the Kubernetes component roles that you want the node to fill. You must fill each role.
+
+    A more detailed description of each [role](#roles) is available earlier in this guide.
+
+    >**Note:** If you want to spread the roles among different nodes, provision additional Linux hosts and enter the command on each of your nodes.
+
+3. **Optional:** Add labels to the node template.
+
+4. Copy the command for installing Docker to your clipboard.
+
+    >**Remember:** The version of Docker installed on your nodes must be [supported](#node-requirements).
+
+5. Log in to your Linux host using your preferred shell, such as PuTTy or a remote Terminal connection.
+
+6. Enter the command on your Linux host.
+
+7. From you Rancher session, click **Done**.
+
+8. Resume the Quick Start Guide from [Deploy a Workload](#deploy-a-workload).
+
+<!--
+
+### Importing Kubernetes Clusters
+
+In Rancher v2.0, you can import an existing, external installation of Kubernetes v1.8. In this scenario, the cluster provider manages your hosts outside of Rancher.
+
+#### To Import a Kubernetes Cluster:
+
+1. Follow the instructions in the Rancher UI to import an existing Kubernetes cluster. Import the _kubeconfig_ file of your existing cluster.
+2. Click **Import**. Once your cluster is ready, you can view its status on the Clusters page. Once the cluster is active, you can start adding pods into your namespace.
+
+### Rancher Concepts
+
+Rancher supports grouping resources into multiples clusters, projects and namespaces.
+
+A **cluster** is a group of physical (or virtual) compute resources. Each project is tied to one cluster and runs its pods on the cluster's nodes. You can share a cluster with more than one project as well as give different users access to manage the various resources of a cluster.
+
+A **project** is a group of namespaces where workloads are defined. The pods in a project can communicate with each other over a shared managed network, and you can give different users access to manage the various resources of a project.
+<a id="catalog"></a>
+
+### Deploy an Application
+
+After your cluster is **Active**, you're ready to add applications to its **Default** project.
+
+A *project* is an object that fences in namespaces and workloads. We'll describe projects, namespaces, and workloads in more detail later.
+
+Out of the box, Rancher is bundled with a catalog of applications (i.e. a [Helm chart](https://helm.sh/)) that make their deployment easy. Choose an application from the catalog for deployment.
+
+1.  Click the link for the cluster that you just created.
+
+    ![click-cluster-name](../../../../img/rancher/click-cluster-name.png)
+
+2.  From the main menu of your cluster **Dashboard**, click **Projects**.
+
+    ![select-projects](../../../../img/rancher/select-projects.png)
+
+3.  Open the **Default** project. A default project is added to every cluster created.
+
+4.  From the main menu, click **Catalog Apps**.
+
+    ![select-catalog-apps](../../../../img/rancher/select-catalog-apps.png)
+
+5.  Click **+ Launch**.
+
+    **Step Result:** The **Catalog** displays the application templates that are available.
+
+6.  Choose an application to include in your project. Then click **View Details**.
+
+    ![choose-app](../../../../img/rancher/choose-app.gif)
+
+7.  Scroll to **New Application**. Click **Show advanced options**.
+
+8.  Click **Use an existing namespace**. Then select **default**.
+
+    ![select-default-namespace](../../../../img/rancher/select-default-namespace.gif)
+
+9. **Optional:** Choose other settings.
+
+    > **Note:** To review the `docker-compose.yml` and `rancher-compose.yml` files used to generate the stacks, click **Preview** before launching the stack.
+
+10. Skip the rest of the options for now. Click **Launch**.
+
+**Result**:
+
+-   The application is added to the project and deployed using a *workload*. A workload is an object that includes pods along with other files and info needed to deploy your application.
+-   When your workload completes deployment, it's assigned a state of **Active**. You can view this status from the project's **Workloads** page.
+
+### Using Kubeconfig File
+
+You can generate a Kubernetes configuration file to use `kubectl` on your desktop. A Kubernetes configuration file, i.e. *kubeconfig*, lets you configure access to one or more clusters from your desktop.  
+
+1. On the Rancher UI menu, select the cluster.
+2. In the **Dashboard**, click on the **Kubeconfig File** button. A *kubeconfig* file will be generated so you can use `kubectl` on your desktop. Copy and paste the code that displays into your `~/.kube/config` file, and then start using `kubectl`. Click **Close** to return to the Rancher UI.
+
+### Deploying on Ubuntu
+
+It is possible to use Rancher to control Canonical Kubernetes (cdk) clusters running on Ubuntu. A full set of instructions has been provided by Canonical for doing this here: [https://kubernetes.io/docs/getting-started-guides/ubuntu/rancher/](https://kubernetes.io/docs/getting-started-guides/ubuntu/rancher/).-->
+>>>>>>> more menu setup
diff --git a/content/rancher/tasks/_index.md b/content/rancher/tasks/_index.md
index afa71833e36..9c3d9303615 100644
--- a/content/rancher/tasks/_index.md
+++ b/content/rancher/tasks/_index.md
@@ -1,5 +1,6 @@
 ---
-  layout: single-docs
+  tag: ["rancher", "tasks"]
+
   title: Tasks
   weight: 3000
 ---
diff --git a/content/rancher/upgrades/_index.md b/content/rancher/upgrades/_index.md
index ca4e22c10f3..cc2e76ce228 100644
--- a/content/rancher/upgrades/_index.md
+++ b/content/rancher/upgrades/_index.md
@@ -1,5 +1,6 @@
 ---
-  layout: single-docs
+  tag: ["rancher", "upgrades"]
+
   title: Upgrade Scenarios
 weight: 1000
 ---
diff --git a/layouts/_default/backup-sngl.html b/layouts/_default/backup-sngl.html
new file mode 100644
index 00000000000..feb677c4750
--- /dev/null
+++ b/layouts/_default/backup-sngl.html
@@ -0,0 +1,37 @@
+{{ define "hero" }}
+  <section class="hero">
+    <div class="wrapper p-h-lg row center-xs">
+      <div class="col-md-8">
+        {{ with .Params.Title }}
+        <h1>{{ . }}</h1>
+      {{end}}
+
+      {{ with .Params.Author }}
+        <span class="byline bg-link">{{ . }}</span>
+      {{end}}
+    </div>
+    </div>
+  </section>
+{{ end }}
+
+{{ define "main" }}
+  <div class="wrapper">
+    <h1>default single template</h1>
+    {{ partial "breadcrumbs.html" . }}
+    <div class="row">
+      <article class="main-content col-sm-8 col-xs-12 p-r-lg">
+
+        {{ if .Params.Image }}
+          <img class="feat-img" src="{{ .Params.Image }}" alt="{{ .Params.Title }}">
+        {{end}}
+
+        {{ .Content }}
+
+      </article>
+
+      <aside class="col-sm-4 col-xs-12">
+        {{ partial "sidebar.html" . }}
+      </aside>
+    </div>
+  </div>
+{{ end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 66ef940cbf3..9ea877b7e6f 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -3,7 +3,6 @@
 {{ end }}
 
 {{ define "hero" }}
-<!-- theme/layouts/_default/list.html-->
 <section class="hero">
     {{ with .Params.Title }}
       <h1>{{ . }}</h1>
@@ -28,7 +27,7 @@
         {{ partial "docs-side-nav.html" . }}
        </div>
       </aside>
-      <article class="col-sm-8 col-xs-12 p-r-lg">
+      <article class="col-sm-8 col-xs-12 p-l-lg">
         <div class="main-content ">
 
       {{ .Content }}
@@ -67,10 +66,6 @@
                     {{end}}
                   {{end}}
 
-<!--                   {{ with .Params.Date }}
-                    <div class="p-h-sm p-v-xs"><i class="material-icons">event</i> By: {{ .Format "January 2, 2006" }}</div>
-                  {{end}} -->
-
                   {{ if eq .Section "blog" }}
                     <div class="p-h-sm p-v-xs"><i class="material-icons">timer</i> Read Time: {{.ReadingTime}} minutes</div>
                   {{end}}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index feb677c4750..348d5518b59 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,37 +1,85 @@
+{{ define "title" }}
+  {{ .Title }} – {{ .Site.Title }}
+{{ end }}
+
 {{ define "hero" }}
-  <section class="hero">
-    <div class="wrapper p-h-lg row center-xs">
-      <div class="col-md-8">
-        {{ with .Params.Title }}
-        <h1>{{ . }}</h1>
-      {{end}}
+<section class="hero">
+    {{ with .Params.Title }}
+      <h1>{{ . }}</h1>
+    {{end}}
+
+    {{ with .Params.Author }}
+      <span class="byline bg-link">{{ . }}</span>
+    {{end}}
+</section>
 
-      {{ with .Params.Author }}
-        <span class="byline bg-link">{{ . }}</span>
-      {{end}}
-    </div>
-    </div>
-  </section>
 {{ end }}
 
 {{ define "main" }}
   <div class="wrapper">
-    <h1>default single template</h1>
     {{ partial "breadcrumbs.html" . }}
-    <div class="row">
-      <article class="main-content col-sm-8 col-xs-12 p-r-lg">
-
-        {{ if .Params.Image }}
-          <img class="feat-img" src="{{ .Params.Image }}" alt="{{ .Params.Title }}">
-        {{end}}
-
-        {{ .Content }}
-
-      </article>
+    {{ partial "docs-nav.html" . }}
 
+    <div class="row m-t-sm">
       <aside class="col-sm-4 col-xs-12">
-        {{ partial "sidebar.html" . }}
+       <div class="bg-default p-a-sm">
+        {{ partial "docs-side-nav.html" . }}
+       </div>
       </aside>
+      <article class="col-sm-8 col-xs-12 p-l-lg">
+        <div class="main-content ">
+
+      {{ .Content }}
+        {{ range (.Paginator 5).Pages }}
+          <div class="box m-b-md">
+              <div class="p-a-sm">
+                <h3><a href="{{.URL}}">{{.Title}}</a></h3>
+
+                {{ if .Params.Image }}
+                  <div class="thumbnail"><img src="{{ .Params.Image }}" alt="{{ .Params.Title }}"></div>
+                {{end}}
+
+                <p>{{ .Summary | safeHTML }}</p>
+                {{ if .Truncated }}
+                <div>
+                  <a href="{{ .RelPermalink }}">Read More…</a>
+                </div>
+                {{ end }}
+              </div>
+              <div class="bg-default">
+                <div class="row">
+
+                  {{ with .Params.Author }}
+                    <div class="p-h-sm p-v-xs"><i class="material-icons">person_outline</i> By: {{ . }}</div>
+                  {{end}}
+
+                  {{ if eq .Section "events" }}
+                    {{ with .Params.EventDate }}
+                      <div class="p-h-sm p-v-xs"><i class="material-icons">event</i> {{ . }}</div>
+                    {{end}}
+
+                  {{ else }}
+
+                    {{ with .Params.Date }}
+                      <div class="p-h-sm p-v-xs"><i class="material-icons">event</i> {{ .Format "January 2, 2006" }}</div>
+                    {{end}}
+                  {{end}}
+
+                  {{ if eq .Section "blog" }}
+                    <div class="p-h-sm p-v-xs"><i class="material-icons">timer</i> Read Time: {{.ReadingTime}} minutes</div>
+                  {{end}}
+
+                  {{ with .Params.Location }}
+                    <div class="p-h-sm p-v-xs"><i class="material-icons">location_on</i> {{ . }}</div>
+                  {{end}}
+
+                </div>
+              </div>
+          </div>
+        {{ end }}
+      </div>
+        {{ template "_internal/pagination.html" . }}
+      </article>
     </div>
   </div>
 {{ end }}
diff --git a/layouts/partials/docs-nav.html b/layouts/partials/docs-nav.html
index 5af9f3e77f2..490a7b7148b 100644
--- a/layouts/partials/docs-nav.html
+++ b/layouts/partials/docs-nav.html
@@ -1,7 +1,41 @@
+{{ $.Scratch.Set "topLevel" . }}
+{{ $.Scratch.Set "secondLevel" . }}
+
 <nav>
-  <ul class="tabs">
-    {{ range .Sections }}
-      <li><a href="{{ .Permalink }}">{{ .Title }}</a></li>
+  <!-- tabs -->
+  <ul class="tabs row middle-xs">
+    <div class="pull-left m-v-sm">
+      <ul class="dropdown sub-menu unstyled">
+        <li>
+          <a href="{{ .URL }}" class="btn bg-link p-a-0">
+            <span class="p-h-xs">
+            {{ range .Site.Sections }}
+              {{ if .IsAncestor $.CurrentSection }}
+                {{ $.Scratch.Set "topLevel" . }}
+                {{ .Title }}
+              {{end}}
+            {{end}}
+            </span>
+            <i class="material-icons darken p-a-xs">keyboard_arrow_down</i>
+          </a>
+
+          <ul class="sub dropdown-menu bg-white unstyled">
+          {{ range .Site.Sections }}
+            <li><a href="{{ .Permalink }}">{{ .Title }}</a></li>
+          {{ end }}
+          </ul>
+        </li>
+      </ul>
+    </div>
+    {{ $topLevel := .Scratch.Get "topLevel"}}
+    {{ if $topLevel }}
+      {{ range $topLevel.Sections }}
+        {{ if .IsAncestor $.CurrentSection }}
+          {{ $.Scratch.Set "secondLevel" . }}
+        {{ end }}
+
+        <li><a href="{{ .Permalink }}" class="">{{ .Title }}</a></li>
+      {{ end }}
     {{ end }}
   </ul>
 </nav>
diff --git a/layouts/partials/docs-side-nav.html b/layouts/partials/docs-side-nav.html
index 9137c37608c..978c4438329 100644
--- a/layouts/partials/docs-side-nav.html
+++ b/layouts/partials/docs-side-nav.html
@@ -10,19 +10,20 @@
 {{ end }}
  -->
 <h3>{{ .Title }}</h3>
-{{ $home := .Site.Home }}
+
   <div class="tree-nav">
     <ul>
       <!-- <li><a href="{{ .RelPermalink}}">Home</a></li> -->
       <ul>
-      {{ template "section-tree-nav" $home }}
+        {{ template "section-tree-nav" ($.Scratch.Get "secondLevel") }}
+ }}
       </ul>
     </ul>
   </div>
   {{ define "section-tree-nav" }}
   {{ range .Sections}}
 <!--   <li> -->
-    <li class="bg-white"><a href="{{ .RelPermalink}}"><i class="material-icons bg-accent p-a-xs">folder</i>{{ .Title }}<i class="material-icons pull-right">keyboard_arrow_down</i></a>
+    <li class="bg-white"><a href="{{ .RelPermalink}}">{{ .Title }}<i class="material-icons pull-right">keyboard_arrow_down</i></a>
       <ul>
         {{ range .Pages }}
         <li class="bg-white"><a href="{{ .RelPermalink}}">{{ .Title }}</a></li>

From 8ff4ead6f8ee1b78c8f54de962061b772647a9fe Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Mon, 23 Apr 2018 17:11:02 -0700
Subject: [PATCH 2/4] remove tags and categories

---
 content/os/_index.md                                            | 2 --
 content/os/about/_index.md                                      | 2 --
 content/os/about/faqs/_index.md                                 | 2 --
 content/os/about/running-rancher-on-rancherOS/_index.md         | 2 --
 content/os/about/security/_index.md                             | 2 --
 content/os/installation/amazon-ecs/_index.md                    | 2 --
 .../boot-process/built-in-system-services/_index.md             | 2 --
 content/os/installation/boot-process/cloud-init/_index.md       | 2 --
 content/os/installation/boot-process/image-preloading/_index.md | 2 --
 content/os/installation/boot-process/logging/_index.md          | 2 --
 .../configuration/adding-kernel-parameters/_index.md            | 2 --
 content/os/installation/configuration/docker/_index.md          | 2 --
 content/os/installation/configuration/hostname/_index.md        | 2 --
 .../configuration/kernel-modules-kernel-headers/_index.md       | 2 --
 .../installation/configuration/loading-kernel-modules/_index.md | 2 --
 .../os/installation/configuration/private-registries/_index.md  | 2 --
 .../configuration/resizing-device-partition/_index.md           | 2 --
 .../os/installation/configuration/running-commands/_index.md    | 2 --
 .../installation/configuration/setting-up-docker-tls/_index.md  | 2 --
 content/os/installation/configuration/ssh-keys/_index.md        | 2 --
 .../os/installation/configuration/switching-consoles/_index.md  | 2 --
 .../configuration/switching-docker-versions/_index.md           | 2 --
 content/os/installation/configuration/sysctl/_index.md          | 2 --
 content/os/installation/configuration/users/_index.md           | 2 --
 content/os/installation/configuration/write-files/_index.md     | 2 --
 content/os/installation/custom-builds/custom-console/_index.md  | 2 --
 content/os/installation/custom-builds/custom-kernels/_index.md  | 2 --
 .../installation/custom-builds/custom-rancheros-iso/_index.md   | 2 --
 content/os/installation/networking/dns/_index.md                | 2 --
 content/os/installation/networking/interfaces/_index.md         | 2 --
 content/os/installation/networking/proxy-settings/_index.md     | 2 --
 content/os/installation/running-rancheros/_index.md             | 2 --
 content/os/installation/running-rancheros/cloud/aws/_index.md   | 2 --
 content/os/installation/running-rancheros/cloud/azure/_index.md | 2 --
 content/os/installation/running-rancheros/cloud/do/_index.md    | 2 --
 content/os/installation/running-rancheros/cloud/gce/_index.md   | 2 --
 .../os/installation/running-rancheros/cloud/openstack/_index.md | 2 --
 .../installation/running-rancheros/cloud/vmware-esxi/_index.md  | 2 --
 content/os/installation/running-rancheros/server/pxe/_index.md  | 2 --
 .../running-rancheros/server/raspberry-pi/_index.md             | 2 --
 .../running-rancheros/workstation/boot-from-iso/_index.md       | 2 --
 .../running-rancheros/workstation/docker-machine/_index.md      | 2 --
 content/os/installation/storage/additional-mounts/_index.md     | 2 --
 content/os/installation/storage/state-partition/_index.md       | 2 --
 content/os/installation/storage/using-zfs/_index.md             | 2 --
 .../system-services/adding-system-services/_index.md            | 2 --
 .../system-services/custom-system-services/_index.md            | 2 --
 content/os/installation/system-services/environment/_index.md   | 2 --
 .../system-services/system-docker-volumes/_index.md             | 2 --
 content/os/quick-start-guide/_index.md                          | 2 --
 content/os/upgrading/_index.md                                  | 2 --
 content/rancher/quick-start-guide/_index.md                     | 2 --
 52 files changed, 104 deletions(-)

diff --git a/content/os/_index.md b/content/os/_index.md
index 7a2a33860ff..676c702fffb 100644
--- a/content/os/_index.md
+++ b/content/os/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "overview"]
-category: ["os"]
 title: RancherOS Documentation
 description: RancherOS is a simplified Linux distribution built from containers, for containers. These documents describe how to install and use RancherOS.
 weight: 1
diff --git a/content/os/about/_index.md b/content/os/about/_index.md
index 5075ce1f199..e8a4c1ab93c 100644
--- a/content/os/about/_index.md
+++ b/content/os/about/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "faqs"]
-category: "os"
 title: About
 weight: 300
 ---
diff --git a/content/os/about/faqs/_index.md b/content/os/about/faqs/_index.md
index c8448ba2ed3..464cb407166 100644
--- a/content/os/about/faqs/_index.md
+++ b/content/os/about/faqs/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "faqs"]
-category: "os"
 title: FAQs
 weight: 301
 ---
diff --git a/content/os/about/running-rancher-on-rancherOS/_index.md b/content/os/about/running-rancher-on-rancherOS/_index.md
index 611fd67513a..b282bf20401 100644
--- a/content/os/about/running-rancher-on-rancherOS/_index.md
+++ b/content/os/about/running-rancher-on-rancherOS/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "rancher"]
-category: "os"
 title: Running Rancher on RancherOS
 weight: 302
 ---
diff --git a/content/os/about/security/_index.md b/content/os/about/security/_index.md
index b8981e5de81..29715d2f7a2 100644
--- a/content/os/about/security/_index.md
+++ b/content/os/about/security/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "security"]
-category: "os"
 title: RancherOS Security
 weight: 303
 ---
diff --git a/content/os/installation/amazon-ecs/_index.md b/content/os/installation/amazon-ecs/_index.md
index 735b8dc07de..76380add181 100644
--- a/content/os/installation/amazon-ecs/_index.md
+++ b/content/os/installation/amazon-ecs/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "custom", "console"]
-category: "os"
 title: Amazon ECS (EC2 Container Service)
 weight: 190
 ---
diff --git a/content/os/installation/boot-process/built-in-system-services/_index.md b/content/os/installation/boot-process/built-in-system-services/_index.md
index bdb7e8221dd..b7e21fb03c8 100644
--- a/content/os/installation/boot-process/built-in-system-services/_index.md
+++ b/content/os/installation/boot-process/built-in-system-services/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "system services"]
-category: "os"
 title: Built-in System Services
 weight: 150
 ---
diff --git a/content/os/installation/boot-process/cloud-init/_index.md b/content/os/installation/boot-process/cloud-init/_index.md
index 010ffb50a86..cb2ee66e398 100644
--- a/content/os/installation/boot-process/cloud-init/_index.md
+++ b/content/os/installation/boot-process/cloud-init/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "cloud-init"]
-category: "os"
 title: Cloud-Init
 weight: 151
 ---
diff --git a/content/os/installation/boot-process/image-preloading/_index.md b/content/os/installation/boot-process/image-preloading/_index.md
index 5f6b3fa3412..52196ea0605 100644
--- a/content/os/installation/boot-process/image-preloading/_index.md
+++ b/content/os/installation/boot-process/image-preloading/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os"]
-category: "os"
 title: Image Preloading
 weight: 152
 ---
diff --git a/content/os/installation/boot-process/logging/_index.md b/content/os/installation/boot-process/logging/_index.md
index 68d1a4d17ee..8ea2ce6214a 100644
--- a/content/os/installation/boot-process/logging/_index.md
+++ b/content/os/installation/boot-process/logging/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "logging"]
-category: "os"
 title: System Logging
 weight: 153
 ---
diff --git a/content/os/installation/configuration/adding-kernel-parameters/_index.md b/content/os/installation/configuration/adding-kernel-parameters/_index.md
index 88f69f899fa..d6688509040 100644
--- a/content/os/installation/configuration/adding-kernel-parameters/_index.md
+++ b/content/os/installation/configuration/adding-kernel-parameters/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os"]
-category: "os"
 title: Adding Kernel Parameters
 weight: 133
 ---
diff --git a/content/os/installation/configuration/docker/_index.md b/content/os/installation/configuration/docker/_index.md
index 3c18d461baa..0c87b4c4d53 100644
--- a/content/os/installation/configuration/docker/_index.md
+++ b/content/os/installation/configuration/docker/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "docker", "system docker"]
-category: "os"
 title: Configuring Docker or System Docker
 weight: 126
 ---
diff --git a/content/os/installation/configuration/hostname/_index.md b/content/os/installation/configuration/hostname/_index.md
index fa1bd3fb8b7..8df3bc82abb 100644
--- a/content/os/installation/configuration/hostname/_index.md
+++ b/content/os/installation/configuration/hostname/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os"]
-category: "os"
 title: Setting the Hostname
 weight: 124
 ---
diff --git a/content/os/installation/configuration/kernel-modules-kernel-headers/_index.md b/content/os/installation/configuration/kernel-modules-kernel-headers/_index.md
index dc2baf4e12b..9bdb547cc99 100644
--- a/content/os/installation/configuration/kernel-modules-kernel-headers/_index.md
+++ b/content/os/installation/configuration/kernel-modules-kernel-headers/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os"]
-category: "os"
 title: Installing Kernel Modules with Kernel Headers
 weight: 135
 ---
diff --git a/content/os/installation/configuration/loading-kernel-modules/_index.md b/content/os/installation/configuration/loading-kernel-modules/_index.md
index 73c51cd4741..03934c82a90 100644
--- a/content/os/installation/configuration/loading-kernel-modules/_index.md
+++ b/content/os/installation/configuration/loading-kernel-modules/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os"]
-category: "os"
 title: Loading Extra Kernel Modules
 weight: 134
 ---
diff --git a/content/os/installation/configuration/private-registries/_index.md b/content/os/installation/configuration/private-registries/_index.md
index 5ecd3894543..9c3e80635a5 100644
--- a/content/os/installation/configuration/private-registries/_index.md
+++ b/content/os/installation/configuration/private-registries/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os"]
-category: "os"
 title: Private Registries
 weight: 128
 ---
diff --git a/content/os/installation/configuration/resizing-device-partition/_index.md b/content/os/installation/configuration/resizing-device-partition/_index.md
index 6d837467112..f88c2d71a21 100644
--- a/content/os/installation/configuration/resizing-device-partition/_index.md
+++ b/content/os/installation/configuration/resizing-device-partition/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os"]
-category: "os"
 title: Resizing a Device Partition
 weight: 131
 ---
diff --git a/content/os/installation/configuration/running-commands/_index.md b/content/os/installation/configuration/running-commands/_index.md
index 32c034c37ed..5d63462fe77 100644
--- a/content/os/installation/configuration/running-commands/_index.md
+++ b/content/os/installation/configuration/running-commands/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "commands"]
-category: "os"
 title: Running Commands
 weight: 123
 ---
diff --git a/content/os/installation/configuration/setting-up-docker-tls/_index.md b/content/os/installation/configuration/setting-up-docker-tls/_index.md
index e17a3284c4a..cbde124cb0e 100644
--- a/content/os/installation/configuration/setting-up-docker-tls/_index.md
+++ b/content/os/installation/configuration/setting-up-docker-tls/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "docker", "tls"]
-category: "os"
 title: Setting up Docker TLS
 weight: 127
 ---
diff --git a/content/os/installation/configuration/ssh-keys/_index.md b/content/os/installation/configuration/ssh-keys/_index.md
index a53a3179560..5942e5e5d05 100644
--- a/content/os/installation/configuration/ssh-keys/_index.md
+++ b/content/os/installation/configuration/ssh-keys/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "ssh"]
-category: "os"
 title: SSH Keys
 weight: 121
 ---
diff --git a/content/os/installation/configuration/switching-consoles/_index.md b/content/os/installation/configuration/switching-consoles/_index.md
index 031359f4cca..e149112c0fb 100644
--- a/content/os/installation/configuration/switching-consoles/_index.md
+++ b/content/os/installation/configuration/switching-consoles/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "consoles"]
-category: "os"
 title: Switching Consoles
 weight: 125
 ---
diff --git a/content/os/installation/configuration/switching-docker-versions/_index.md b/content/os/installation/configuration/switching-docker-versions/_index.md
index b29a5c3f175..8f6713ad42a 100644
--- a/content/os/installation/configuration/switching-docker-versions/_index.md
+++ b/content/os/installation/configuration/switching-docker-versions/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "docker"]
-category: "os"
 title: Switching Docker Versions
 weight: 129
 ---
diff --git a/content/os/installation/configuration/sysctl/_index.md b/content/os/installation/configuration/sysctl/_index.md
index 4a92bb01f05..d0b6ac87e42 100644
--- a/content/os/installation/configuration/sysctl/_index.md
+++ b/content/os/installation/configuration/sysctl/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os"]
-category: "os"
 title: sysctl Settings
 weight: 132
 ---
diff --git a/content/os/installation/configuration/users/_index.md b/content/os/installation/configuration/users/_index.md
index b0b3d692c41..6986127f488 100644
--- a/content/os/installation/configuration/users/_index.md
+++ b/content/os/installation/configuration/users/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os"]
-category: "os"
 title: Users
 weight: 130
 ---
diff --git a/content/os/installation/configuration/write-files/_index.md b/content/os/installation/configuration/write-files/_index.md
index 25d5b605181..949b454369f 100644
--- a/content/os/installation/configuration/write-files/_index.md
+++ b/content/os/installation/configuration/write-files/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os"]
-category: "os"
 title: Writing Files
 weight: 122
 ---
diff --git a/content/os/installation/custom-builds/custom-console/_index.md b/content/os/installation/custom-builds/custom-console/_index.md
index 4574eff915e..bfc2384b953 100644
--- a/content/os/installation/custom-builds/custom-console/_index.md
+++ b/content/os/installation/custom-builds/custom-console/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "custom", "console"]
-category: "os"
 title: Custom Console
 weight: 180
 ---
diff --git a/content/os/installation/custom-builds/custom-kernels/_index.md b/content/os/installation/custom-builds/custom-kernels/_index.md
index 763afa92c08..a42f94ce1ad 100644
--- a/content/os/installation/custom-builds/custom-kernels/_index.md
+++ b/content/os/installation/custom-builds/custom-kernels/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "custom", "kernels"]
-category: "os"
 title: Custom Kernels
 weight: 181
 ---
diff --git a/content/os/installation/custom-builds/custom-rancheros-iso/_index.md b/content/os/installation/custom-builds/custom-rancheros-iso/_index.md
index 8e2ee418046..aa57b54a433 100644
--- a/content/os/installation/custom-builds/custom-rancheros-iso/_index.md
+++ b/content/os/installation/custom-builds/custom-rancheros-iso/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "custom", "iso"]
-category: "os"
 title: Custom RancherOS ISO
 weight: 182
 ---
diff --git a/content/os/installation/networking/dns/_index.md b/content/os/installation/networking/dns/_index.md
index 341926f8f1c..69be9e3ae03 100644
--- a/content/os/installation/networking/dns/_index.md
+++ b/content/os/installation/networking/dns/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "networking", "dns"]
-category: "os"
 title: Configuring DNS
 weight: 171
 ---
diff --git a/content/os/installation/networking/interfaces/_index.md b/content/os/installation/networking/interfaces/_index.md
index d16b0838bca..1d677c24685 100644
--- a/content/os/installation/networking/interfaces/_index.md
+++ b/content/os/installation/networking/interfaces/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "networking", "interfaces"]
-category: "os"
 title: Configuring Network Interfaces
 weight: 170
 ---
diff --git a/content/os/installation/networking/proxy-settings/_index.md b/content/os/installation/networking/proxy-settings/_index.md
index 80f5dc4516d..36363515913 100644
--- a/content/os/installation/networking/proxy-settings/_index.md
+++ b/content/os/installation/networking/proxy-settings/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "proxy"]
-category: "os"
 title: Configuring Proxy Settings
 weight: 172
 ---
diff --git a/content/os/installation/running-rancheros/_index.md b/content/os/installation/running-rancheros/_index.md
index 3b6722bb300..1a251346432 100644
--- a/content/os/installation/running-rancheros/_index.md
+++ b/content/os/installation/running-rancheros/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "installation"]
-category: "os"
 title: Running RancherOS
 weight: 100
 ---
diff --git a/content/os/installation/running-rancheros/cloud/aws/_index.md b/content/os/installation/running-rancheros/cloud/aws/_index.md
index d2430f53da4..0e962c83046 100644
--- a/content/os/installation/running-rancheros/cloud/aws/_index.md
+++ b/content/os/installation/running-rancheros/cloud/aws/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "amazon", "ec2"]
-category: "os"
 title: Amazon EC2
 weight: 105
 ---
diff --git a/content/os/installation/running-rancheros/cloud/azure/_index.md b/content/os/installation/running-rancheros/cloud/azure/_index.md
index 013749505cb..f8e02eceb35 100644
--- a/content/os/installation/running-rancheros/cloud/azure/_index.md
+++ b/content/os/installation/running-rancheros/cloud/azure/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "azure"]
-category: "os"
 title: Azure
 weight: 110
 ---
diff --git a/content/os/installation/running-rancheros/cloud/do/_index.md b/content/os/installation/running-rancheros/cloud/do/_index.md
index 0c6e5460f25..8157d41df50 100644
--- a/content/os/installation/running-rancheros/cloud/do/_index.md
+++ b/content/os/installation/running-rancheros/cloud/do/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "digitalocean"]
-category: "os"
 title: Digital Ocean
 weight: 107
 ---
diff --git a/content/os/installation/running-rancheros/cloud/gce/_index.md b/content/os/installation/running-rancheros/cloud/gce/_index.md
index 57c8aa20440..7f4cd39d613 100644
--- a/content/os/installation/running-rancheros/cloud/gce/_index.md
+++ b/content/os/installation/running-rancheros/cloud/gce/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "gce"]
-category: "os"
 title: Google Cloud Engine (GCE)
 weight: 106
 ---
diff --git a/content/os/installation/running-rancheros/cloud/openstack/_index.md b/content/os/installation/running-rancheros/cloud/openstack/_index.md
index e757876efa4..5dccc2bdca3 100644
--- a/content/os/installation/running-rancheros/cloud/openstack/_index.md
+++ b/content/os/installation/running-rancheros/cloud/openstack/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "openstack"]
-category: "os"
 title: OpenStack
 weight: 109
 
diff --git a/content/os/installation/running-rancheros/cloud/vmware-esxi/_index.md b/content/os/installation/running-rancheros/cloud/vmware-esxi/_index.md
index 347def4fbcd..3801f08148b 100644
--- a/content/os/installation/running-rancheros/cloud/vmware-esxi/_index.md
+++ b/content/os/installation/running-rancheros/cloud/vmware-esxi/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "vmware", "esxi"]
-category: "os"
 title: VMware ESXi
 weight: 108
 ---
diff --git a/content/os/installation/running-rancheros/server/pxe/_index.md b/content/os/installation/running-rancheros/server/pxe/_index.md
index 988c6b6cb49..1c705bc8283 100644
--- a/content/os/installation/running-rancheros/server/pxe/_index.md
+++ b/content/os/installation/running-rancheros/server/pxe/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "pxe", "ipxe"]
-category: "os"
 title: iPXE
 weight: 112
 ---
diff --git a/content/os/installation/running-rancheros/server/raspberry-pi/_index.md b/content/os/installation/running-rancheros/server/raspberry-pi/_index.md
index 6bf968a56b5..341d2af3e9b 100644
--- a/content/os/installation/running-rancheros/server/raspberry-pi/_index.md
+++ b/content/os/installation/running-rancheros/server/raspberry-pi/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "raspberry pi"]
-category: "os"
 title: Raspberry Pi
 weight: 113
 ---
diff --git a/content/os/installation/running-rancheros/workstation/boot-from-iso/_index.md b/content/os/installation/running-rancheros/workstation/boot-from-iso/_index.md
index 2b5b4c13eee..d9f7411ca42 100644
--- a/content/os/installation/running-rancheros/workstation/boot-from-iso/_index.md
+++ b/content/os/installation/running-rancheros/workstation/boot-from-iso/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "iso"]
-category: "os"
 title: Booting from ISO
 weight: 102
 ---
diff --git a/content/os/installation/running-rancheros/workstation/docker-machine/_index.md b/content/os/installation/running-rancheros/workstation/docker-machine/_index.md
index 5e8494269ed..6c06c72d07a 100644
--- a/content/os/installation/running-rancheros/workstation/docker-machine/_index.md
+++ b/content/os/installation/running-rancheros/workstation/docker-machine/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "docker machine"]
-category: "os"
 title: Using Docker Machine
 weight: 101
 ---
diff --git a/content/os/installation/storage/additional-mounts/_index.md b/content/os/installation/storage/additional-mounts/_index.md
index 27340c1ccd7..3cbc3e7e2c3 100644
--- a/content/os/installation/storage/additional-mounts/_index.md
+++ b/content/os/installation/storage/additional-mounts/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "mounts"]
-category: "os"
 title: Additional Mounts
 weight: 161
 ---
diff --git a/content/os/installation/storage/state-partition/_index.md b/content/os/installation/storage/state-partition/_index.md
index e97ae485a4a..ffa1d3ffb9c 100644
--- a/content/os/installation/storage/state-partition/_index.md
+++ b/content/os/installation/storage/state-partition/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os"]
-category: "os"
 title: Persistent State Partition
 weight: 160
 ---
diff --git a/content/os/installation/storage/using-zfs/_index.md b/content/os/installation/storage/using-zfs/_index.md
index 43c333b8264..56090b7cc0c 100644
--- a/content/os/installation/storage/using-zfs/_index.md
+++ b/content/os/installation/storage/using-zfs/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "zfs"]
-category: "os"
 title: Using ZFS
 weight: 162
 ---
diff --git a/content/os/installation/system-services/adding-system-services/_index.md b/content/os/installation/system-services/adding-system-services/_index.md
index cd0b6359dcc..d4a2dc751c7 100644
--- a/content/os/installation/system-services/adding-system-services/_index.md
+++ b/content/os/installation/system-services/adding-system-services/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "system services"]
-category: "os"
 title: System Services
 weight: 140
 ---
diff --git a/content/os/installation/system-services/custom-system-services/_index.md b/content/os/installation/system-services/custom-system-services/_index.md
index 72d53a61277..ccb68990fc9 100644
--- a/content/os/installation/system-services/custom-system-services/_index.md
+++ b/content/os/installation/system-services/custom-system-services/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "system services"]
-category: "os"
 title: Custom System Services
 weight: 141
 ---
diff --git a/content/os/installation/system-services/environment/_index.md b/content/os/installation/system-services/environment/_index.md
index 3fbe80f00ae..7d8a40d0edf 100644
--- a/content/os/installation/system-services/environment/_index.md
+++ b/content/os/installation/system-services/environment/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "system services",  "environment"]
-category: "os"
 title: Environment
 weight: 143
 ---
diff --git a/content/os/installation/system-services/system-docker-volumes/_index.md b/content/os/installation/system-services/system-docker-volumes/_index.md
index d90fb876e45..a4bf35c47d7 100644
--- a/content/os/installation/system-services/system-docker-volumes/_index.md
+++ b/content/os/installation/system-services/system-docker-volumes/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "system services"]
-category: "os"
 title: System Docker Volumes
 weight: 142
 ---
diff --git a/content/os/quick-start-guide/_index.md b/content/os/quick-start-guide/_index.md
index c20ff11883a..f9af6c658f8 100644
--- a/content/os/quick-start-guide/_index.md
+++ b/content/os/quick-start-guide/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "quick-start-guide"]
-category: "os"
 title: Quick Start Guide
 weight: 2
 ---
diff --git a/content/os/upgrading/_index.md b/content/os/upgrading/_index.md
index af46244d1db..0043d3da6dd 100644
--- a/content/os/upgrading/_index.md
+++ b/content/os/upgrading/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancheros", "os", "upgrade"]
-category: "os"
 title: Upgrading RancherOS
 weight: 200
 ---
diff --git a/content/rancher/quick-start-guide/_index.md b/content/rancher/quick-start-guide/_index.md
index 3923fea4b33..4c5e437ea34 100644
--- a/content/rancher/quick-start-guide/_index.md
+++ b/content/rancher/quick-start-guide/_index.md
@@ -1,6 +1,4 @@
 ---
-tag: ["rancher", "quick start"]
-category: "rancher"
 title: Quick Start Guide
 weight: 25
 chapter: true

From 9490d02602c76611fa11cb7385a542cbfe2457e3 Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Mon, 23 Apr 2018 17:24:58 -0700
Subject: [PATCH 3/4] remaining tags

---
 content/_index.md                      | 3 ---
 content/rancher/_index.md              | 2 --
 content/rancher/concepts/_index.md     | 2 --
 content/rancher/installation/_index.md | 2 --
 content/rancher/tasks/_index.md        | 2 --
 content/rancher/upgrades/_index.md     | 4 +---
 6 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/content/_index.md b/content/_index.md
index ae0027cba13..3b87e52ad8b 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -1,7 +1,4 @@
 ---
-  tag: ["tag1", "tag2", "tag3"]
-  category: "category"
-
   title: homepage
   weight: 4
 ---
diff --git a/content/rancher/_index.md b/content/rancher/_index.md
index 3859fc44b69..4e8e7364c22 100644
--- a/content/rancher/_index.md
+++ b/content/rancher/_index.md
@@ -1,6 +1,4 @@
 ---
-  tag: ["rancher", "overview"]
-
   title: Rancher 2.0 Documentation
   weight: 1
 ---
diff --git a/content/rancher/concepts/_index.md b/content/rancher/concepts/_index.md
index e3d0d2a4b61..f478862230e 100644
--- a/content/rancher/concepts/_index.md
+++ b/content/rancher/concepts/_index.md
@@ -1,6 +1,4 @@
 ---
-  tag: ["rancher", "concepts"]
-
   title: Rancher Overview
   weight: 2000
 ---
diff --git a/content/rancher/installation/_index.md b/content/rancher/installation/_index.md
index 2b7df3f8999..550519fdf9b 100644
--- a/content/rancher/installation/_index.md
+++ b/content/rancher/installation/_index.md
@@ -1,6 +1,4 @@
 ---
-  tag: ["rancher", "installation"]
-
   title: Installation
   weight: 100
 ---
diff --git a/content/rancher/tasks/_index.md b/content/rancher/tasks/_index.md
index 9c3d9303615..5e095132763 100644
--- a/content/rancher/tasks/_index.md
+++ b/content/rancher/tasks/_index.md
@@ -1,6 +1,4 @@
 ---
-  tag: ["rancher", "tasks"]
-
   title: Tasks
   weight: 3000
 ---
diff --git a/content/rancher/upgrades/_index.md b/content/rancher/upgrades/_index.md
index cc2e76ce228..4fc085f989b 100644
--- a/content/rancher/upgrades/_index.md
+++ b/content/rancher/upgrades/_index.md
@@ -1,7 +1,5 @@
 ---
-  tag: ["rancher", "upgrades"]
-
-  title: Upgrade Scenarios
+title: Upgrade Scenarios
 weight: 1000
 ---
 

From 1483bf129da7b4a3b24a6cfe84db4be05c6a9ad7 Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Tue, 24 Apr 2018 11:16:23 -0700
Subject: [PATCH 4/4] gce fix

---
 .../running-rancheros/cloud/gce/_index.md     | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/content/os/installation/running-rancheros/cloud/gce/_index.md b/content/os/installation/running-rancheros/cloud/gce/_index.md
index 7f4cd39d613..bd235740c21 100644
--- a/content/os/installation/running-rancheros/cloud/gce/_index.md
+++ b/content/os/installation/running-rancheros/cloud/gce/_index.md
@@ -1,4 +1,5 @@
 ---
+layout: list-docs
 title: Google Cloud Engine (GCE)
 weight: 106
 ---
@@ -13,8 +14,11 @@ weight: 106
 RancherOS is available as an image in GCE, and can be easily run in Google Compute Engine (GCE).  Let’s walk through how to upload GCE image.
 
 1. Download the most recent RancherOS image. The image can be found in the [release artifacts](https://github.com/rancher/os/releases). It is a `.tar.gz` file.
+
 2. Follow Google's instructions on how to [upload the image](https://cloud.google.com/compute/docs/tutorials/building-images#publishingimage). The image must be uploaded into a Google Cloud Storage bucket before it can be added to a project.
+
 3. Follow Google's instructions on how to [import a RAW image](https://cloud.google.com/compute/docs/images/import-existing-image#use_saved_image).
+
 4. Once the image is added to your Google Compute Engine, we can start creating new instances!
 
 ### Launching RancherOS using `gcloud compute`
@@ -77,12 +81,18 @@ Updated [https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/ZONE_OF
 After the image is uploaded, it's easy to use the console to create new instances. You will **not** be able to upload your own cloud config file when creating instances through the console. You can add it after the instance is created using `gcloud compute` commands and resetting the instance.
 
 1. Make sure you are in the project that the image was created in.
-![RancherOS on GCE 4]({{< baseurl >}}/img/os/Rancher_gce4.png)
+
+    ![RancherOS on GCE 4]({{< baseurl >}}/img/os/Rancher_gce4.png)
+
 2. In the navigation bar, click on the **VM instances**, which is located at Compute -> Compute Engine -> Metadata.  Click on **Create instance**.
-![RancherOS on GCE 5]({{< baseurl >}}/img/os/Rancher_gce5.png)
-3.  Fill out the information for your instance. In the **Image** dropdown, your private image will be listed among the public images provided by Google. Select the private image for RancherOS. Click **Create**.
-![RancherOS on GCE 6]({{< baseurl >}}/img/os/Rancher_gce6.png)
-4. Your instance is being created and will be up and running shortly!
+
+    ![RancherOS on GCE 5]({{< baseurl >}}/img/os/Rancher_gce5.png)
+
+2.  Fill out the information for your instance. In the **Image** dropdown, your private image will be listed among the public images provided by Google. Select the private image for RancherOS. Click **Create**.
+
+    ![RancherOS on GCE 6]({{< baseurl >}}/img/os/Rancher_gce6.png)
+
+3. Your instance is being created and will be up and running shortly!
 
 #### Adding SSH keys