diff --git a/_layouts/landing.html b/_layouts/landing.html
index 723f99d27d..c1e0cee5bf 100644
--- a/_layouts/landing.html
+++ b/_layouts/landing.html
@@ -23,7 +23,7 @@ layout: base
 		<div class="col-md-10 nofloat center-block">
 			<div class="col-sm-9 text-center nofloat center-block">
 				<h2 class="doc-call-title">Want to learn more?</h2>
-				<p class="doc-call-text"> Get started by learning Istio concepts and doing our bookinfo sample.</p>
+				<p class="doc-call-text"> Get started by learning Istio concepts and doing our BookInfo sample.</p>
 				<a href="{{home}}/docs"><button class="btn btn-grpc waves-effect waves-light btn-doc-call">GET STARTED</button></a>
 			</div>
 		</div>
diff --git a/_layouts/search-results.html b/_layouts/search-results.html
index a2e29b94c2..4785f0e60f 100644
--- a/_layouts/search-results.html
+++ b/_layouts/search-results.html
@@ -12,8 +12,6 @@ layout: default
   }
 </style>
 
-{% include doc-top-nav.html %}
-
 <div class="container">
   {{ content }}
 </div>
diff --git a/js/search.js b/js/search.js
index 0d8a2355ae..e2b7a59e2f 100644
--- a/js/search.js
+++ b/js/search.js
@@ -1,6 +1,6 @@
 (function ($) {
     function doSearch() {
-        var url = '/docs/search/?q=' + document.getElementsByName('q')[0].value;
+        var url = '/search/?q=' + document.getElementsByName('q')[0].value;
         window.location.assign(url);
     }
 
diff --git a/_docs/search/index.md b/search/index.md
similarity index 100%
rename from _docs/search/index.md
rename to search/index.md