diff --git a/config.toml b/config.toml
index b12d799c62a..f08e4347ca1 100644
--- a/config.toml
+++ b/config.toml
@@ -15,7 +15,7 @@ enableRobotsTXT = true
 identifier = "what-is-rancher"
 name       = "What is Rancher"
 weight     = "1"
-pre        = "<i class='material-icons'>keyboard_arrow_down</i>"
+pre        = "<i class=\"material-icons\">keyboard_arrow_down</i>"
 
   [[menu.main]]
   name       = "Overview"
@@ -77,7 +77,7 @@ pre        = "<i class='material-icons'>keyboard_arrow_down</i>"
 identifier = "products"
 name       = "Products"
 weight     = "2"
-pre        = "<i class='material-icons'>keyboard_arrow_down</i>"
+pre        = "<i class=\"material-icons\">keyboard_arrow_down</i>"
 
   [[menu.main]]
   name       = "Rancher"
@@ -100,7 +100,7 @@ pre        = "<i class='material-icons'>keyboard_arrow_down</i>"
 identifier = "learn"
 name       = "Learn"
 weight     = "4"
-pre        = "<i class='material-icons'>keyboard_arrow_down</i>"
+pre        = "<i class=\"material-icons\">keyboard_arrow_down</i>"
 
   [[menu.main]]
   name       = "Blog"
@@ -127,7 +127,7 @@ pre        = "<i class='material-icons'>keyboard_arrow_down</i>"
   name       = "Forums"
   url        = "https://forums.rancher.com/"
   parent     = "learn"
-  pre        = "<i class='material-icons'>launch</i>"
+  pre        = "<i class=\"material-icons\">launch</i>"
 
   [[menu.main]]
   #name       = "Learning Resources"
@@ -141,7 +141,7 @@ identifier = "about"
 name       = "About"
 url        = "/about/"
 weight     = "5"
-pre        = "<i class='material-icons'>keyboard_arrow_down</i>"
+pre        = "<i class=\"material-icons\">keyboard_arrow_down</i>"
 
   [[menu.main]]
   name       = "About Us"
@@ -175,24 +175,24 @@ pre        = "<i class='material-icons'>keyboard_arrow_down</i>"
 #footer menu#
 [[menu.footer]]
 identifier = "about"
-pre = "<i class='material-icons'>info_outline</i>"
+pre = "<i class=\"material-icons\">info_outline</i>"
 name       = "About"
 url        = "/about/"
 
 [[menu.footer]]
 identifier = "contact"
-pre = "<i class='material-icons'>chat_bubble_outline</i>"
+pre = "<i class=\"material-icons\">chat_bubble_outline</i>"
 name       = "Contact"
 url        = "/contact/"
 
 [[menu.footer]]
 identifier = "privacy"
-pre = "<i class='material-icons'>fingerprint</i>"
+pre = "<i class=\"material-icons\">fingerprint</i>"
 name       = "Privacy"
 url        = "/privacy/"
 
 [[menu.footer]]
 identifier = "careers"
-pre = "<i class='material-icons'>people_outline</i>"
+pre = "<i class=\"material-icons\">people_outline</i>"
 name       = "Careers"
 url        = "/careers/"
diff --git a/content/os/upgrading/_index.md b/content/os/upgrading/_index.md
index b4c2c3761fc..d86746006a6 100644
--- a/content/os/upgrading/_index.md
+++ b/content/os/upgrading/_index.md
@@ -1,5 +1,5 @@
 ---
-title: Upgrading RancherOS
+title: Upgrading
 weight: 3
 ---
 
diff --git a/content/rancher/installation/load-balancing-config/_index.md b/content/rancher/installation/load-balancing-config/_index.md
index ef57a31c7e8..12653019dc2 100644
--- a/content/rancher/installation/load-balancing-config/_index.md
+++ b/content/rancher/installation/load-balancing-config/_index.md
@@ -1,5 +1,5 @@
 ---
-title: Load Balancer Configuration
+title: Load Balancing
 weight: 300
 ---
 
