diff --git a/docs/layouts/partials/footer.html b/docs/layouts/partials/footer.html
index 961638d8c..e6a4fc8cf 100644
--- a/docs/layouts/partials/footer.html
+++ b/docs/layouts/partials/footer.html
@@ -3,11 +3,13 @@
                     </section>
                 </div>
                 <div class="col-md-1">
+                    {{ if .IsPage }}
                     {{ with .GetParam "next" }}
                     <a class="navigation next" href="{{.}}">
                         <i class="fa fa-angle-right"> </i>
                     </a>
                     {{ end }}
+                    {{ end }}
                 </div>
               </div>
               <!-- page start-->
diff --git a/docs/layouts/partials/header.html b/docs/layouts/partials/header.html
index f6fc360ca..f47ba2b18 100644
--- a/docs/layouts/partials/header.html
+++ b/docs/layouts/partials/header.html
@@ -48,7 +48,7 @@
       </header>
       <!--header end-->
 
-{{ template "partials/menu.html" . }}
+{{ partial "menu.html" . }}
 
       <!--main content start-->
       <section id="main-content">
@@ -68,11 +68,13 @@
 
               <div class="row">
                   <div class="col-md-1">
+                      {{ if .IsPage }}
                       {{ with .GetParam "prev" }}
                       <a class="navigation prev" href="{{.}}">
                       <i class="fa fa-angle-left"></i>
                       </a>
                       {{ end }}
+                      {{ end }}
                   </div>
                 <div class="col-md-10">
                     <section class="panel">
diff --git a/docs/layouts/partials/menu.html b/docs/layouts/partials/menu.html
index cac8233d0..8e5e4004d 100644
--- a/docs/layouts/partials/menu.html
+++ b/docs/layouts/partials/menu.html
@@ -30,7 +30,9 @@
               </li>
           {{end}}
             <li> <a href="https://github.com/spf13/hugo/issues" target="blank"><i class='fa fa-life-ring'></i>Issues & Help</a> </li>
-            {{ $File := .File }}  {{with .File.FileName }}<li><a href="https://github.com/spf13/hugo/edit/master/docs/content/{{ $File.Dir }}{{ $File.FileName }}" target="blank"><i class='fa fa-edit'></i> Refine this Page</a> </li>{{end}}
+            {{ if .IsPage }}
+            {{ $File := .File }}  {{with $File.FileName }}<li><a href="https://github.com/spf13/hugo/edit/master/docs/content/{{ $File.Dir }}{{ $File.FileName }}" target="blank"><i class='fa fa-edit'></i> Refine this Page</a> </li>{{end}}
+            {{ end }}
         </ul>
         <!-- sidebar menu end-->
     </div>