diff --git a/config.toml b/config.toml
index 1f90703517a..1f82de8b998 100644
--- a/config.toml
+++ b/config.toml
@@ -5,7 +5,6 @@ theme = "rancher-website-theme"
 themesDir = "node_modules"
 pluralizeListTitles = false
 
-# disableKinds = ["RSS"]
 enableRobotsTXT = true
 pygmentsCodeFences=true
 pygmentsCodeFencesGuessSyntax=true
@@ -13,183 +12,182 @@ pygmentsCodeFencesGuessSyntax=true
 [permalinks]
   inside-pages = "/:filename/"
 
+[params]
+  addThis = "ra-5af1cc6793d86bfb"
+
+[outputFormats.Search]
+baseName = "search"
+isPlaintext = true
+mediaType = "application/json"
+notAlternative = true
+
+[outputs]
+home = ["HTML", "RSS", "Search"]
+page = ["HTML", "Search"]
+
+[params.search]
+vars = ["title","summary","date","publishdate","expirydate","permalink"]
+params = ["categories","tags"]
+
 [[menu.main]]
 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"
-  url        = "https://rancher.com/what-is-rancher/overview/"
+  url        = "/what-is-rancher/overview/"
   parent     = "what-is-rancher"
   weight     = "1"
 
   [[menu.main]]
   name       = "What Rancher Adds to Kubernetes"
-  url        = "https://rancher.com/what-is-rancher/what-rancher-adds-to-kubernetes/"
+  url        = "/what-is-rancher/what-rancher-adds-to-kubernetes/"
   parent     = "what-is-rancher"
   weight     = "2"
 
   [[menu.main]]
   name       = "How is Rancher Different"
-  url        = "https://rancher.com/what-is-rancher/how-is-rancher-different/"
+  url        = "/what-is-rancher/how-is-rancher-different/"
   parent     = "what-is-rancher"
   weight     = "3"
 
 
   [[menu.main]]
   name       = "Run Kubernetes Anywhere"
-  url        = "https://rancher.com/kubernetes/"
+  url        = "/kubernetes/"
   parent     = "what-is-rancher"
   weight     = "4"
 
   [[menu.main]]
-  # name       = "Cluster Operation"
-  # url        = "https://rancher.com/what-is-rancher/cluster-operation/"
+  # name       = "Cluster Operations"
+  # url        = "/what-is-rancher/cluster-operations/"
   # parent     = "what-is-rancher"
   # weight     = "5"
 
   [[menu.main]]
   # name       = "Hybrid cloud & multi-cloud"
-  # url        = "https://rancher.com/what-is-rancher/hybrid-cloud-and-multi-cloud/"
+  # url        = "/what-is-rancher/hybrid-multi-cloud/"
   # parent     = "what-is-rancher"
   # weight     = "6"
 
   [[menu.main]]
   # name       = "Security & compliance"
-  # url        = "https://rancher.com/what-is-rancher/security-and-compliance/"
+  # url        = "/what-is-rancher/security-and-compliance/"
   # parent     = "what-is-rancher"
   # weight     = "7"
 
   [[menu.main]]
   # name       = "Workload Management"
-  # url        = "https://rancher.com/what-is-rancher/workload-management/"
+  # url        = "/what-is-rancher/workload-management/"
   # parent     = "what-is-rancher"
   # weight     = "8"
 
   [[menu.main]]
   # name       = "100% Open Source"
-  # url        = "https://rancher.com/what-is-rancher/open-souce/"
+  # url        = "/what-is-rancher/open-source/"
   # parent     = "what-is-rancher"
   # weight     = "9"
 
+  [[menu.main]]
+  # name       = "How is Rancher Built"
+  # url        = "/what-is-rancher/how-is-rancher-built/"
+  # parent     = "what-is-rancher"
+  # weight     = "10"
+
 
 [[menu.main]]
 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"
-  url        = "https://rancher.com/what-is-rancher/overview/"
+  url        = "/what-is-rancher/overview/"
   parent     = "products"
 
   [[menu.main]]
   name       = "RancherOS"
-  url        = "https://rancher.com/rancher-os/"
+  url        = "/rancher-os/"
   parent     = "products"
 
 
 [[menu.main]]
 #identifier = "customers"
 #name       = "Customers"
-#url        = "https://rancher.com/customers/"
+#url        = "/customers/"
 #weight     = "3"
 
 [[menu.main]]
 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"
