diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 005320c763..4c54cde4ad 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -24,8 +24,8 @@
                 {{with $File.Path }}
               <div id="top-github-link">
                   <a class="github-link" href="{{ $Site.Params.editURL }}{{ $File.Dir }}{{ $File.LogicalName }}" target="blank">
-                    <i class="fa fa-github-square"></i>
-                    edit this page
+                    <i class="fa fa-code-fork"></i>
+                    Edit this page
                   </a>
               </div>
                 {{ end }}
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 95e3f760db..101756f850 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -31,6 +31,7 @@
                  {{ $first.Title }}
                </span>
             </a>
+            {{ if gt .Pages.Len 1}}
             <ul>
               {{ range $k, $p := .Pages }}
               {{ if gt $k 0 }}
@@ -42,6 +43,7 @@
               {{ end }}
               {{ end }}
             </ul>
+            {{ end }}
           </li>
           {{ end }}
           {{ end }}