diff --git a/content/rancher/installation/load-balancing-config/configuring-amazon-alb.md b/content/rancher/installation/load-balancing-config/config-amazon-alb/_index.md
similarity index 99%
rename from content/rancher/installation/load-balancing-config/configuring-amazon-alb.md
rename to content/rancher/installation/load-balancing-config/config-amazon-alb/_index.md
index 2977a890d95..f29e064fa9d 100644
--- a/content/rancher/installation/load-balancing-config/configuring-amazon-alb.md
+++ b/content/rancher/installation/load-balancing-config/config-amazon-alb/_index.md
@@ -1,8 +1,8 @@
 ---
-title: Option 1—Amazon ALB
+title: Configure Amazon ALB
 weight: 305
 ---
-# Option 1-Amazon ALB
+# Configure Amazon ALB
 
 Amazon Elastic Load Balancing offers a couple of different load balancers that we're tested. This procedure provides step-by-step instruction for configuring Amazon Application Load Balancer (ALB) with your Rancher Server.
 
diff --git a/content/rancher/installation/load-balancing-config/configuring-amazon-nlb.md b/content/rancher/installation/load-balancing-config/config-amazon-nlb/_index.md
similarity index 98%
rename from content/rancher/installation/load-balancing-config/configuring-amazon-nlb.md
rename to content/rancher/installation/load-balancing-config/config-amazon-nlb/_index.md
index 86656787e88..a85dceabd4d 100644
--- a/content/rancher/installation/load-balancing-config/configuring-amazon-nlb.md
+++ b/content/rancher/installation/load-balancing-config/config-amazon-nlb/_index.md
@@ -1,8 +1,8 @@
 ---
-title: Option 2—Amazon NLB
+title: Configure Amazon NLB
 weight: 310
 ---
-# Option 2-Amazon NLB
+# Configure Amazon NLB
 
 Amazon Elastic Load Balancing offers a couple of different load balancers that we're tested. This procedure provides step-by-step instruction for configuring Amazon Network Load Balancer (NLB) with your Rancher Server.
 
diff --git a/content/rancher/installation/load-balancing-config/configuring-nginx.md b/content/rancher/installation/load-balancing-config/config-nginx/_index.md
similarity index 98%
rename from content/rancher/installation/load-balancing-config/configuring-nginx.md
rename to content/rancher/installation/load-balancing-config/config-nginx/_index.md
index d1eec663b39..bb397eb43f3 100644
--- a/content/rancher/installation/load-balancing-config/configuring-nginx.md
+++ b/content/rancher/installation/load-balancing-config/config-nginx/_index.md
@@ -1,8 +1,8 @@
 ---
-title: Option 3—NGINX
+title: Configure NGINX
 weight: 315
 ---
-# Option 3-NGINX
+# Configure NGINX
 
 NGINX is a popular application platform that can be used as a load balancer. Rancher supports use of NGINX with ngx_http_v2_module enabled, which isn't enabled by default. Use the following parameter when setting up NGINX to enable the module: `--with-http_v2_module`.
 
diff --git a/content/rancher/installation/no-internet-installation/_index.md b/content/rancher/installation/no-internet-installation/_index.md
index 9e1388d5881..364eb3ad729 100644
--- a/content/rancher/installation/no-internet-installation/_index.md
+++ b/content/rancher/installation/no-internet-installation/_index.md
@@ -1,8 +1,21 @@
 ---
-title: No-Internet Installation
+title: Installing From a Private Registry
 weight: 350
 draft: true
 ---
-# No-Internet Installation
+# Installing From a Private Registry
 