-  url        = "https://rancher.com/blog/"
+  url        = "/blog/"
   parent     = "learn"
 
   [[menu.main]]
   name       = "Rancher Docs"
-  url        = "http://rancher.com/docs/rancher/v2.0/en/"
+  url        = "https://rancher.com/docs/"
   parent     = "learn"
 
   [[menu.main]]
-  name       = "Trainings"
-  #url       = "https://rancher.com/categories/training/"
-  url        = "https://rancher.com/training/"
+  name       = "Training"
+  #url       = "/categories/training/"
+  url        = "/training/"
   parent     = "learn"
 
   [[menu.main]]
   name       = "Forums"
   url        = "https://forums.rancher.com/"
+  target = "_blank"
+  pre        = "<i class='material-icons text-sm'>launch</i>"
   parent     = "learn"
-  pre        = "<i class=\"material-icons\">launch</i>"
 
   [[menu.main]]
   #name       = "Learning Resources"
-  #url        = "https://rancher.com/learning-resources/"
+  #url        = "/learning-resources/"
   #parent     = "learn"
 
+  [[menu.main]]
+  name       = "Events"
+  url        = "/events/"
+  parent     = "learn"
 
 
 [[menu.main]]
 identifier = "about"
 name       = "About"
-url        = "https://rancher.com/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       = "News"
+  url        = "/news/"
+  parent     = "about"
 
   [[menu.main]]
   name       = "About Us"
-  url        = "https://rancher.com/about/"
+  url        = "/about/"
   parent     = "about"
 
   [[menu.main]]
   name       = "Careers"
-  url        = "https://rancher.com/careers/"
+  url        = "/careers/"
   parent     = "about"
 
   [[menu.main]]
   name       = "Contact Us"
-  url        = "https://rancher.com/contact/"
-  parent     = "about"
-
-  [[menu.main]]
-  name       = "Events"
-  url        = "https://rancher.com/events/"
+  url        = "/contact/"
   parent     = "about"
 
   [[menu.main]]
   name       = "Partners"
-  url        = "https://rancher.com/partners/"
+  url        = "/partners/"
   parent     = "about"
-
-
-
-
-
-#footer menu#
-[[menu.footer]]
-identifier = "about"
-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>"
-name       = "Contact"
-url        = "/contact/"
-
-[[menu.footer]]
-identifier = "privacy"
-pre = "<i class=\"material-icons\">fingerprint</i>"
-name       = "Privacy"
-url        = "/privacy/"
-
-[[menu.footer]]
-identifier = "careers"
-pre = "<i class=\"material-icons\">people_outline</i>"
-name       = "Careers"
-url        = "/careers/"
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 0cd23d80ca2..e862908eeef 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -4,9 +4,7 @@
 
 {{ define "hero" }}
 <section class="hero">
-    {{ with .Params.Title }}
-      <h1>{{ . }}</h1>
-    {{end}}
+     <h1>Rancher 2.0 Docs</h1>
 
     {{ with .Params.Author }}
       <span class="byline bg-link">{{ . }}</span>
@@ -35,7 +33,9 @@
       <article class="{{ if ($.Scratch.Get "showSidebar") }} col-sm-6 {{else}} col-md-9 p-r-lg {{end}} col-xs-12">
 
         <div class="main-content ">
-
+        {{ with .Params.Title }}
+          <h2 class="m-t-0">{{ . }}</h2>
+        {{end}}
         {{ .Content }}
 
         {{ range (.Paginator 5).Pages }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 314a6bf2288..d65d109b06c 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -4,9 +4,7 @@
 
 {{ define "hero" }}
 <section class="hero">
-    {{ with .Params.Title }}
-      <h1>{{ . }}</h1>
-    {{end}}
+    <h1>Rancher 2.0 Docs</h1>
 
     {{ with .Params.Author }}
       <span class="byline bg-link">{{ . }}</span>
@@ -35,7 +33,9 @@
       <article class="{{ if ($.Scratch.Get "showSidebar") }} col-sm-6 {{else}} col-md-9 p-r-lg {{end}} col-xs-12">
 
         <div class="main-content ">
-
+        {{ with .Params.Title }}
+          <h2 class="m-t-0">{{ . }}</h2>
+        {{end}}
         {{ .Content }}
 
       </div>