diff --git a/_layouts/docwithnav.html b/_layouts/docwithnav.html
index 103ada86f7..9b20fa1462 100755
--- a/_layouts/docwithnav.html
+++ b/_layouts/docwithnav.html
@@ -119,5 +119,15 @@
 	</main>
 </footer>
 
+<style>
+	.cse .gsc-control-cse, .gsc-control-cse {
+		padding: 0;
+	}
+
+	.gsc-above-wrapper-area {
+		border-bottom: 0;
+	}
+</style>
+
 </body>
 </html>
\ No newline at end of file
diff --git a/_layouts/headerfooter.html b/_layouts/headerfooter.html
index 6547f5d926..522483928c 100644
--- a/_layouts/headerfooter.html
+++ b/_layouts/headerfooter.html
@@ -81,6 +81,10 @@
 		<div class="center">&copy; {{ 'now' | date: "%Y" }} Kubernetes</div>
 	</main>
 </footer>
-
+<style>
+	.cse .gsc-control-cse, .gsc-control-cse {
+		 padding: 0;
+	}
+</style>
 </body>
 </html>
\ No newline at end of file
diff --git a/_sass/_base.sass b/_sass/_base.sass
index 32ee023989..4d942761cb 100644
--- a/_sass/_base.sass
+++ b/_sass/_base.sass
@@ -586,18 +586,17 @@ section
 		margin-top: 10px
 
 	code
-		white-space: pre-wrap
 		background-color: $light-grey
 		color: $dark-grey
 		font-family: $mono-font
-		line-height: 32px
-		overflow: auto
+		overflow-x: scroll
 		font-size: 14px
 		font-weight: bold
 		padding: 2px 4px
 
-		&::-webkit-scrollbar
-			background-color: transparent
+	a code
+		color: $blue
+		text-decoration: underline
 
 	pre .pi, pre .s
 		margin: 0
@@ -615,13 +614,9 @@ section
 	pre
 		background-color: #f7f7f7
 		display: block
-		white-space: pre-wrap
 		margin: 20px 0
 		padding: 15px
-		overflow: auto
-
-	pre::-webkit-scrollbar
-		background-color: transparent
+		overflow-x: scroll
 
 	ul li
 		list-style: disc
@@ -630,11 +625,22 @@ section
 		list-style: decimal
 
 	ul, ol
+		margin: 20px 0
 		padding-left: 30px
+		font-weight: 300
 
 	li
 		margin-bottom: 1em
 
+	thead, tr:nth-child(even)
+		background-color: $light-grey
+
+	th, td
+		padding: 6px
+
+	td
+		font-size: 0.85em
+
 	#editPageButton
 		position: absolute
 		top: -25px
@@ -659,6 +665,7 @@ section
 
 		ul
 			padding: 0 15px
+			margin: 0
 
 		li
 			padding: 0
@@ -675,6 +682,27 @@ section
 	bottom: 0
 
 
+html.search #docsContent
+	position: relative
+	float: none
+	width: 90%
+	max-width: 850px
+	margin: 0 auto
+
+	#editPageButton
+		display: none
+
+	td
+		padding: 0
+
+	h1
+		margin-bottom: 0
+		border-bottom: 0
+		padding-bottom: 0
+		padding-left: 8px
+
+
+
 /* Default gh-pages-blog css from https://github.com/thedereck/gh-pages-blog/blob/master/css/syntax.css */
 .highlight br
 	display: none
diff --git a/search.md b/search.md
index 16610fd4d2..2799b5e230 100644
--- a/search.md
+++ b/search.md
@@ -14,6 +14,8 @@ hideTOC: true
         '//cse.google.com/cse.js?cx=' + cx;
     var s = document.getElementsByTagName('script')[0];
     s.parentNode.insertBefore(gcse, s);
+
+    document.querySelector('html').classList.add('search');
   })();
 </script>
 <gcse:searchresults-only linktarget="_parent"></gcse:searchresults-only>
\ No newline at end of file