-Coming Soon!
+If you have a private registry, you can move Rancher into that registry and install it from there.
+
+>**Prerequisite:** It is assumed you either have your own private registry or other means of distributing docker images to your machine. If you need help with creating a private registry, please refer to the [Docker documentation for private registries](https://docs.docker.com/registry/).
+
+
+1. Browse to https://github.com/rancher/rancher/releases/tag/v2.0.0-beta4-rc2 and download all files in the release.
+
+2. Run rancher-save-images.sh in an environment that has access to dockerhub. This script will download all images into a file rancher-images.tar.gz.
+
+3. Copy file to private network (it's a big file).
+
+4. Run rancher-load-images.sh in the same directory as rancher-images.tar.gz to load the archive into private registry.
+
+5. Change /v3/settings/system-default-registry to your private registry. The setting will be added to the UI, not currently there though.
diff --git a/content/rancher/installation/server-installation/_index.md b/content/rancher/installation/server-installation/_index.md
index 415e7ecc604..8d70448cf04 100644
--- a/content/rancher/installation/server-installation/_index.md
+++ b/content/rancher/installation/server-installation/_index.md
@@ -1,5 +1,5 @@
 ---
-title: Server Installation
+title: Rancher Server Installation
 weight: 225
 ---
 
@@ -8,3 +8,6 @@ weight: 225
 This section contains instructions for setting up Rancher Server in development and production environments. The section also contains supplementary documentation for configuring load balancers and SSL certificates to work with Rancher.
 
 Choose from the options below:
+
+- [Install Using Docker](/rancher/installation/server-installation/install-using-docker/)
+- [Install Using Kubernettes](/rancher/installation/server-installation/install-using-kubernetes/)
diff --git a/content/rancher/installation/server-installation/container-install.md b/content/rancher/installation/server-installation/install-using-docker/_index.md
similarity index 94%
rename from content/rancher/installation/server-installation/container-install.md
rename to content/rancher/installation/server-installation/install-using-docker/_index.md
index 4d12e370e63..89364f378bc 100644
--- a/content/rancher/installation/server-installation/container-install.md
+++ b/content/rancher/installation/server-installation/install-using-docker/_index.md
@@ -1,10 +1,10 @@
 ---
-title: Option 1—Install by Docker Container
+title: Install Using Docker
 weight: 250
 description: For development environments, we recommend installing Rancher by deploying a single Docker container.
 ---
 
-# Install by Docker Container
+# Install by Docker
 
 For development environments, we recommend installing Rancher by deploying a single Docker container. In this installation scenario, you'll install Docker on a single Linux host, and then install Rancher on your host using a single Docker container.
 
diff --git a/content/rancher/installation/server-installation/rke-install.md b/content/rancher/installation/server-installation/install-using-kubernetes/_index.md
similarity index 99%
rename from content/rancher/installation/server-installation/rke-install.md
rename to content/rancher/installation/server-installation/install-using-kubernetes/_index.md
index 8a3220daa20..3940f0171cb 100644
--- a/content/rancher/installation/server-installation/rke-install.md
+++ b/content/rancher/installation/server-installation/install-using-kubernetes/_index.md
@@ -1,8 +1,8 @@
 ---
-title: Option 2—Install by RKE
+title: Install Using Kubernetes
 weight: 275
 ---
-# Install by RKE
+# Install Using Kubernetes
 
 You can deploy Rancher using the Rancher Kubernetes Engine (RKE). RKE is Rancher's own fast and light-weight Kubernetes installer. Rancher installation using RKE is the best install option for two different use cases:
 
diff --git a/content/rancher/installation/ssl-config/_index.md b/content/rancher/installation/ssl-config/_index.md
index bb53b3c2b58..a9533619802 100644
--- a/content/rancher/installation/ssl-config/_index.md
+++ b/content/rancher/installation/ssl-config/_index.md
@@ -11,19 +11,19 @@ Rancher is secure by default. This means that SSL is required when interacting w
 
 There are two places where you certificates can be stored and used:
 
-- Inside the `rancher/server` container
+- Inside the `rancher/rancher` container
 - Using an external loadbalancer or proxy
 
-## Options for inside the `rancher/server` container
+## Options for inside the `rancher/rancher` container
 
 ### Automatically generated default self signed certificate
 
-By running the `rancher/server` container without any additional parameters or configuration, a self-signed certificate will automatically be created on startup.
+By running the `rancher/rancher` container without any additional parameters or configuration, a self-signed certificate will automatically be created on startup.
 
 <u>Example command:</u>
 
 ```
-docker run -d -p 80:80 -p 443:443 rancher/server:v2.0.0
+docker run -d -p 80:80 -p 443:443 rancher/rancher:v2.0.0
 ```
 
 ### Providing your own self-signed certificates to the container
@@ -43,7 +43,7 @@ docker run -d -p 80:80 -p 443:443 \
   -v /etc/your_certificate_directory/fullchain.pem:/etc/rancher/ssl/cert.pem \
   -v /etc/your_certificate_directory/privkey.pem:/etc/rancher/ssl/key.pem \
   -v /etc/your_certificate_directory/cacerts.pem:/etc/rancher/ssl/cacerts.pem \
-  rancher/server:v2.0.0
+  rancher/rancher:v2.0.0
 ```
 
 ### Providing your own certificates from a recognized Certificate Authority to the container
@@ -61,19 +61,19 @@ If the certificates you want to use are signed by a recognized Certificate Autho
 docker run -d -p 80:80 -p 443:443 \
   -v /etc/your_certificate_directory/fullchain.pem:/etc/rancher/ssl/cert.pem \
   -v /etc/your_certificate_directory/privkey.pem:/etc/rancher/ssl/key.pem \
-  rancher/server:v2.0.0
+  rancher/rancher:v2.0.0
 ```
 
 ### Using automatically requested Let's Encrypt certificates
 
 Rancher supports requesting Let's Encrypt certificates out-of-the-box. This is done using the **http-01 challenge**, this means that the hostname you want to use for accessing Rancher (for example, `rancher.mydomain.com`) will have to point to the IP of the machine it is running on. This can be done by creating an A record in DNS.
 
-As the Let's Encrypt challenge can come from any source IP address, port **TCP/80** needs to be open for every source IP address. You enable the Let's Encrypt functionality by passing the parameter `--acme-domain rancher.mydomain.com` when running the `rancher/server` container.
+As the Let's Encrypt challenge can come from any source IP address, port **TCP/80** needs to be open for every source IP address. You enable the Let's Encrypt functionality by passing the parameter `--acme-domain rancher.mydomain.com` when running the `rancher/rancher` container.
 
 <u>Example command:</u>
 
 ```
-docker run -d -p 80:80 -p 443:443 rancher/server:v2.0.0 --acme-domain rancher.mydomain.com
+docker run -d -p 80:80 -p 443:443 rancher/rancher:v2.0.0 --acme-domain rancher.mydomain.com
 ```
 
 *Note: Let's Encrypt provides rate limits for requesting new certificates, keep this in mind when creating and destroying the container multiple times. Read more on this in the [Let's Encrypt documentation on rate limits](https://letsencrypt.org/docs/rate-limits/).*
@@ -82,11 +82,11 @@ docker run -d -p 80:80 -p 443:443 rancher/server:v2.0.0 --acme-domain rancher.my
 
 ### Terminating SSL at loadbalancer or proxy
 
-#### Instructions for the `rancher/server` container
+#### Instructions for the `rancher/rancher` container
 
 **Self signed certificates**
 
-When using self signed certificates, you still need to supply the CA certificate to the `rancher/server` container. This will be used to validate connections to Rancher.
+When using self signed certificates, you still need to supply the CA certificate to the `rancher/rancher` container. This will be used to validate connections to Rancher.
 
 | Type                         |        Location in container |
 | ---------------------------- | ---------------------------: |
@@ -97,7 +97,7 @@ When using self signed certificates, you still need to supply the CA certificate
 ```
 docker run -d -p 80:80 -p 443:443 \
   -v /etc/your_certificate_directory/cacerts.pem:/etc/rancher/ssl/cacerts.pem \
-  rancher/server:v2.0.0
+  rancher/rancher:v2.0.0
 ```
 
 **Certificates by a well known Certificate Authority**
@@ -106,7 +106,7 @@ If the certificates you want to use are signed by a recognized Certificate Autho
 
 #### Instructions for the loadbalancer or proxy
 
-When using a loadbalancer or proxy in front of the `rancher/server` container, there is no need for the `rancher/server` container to redirect port **TCP/80** (HTTP) to port **TCP/443** (HTTPS). By passing the header `X-Forwarded-Proto: https` header, this redirect will be disabled.
+When using a loadbalancer or proxy in front of the `rancher/rancher` container, there is no need for the `rancher/rancher` container to redirect port **TCP/80** (HTTP) to port **TCP/443** (HTTPS). By passing the header `X-Forwarded-Proto: https` header, this redirect will be disabled.
 
 The loadbalancer or proxy has to be configured to support the following:
 
@@ -115,7 +115,7 @@ The loadbalancer or proxy has to be configured to support the following:
 | Header               | Value                                     | Description                                                  |
 | -------------------- | ----------------------------------------- | :----------------------------------------------------------- |
 | `Host`               | Domain name that is used to reach Rancher | To identify the server requested by the client               |
-| `X-Forwarded-Proto`  | `https`                                   | To identify the protocol that a client used to connect to the loadbalancer or proxy<br />*If this Header is present, `rancher/server` will not redirect HTTP to HTTPS* |
+| `X-Forwarded-Proto`  | `https`                                   | To identify the protocol that a client used to connect to the loadbalancer or proxy<br />*If this Header is present, `rancher/rancher` will not redirect HTTP to HTTPS* |
 | `X-Forwarded-Port`   | Port used to reach Rancher                | To identify the protocol that client used to connect to the loadbalancer or proxy |
 | `X-Forwarded-For`    | IP of the client connection               | To identify the originating IP address of a client           |
 
@@ -168,7 +168,7 @@ server {
 
 - How do I validate my certificate chain?
 
-You can validate the certificate chain by using the `openssl` binary. If the output ends with `Verify return code: 0 (ok)`, your certificate chain is valid. The `ca.pem` file should be the same as you supplied to the `rancher/server` container. When using a certificate signed by a well known Certificate Authority, you can omit the `-CAfile` parameter.
+You can validate the certificate chain by using the `openssl` binary. If the output ends with `Verify return code: 0 (ok)`, your certificate chain is valid. The `ca.pem` file should be the same as you supplied to the `rancher/rancher` container. When using a certificate signed by a well known Certificate Authority, you can omit the `-CAfile` parameter.
 
 <u>Example command:</u>
 ```
diff --git a/content/rancher/quick-start-guide/_index.md b/content/rancher/quick-start-guide/_index.md
index a112f658d4e..8021fc45dfa 100644
--- a/content/rancher/quick-start-guide/_index.md
+++ b/content/rancher/quick-start-guide/_index.md
@@ -68,9 +68,9 @@ To install Rancher on your host, connect to it and then use a shell to install.
 
 2.  From your shell, enter the following command:
 
-  ```
-  $ 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/rancher
+	```
 
 #### Result: Rancher is installed.
 
diff --git a/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-azure-container-service.md b/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-azure-container-service.md
index 0ba3c3ce147..510dd062c20 100644
--- a/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-azure-container-service.md
+++ b/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-azure-container-service.md
@@ -7,7 +7,7 @@ weight: 3350
 
 You can use Rancher to create a cluster using Microsoft Azure Container Service.
 
-{{< beta-note_azure >}}
+{{< beta-note_azure >}
 
 1. From the **Clusters** page, click **Add Cluster**.
 
diff --git a/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-custom.md b/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-custom.md
index 82247d36047..a2c0549d743 100644
--- a/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-custom.md
+++ b/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-custom.md
@@ -27,9 +27,13 @@ Begin creation of a custom cluster by provisioning a Linux host. Your host can b
 
 Provision the host according to our [requirements](../setup/requirements.md).
 
+
+
 >**Bare-Metal Server Note:**
 >
 While creating your cluster, you must assign Kubernetes roles to your cluster nodes. If you plan on dedicating bare-metal servers to each role, you must provision a bare-metal server for each role (i.e. provision multiple bare-metal servers).
+>
+>**Amazon EC2 Note:** If you're using an Amazon EC2 instance as your Linux host, you must also create a cluster ID. After you complete [Create the Custom Cluster](#create-the-custom-cluster), complete [Amazon EC2 Additional Step: Create a Cluster ID](#amazon-ec2-additional-step-br-create-a-cluster-id).
 
 ## Create the Custom Cluster
 
@@ -66,3 +70,7 @@ Use {{< product >}} to clone your Linux host and configure them as Kubernetes no
 11. When you finish running the command(s) on your Linux host(s), click **Done**.
 
 {{< result_create-cluster >}}
+
+### Amazon EC2 Additional Step:<br/> Create a Cluster ID
+
+Write content here Sebastiaan ☺️
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index f91f7bb6a06..80a7ffc1a7c 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -17,16 +17,22 @@
 {{ define "main" }}
   <div class="wrapper">
     {{ partial "docs-nav.html" . }}
-    {{ $showSidebar := (gt (len ($.Scratch.Get "secondLevel").Sections) 0) }}
+    {{ $secondLevel := ($.Scratch.Get "secondLevel") }}
+    {{ $.Scratch.Set "showSidebar" false }}
+    {{ with $secondLevel }}
+      {{ if (gt (len .Sections) 0) }}
+        {{ $.Scratch.Set "showSidebar" true }}
+      {{end}}
+    {{end}}
 
     <div class="row m-t-sm">
 
-      {{ if $showSidebar }}
+      {{ if ($.Scratch.Get "showSidebar") }}
         <aside class="col-sm-3 col-xs-12">
           {{ partial "docs-side-nav.html" . }}
         </aside>
       {{end}}
-      <article class="{{ if $showSidebar }} col-sm-6 {{else}} col-md-9 p-r-lg {{end}} col-xs-12">
+      <article class="{{ if ($.Scratch.Get "showSidebar") }} col-sm-6 {{else}} col-md-9 p-r-lg {{end}} col-xs-12">
 
         <div class="main-content ">
 
diff --git a/layouts/partials/docs-nav.html b/layouts/partials/docs-nav.html
index 1a74d9f4490..d411c906e76 100644
--- a/layouts/partials/docs-nav.html
+++ b/layouts/partials/docs-nav.html
@@ -1,16 +1,21 @@
 {{ $.Scratch.Set "topLevel" . }}
-{{ $.Scratch.Set "secondLevel" . }}
+{{ range .Site.Sections }}
+  {{if $.CurrentSection}}
+    {{ if .IsAncestor $.CurrentSection }}
+      {{ $.Scratch.Set "topLevel" . }}
+    {{end}}
+  {{end}}
+{{end}}
 
 <nav class="row middle-xs between-xs">
   <div class="pull-left p-v-xs col-md-2s">
       <ul class="dropdown sub-menu unstyled">
         <li>
-          <a href="{{ .URL }}" class="btn bg-link p-a-0">
+          <a href="{{ ($.Scratch.Get "topLevel").Permalink }}" class="btn bg-link p-a-0">
             <span class="p-h-xs">
             {{ range .Site.Sections }}
               {{if $.CurrentSection}}
                 {{ if .IsAncestor $.CurrentSection }}
-                  {{ $.Scratch.Set "topLevel" . }}
                   {{ .Params.shortTitle }}
                 {{end}}
               {{end}}
@@ -32,6 +37,7 @@
   <!-- tabs -->
   <ul class="tabs col-md-10">
     {{ $topLevel := .Scratch.Get "topLevel"}}
+    <li class="{{if (eq .Permalink $topLevel.Permalink)}}active{{end}}"><a href="{{$topLevel.Permalink}}"><i class="material-icons" style="position: relative; top: -2px;">home</i></a></li>
     {{ if $topLevel }}
       {{ range $topLevel.Sections }}
         {{ $isCurrent := .IsAncestor $.CurrentSection }}