diff --git a/404.md b/404.md
index 7764b12ba8..beffa9d763 100644
--- a/404.md
+++ b/404.md
@@ -1,9 +1,10 @@
 ---
 layout: docwithnav
 title: 404 Error!
+permalink: /404.html
 ---
 
-Testing...
+Sorry, this page was not found. :( 
 
-Page.path = {{ page.path }}
-Page.url = {{ page.url }}
\ No newline at end of file
+You can let us know by filling out the "I wish this page" text field at
+the bottom of this page. Maybe try: "I wish this page _existed_."
\ No newline at end of file
diff --git a/_data/v1_1/guides.yml b/_data/v1_1/guides.yml
index b5409c099b..e006a92a6d 100644
--- a/_data/v1_1/guides.yml
+++ b/_data/v1_1/guides.yml
@@ -1,7 +1,7 @@
-bigheader: "User Guides"
+bigheader: "Guides"
 abstract: "How to get started, and acheive tasks, using Kubernetes"
 toc:
-- title: Overview
+- title: Guides
   path: /v1.1/
 
 - title: Quickstarts
diff --git a/_data/v1_1/samples.yml b/_data/v1_1/samples.yml
index 40d9053c9b..d70c119fa5 100644
--- a/_data/v1_1/samples.yml
+++ b/_data/v1_1/samples.yml
@@ -1,7 +1,7 @@
 bigheader: "Samples"
 abstract: "A collection of example applications that show how to use Kubernetes."
 toc:
-- title: Samples Overview
+- title: Samples
   path: /v1.1/samples/
 
 - title: Clustered Application Samples
diff --git a/_data/v1_1/support.yml b/_data/v1_1/support.yml
index 5e3b374bdb..27c7c38463 100644
--- a/_data/v1_1/support.yml
+++ b/_data/v1_1/support.yml
@@ -1,7 +1,7 @@
 bigheader: "Support"
 abstract: "Troubleshooting resources, frequently asked questions, and community support channels."
 toc:
-- title: Support Overview
+- title: Support
   path: /v1.1/support/
 
 - title: Troubleshooting
@@ -38,3 +38,5 @@ toc:
     path: /v1.1/docs/roadmap/
   - title: Contributing to Kubernetes Documentation
     path: /v1.1/editdocs/
+  - title: Sitemap for v1.1
+    path: /v1.1/pagelist/
diff --git a/sitemap.xml b/sitemap.xml
new file mode 100644
index 0000000000..a965f4a570
--- /dev/null
+++ b/sitemap.xml
@@ -0,0 +1,18 @@
+---
+---
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset
+      xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
+            http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
+
+<url>
+  <loc>http://kubernetes.io/</loc>
+  <lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
+</url>
+{% for page in site.pages %}<url>
+  <loc>http://kubernetes.io{{ page.url }}</loc>
+  <lastmod>{% if page.date %}{{ page.date | date_to_xmlschema }}{% else %}{{ site.time | date_to_xmlschema }}{% endif %}</lastmod>
+</url>{% endfor %}
+</urlset>
\ No newline at end of file
diff --git a/v1.1/editdocs.md b/v1.1/editdocs.md
index 7835f6436a..00b1469199 100644
--- a/v1.1/editdocs.md
+++ b/v1.1/editdocs.md
@@ -34,7 +34,7 @@ $( document ).ready(function() {
 
 <p>Click the below button to visit the repo for our site. You can then click the "Fork" button in the upper-right area of the screen to create a copy of our site on your GitHub account called a "fork." Make any changes you want in your fork, and when you are ready to send those changes to us, go to the index page for your fork and click "New Pull Request" to let us know about it.</p>
 
-<p><a class="button">https://github.com/kubernetes/kubernetes.github.io/</a></p>
+<p><a class="button" href="https://github.com/kubernetes/kubernetes.github.io/">Browse this site's source code</a></p>
 
 </div>
 <!-- END: Dynamic section -->
diff --git a/v1.1/index.md b/v1.1/index.md
index ba2080acfd..f7dfa9e245 100644
--- a/v1.1/index.md
+++ b/v1.1/index.md
@@ -2,4 +2,42 @@
 title: "Documentation"
 ---
 
-Landing page for docs
\ No newline at end of file
+Landing page for docs
+
+## Samples
+
+<style>
+.shadowbox {
+    display: inline;
+    float: left;
+    text-transform: none;
+    text-align: left;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    line-height: 24px;
+    position: relative;
+    display: block;
+    cursor: pointer;
+    box-shadow: 0 2px 2px rgba(0,0,0,.24),0 0 2px rgba(0,0,0,.12);
+    border-radius: 2px;
+    background: #fff;
+    transition: all .3s;
+    padding: 16px;
+    margin: 0 16px 16px 0;
+    text-decoration: none;
+    letter-spacing: .01em;
+}
+</style>
+<div class="shadowbox">
+  MEAN Stack
+</div>
+<div class="shadowbox">
+  PHP Guestbook
+</div>
+<div class="shadowbox">
+  Cassandra
+</div>
+<div class="shadowbox">
+  WordPress / MySQL
+</div>
\ No newline at end of file
diff --git a/v1.1/pagelist.md b/v1.1/pagelist.md
new file mode 100644
index 0000000000..4f476fafbd
--- /dev/null
+++ b/v1.1/pagelist.md
@@ -0,0 +1,22 @@
+---
+title: Sitemap
+---
+
+The following is a list of all pages for {{ page.version }}. We also have a [`sitemap.xml`](/sitemap.xml) file.
+
+{% for page in site.pages %}
+  {% assign foundTOC=false %}
+  {% assign pageTOC=false %}
+  {% for thistoc in site.data[page.versionfilesafe].globals.tocs %}
+    {% if foundTOC %}
+    {% break %}
+    {% else %}
+    {% assign tree = site.data[page.versionfilesafe][thistoc].toc %}
+    {% include tocsearch.html %}
+    {% if foundTOC %}
+      {% assign pageTOC = thistoc %}
+    {% endif %}
+    {% endif %}
+  {% endfor %}
+* {% if pageTOC %}**[{{ pageTOC | capitalize }}](/{{page.version}}/{%if pageTOC != "guides"%}{{pageTOC}}/{%endif%})**: {% endif %}[{% if page.title %}{{page.title}}{% else %}{{ page.url }}{% endif %}]({{ page.url }})
+{% endfor %}
\ No newline at end of file