diff --git a/docs/site/components/docs/docs.html b/docs/site/components/docs/docs.html
index 52b8b2dca34..40e67046c43 100644
--- a/docs/site/components/docs/docs.html
+++ b/docs/site/components/docs/docs.html
@@ -1,20 +1,5 @@
 <script id="docs-header.html" type="text/ng-template">
   <header header title="{{pageTitle}}">
-    <div class="row row--right">
-      <div class="col margin-vertical">
-        <a href="https://github.com/GoogleCloudPlatform/gcloud-node/issues/new"
-          class="v-btn">
-          <img src="site/img/icon-link-github.svg" />
-          Report an Issue
-        </a>
-      </div>
-      <div class="col margin-vertical">
-        <a href="#/docs/history" ng-show="showReference"
-          class="v-btn">
-          <img src="site/img/icon-arrow-bullet.svg" />
-          Version History (<i>{{version}}</i>)
-        </a>
-      </div>
       <div>
         <div ng-if="lastBuiltDate" class="build-date">Docs last built {{lastBuiltDate}}.</div>
       </div>
diff --git a/docs/site/components/subpage/subpage.html b/docs/site/components/subpage/subpage.html
index 202f9d43351..9f11ca58800 100644
--- a/docs/site/components/subpage/subpage.html
+++ b/docs/site/components/subpage/subpage.html
@@ -6,7 +6,25 @@ <h1 class="logo">
         <span class="gcloud">gcloud</span>
       </a>
     </h1>
+
     <div language-switcher></div>
+
+    <div class="page-header-buttons">
+      <div class="col margin-vertical">
+        <a href="https://github.com/GoogleCloudPlatform/gcloud-node/issues/new"
+          class="v-btn">
+          <img src="site/img/icon-link-github.svg" />
+          Report an Issue
+        </a>
+      </div>
+      <div class="col margin-vertical">
+        <a href="#/docs/history" ng-show="showReference"
+          class="v-btn">
+          <img src="site/img/icon-arrow-bullet.svg" />
+          Version History (<i>{{version}}</i>)
+        </a>
+      </div>
+    </div>
   </header>
 
   <header ng-if="headerTemplateUrl" ng-include="headerTemplateUrl"></header>
diff --git a/docs/site/css/main.css b/docs/site/css/main.css
index d2458f389f6..d009d694c35 100755
--- a/docs/site/css/main.css
+++ b/docs/site/css/main.css
@@ -233,6 +233,12 @@ ul {
     padding: 0;
 }
 
+.page-header-buttons {
+  position: fixed;
+  right: 20px;
+  top: 10px;
+}
+
 /*
  Logo
 */
@@ -835,6 +841,7 @@ ul {
 }
 
 .build-date {
+  float: right;
   font-style: italic;
   font-size: 0.8em;
 }