diff --git a/_data/v1_1/guides.yml b/_data/v1_1/guides.yml
index 410efaba5a..8409e4e615 100644
--- a/_data/v1_1/guides.yml
+++ b/_data/v1_1/guides.yml
@@ -6,14 +6,14 @@ toc:
 
 - title: Quickstarts
   section:
+  - title: What is Kubernetes?
+    path: /v1.1/docs/whatisk8s/
   - title: TODO - 5-minute Quickstart
     path: /v1.1/docs/hellonode/
   - title: Kubernetes 101
     path: /v1.1/docs/user-guide/walkthrough/
   - title: Kubernetes 201
     path: /v1.1/docs/user-guide/walkthrough/k8s201/
-  - title: Running a MEAN stack on Google Cloud Platform with Kubernetes
-    path: /v1.1/docs/getting-started-guides/meanstack/
 
 - title: Running Kubernetes
   section:
diff --git a/_data/v1_1/samples.yml b/_data/v1_1/samples.yml
index d70c119fa5..fb7240d0ef 100644
--- a/_data/v1_1/samples.yml
+++ b/_data/v1_1/samples.yml
@@ -30,6 +30,8 @@ toc:
     path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/openshift-origin/
   - title: Ceph
     path: https://github.com/kubernetes/kubernetes/tree/release-1.1/examples/rbd/
+  - title: MEAN stack on Google Cloud Platform
+    path: /v1.1/docs/getting-started-guides/meanstack/
 
 - title: Persistent Volume Samples
   section:
diff --git a/_layouts/docwithnav.html b/_layouts/docwithnav.html
index 2ae73abc28..df81dcad17 100755
--- a/_layouts/docwithnav.html
+++ b/_layouts/docwithnav.html
@@ -22,16 +22,16 @@ layout: headerfooter
 			<a href="/v1.1">Version 1.1</a>
 			<a href="/v1.0">Version 1.0</a>
 		</div>
-		<input type="text" id="search" placeholder="Search the docs">
+		<input type="text" id="search" placeholder="Search" onkeydown="if (event.keyCode==13) window.location.replace('/search/?q=' + this.value)">
 	</div>
 </section>
 
-<section id="encyclopedia">
+<section id="encyclopedia">{% if page.hideTOC != true %}
 	<div id="docsToc">
         <div class="pi-accordion">
         {% assign tree = site.data[page.versionfilesafe][foundTOC].toc %}{% include tree.html %}
         </div> <!-- /pi-accordion -->
-	</div> <!-- /docsToc -->
+	</div> <!-- /docsToc -->{% endif %}
 	<div id="docsContent">{% if page.showedit == true %}<a href="/{{ page.version }}/editdocs#{{ page.path }}" id="editPageButton">Edit This Page</a>{% endif %}
     	<h1>{{ page.title }}</h1>
 		{{ content }}
diff --git a/search.md b/search.md
new file mode 100644
index 0000000000..16610fd4d2
--- /dev/null
+++ b/search.md
@@ -0,0 +1,19 @@
+---
+layout: docwithnav
+title: Search Results
+hideTOC: true
+---
+<script>
+
+  (function() {
+    var cx = '013467772795878830775:lgtavaxylpe';
+    var gcse = document.createElement('script');
+    gcse.type = 'text/javascript';
+    gcse.async = true;
+    gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+        '//cse.google.com/cse.js?cx=' + cx;
+    var s = document.getElementsByTagName('script')[0];
+    s.parentNode.insertBefore(gcse, s);
+  })();
+</script>
+<gcse:searchresults-only linktarget="_parent"></gcse:searchresults-only>
\ No newline at end of file