diff --git a/layouts/index.html b/layouts/index.html
index 0aea5fb9e..40449381f 100755
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -9,12 +9,12 @@
     <title>Hugo :: A fast and modern static website engine</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="/static/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/css/bootstrap.min.css" rel="stylesheet">
 
     <link href='http://fonts.googleapis.com/css?family=Arbutus+Slab&family=Cabin:600&family=Source+Code+Pro' rel='stylesheet' type='text/css'>
     <!-- Add custom CSS here -->
-    <link href="/static/css/HPstyles.css" rel="stylesheet">
-    <link href="/static/css/hugofont.css" rel="stylesheet">
+    <link href="/css/HPstyles.css" rel="stylesheet">
+    <link href="/css/hugofont.css" rel="stylesheet">
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
   </head>
@@ -25,7 +25,7 @@
     <div id="top" class="header">
       <div class="vert-text">
 
-        <a href="#intro"><img src="/static/img/hugo.png" class="logo"> </a>
+        <a href="#intro"><img src="/img/hugo.png" class="logo"> </a>
         <div class="buttonbox">
         <a href="/overview/introduction" class="btn btn-info btn-lg">docs <i class="icon-idea"></i></a>
         <a href="https://github.com/spf13/hugo/releases" class="btn btn-success btn-lg">download <i class="icon-arrow-down"></i></a>
@@ -236,8 +236,8 @@
 
   <!-- Bootstrap core JavaScript -->
   <!-- Placed at the end of the document so the pages load faster -->
-  <script src="/static/js/jquery.js"></script>
-  <script src="/static/js/bootstrap.min.js"></script>
+  <script src="/js/jquery.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
   <script>
     $(function() {
         $('a[href*=#]:not([href=#])').click(function() {
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 47bddfdbb..1dfd82003 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -22,7 +22,7 @@
     <script src="/js/jquery.scrollTo.min.js"></script>
     <script src="/js/jquery.nicescroll.js" type="text/javascript"></script>
     <!--custom script for all page-->
-    <script src="/static/js/highlight.pack.js"></script>
+    <script src="/js/highlight.pack.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
     <script src="/js/scripts.js"></script>
     <script async defer id="github-bjs" src="/js/buttons.js"></script>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index e4e41e226..f6fc360ca 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -36,15 +36,9 @@
             <div class="top-nav notification-row">
                 <!-- notification dropdown end-->
                 <div class="hidden-xs nav-github pull-right">
-
                     <span rel="show-github" data-user="spf13" data-repo="hugo" data-type="follow"></span>
                     <span rel="show-github" data-user="spf13" data-repo="hugo"></span>
                     <span rel="show-github" data-user="spf13" data-repo="hugo" data-type="fork"></span>
-                    <!--<span rel="show-github" data-user="spf13" data-repo="hugo"><span class="github-btn github-watchers"><a class="btn btn-xs btn-default" href="https://github.com/spf13/hugo/" target="_blank"><i class="fa fa-github"></i> <span class="gh-text">Star</span></a><a class="gh-count" href="https://github.com/spf13/hugo/stargazers" target="_blank" style="display: inline-block;">2,144</a></span></span>-->
-                    <!--<span rel="show-github" data-user="spf13" data-repo="hugo" data-type="fork"><span class="github-btn github-forks"><a class="btn btn-xs btn-default" href="https://github.com/spf13/hugo/" target="_blank"><i class="fa fa-github"></i> <span class="gh-text">Fork</span></a><a class="gh-count" href="https://github.com/spf13/hugo/network" target="_blank" style="display: inline-block;">582</a></span></span>-->
-                    <!--<a href="https://github.com/spf13"       class="github-button" data-count-href="/spf13/followers" data-count-api="/users/spf13#followers">@spf13</a> &nbsp;-->
-                    <!--<a href="https://github.com/spf13/hugo"  class="github-button" data-icon="octicon-star" data-count-href="/spf13/hugo/stargazers" data-count-api="/repos/spf13/hugo#stargazers_count">Star</a> &nbsp;-->
-                    <!--<a href="https://github.com/spf13/hugo"  class="github-button" data-icon="octicon-git-branch-create" data-count-href="/spf13/hugo/network" data-count-api="/repos/spf13/hugo#forks_count">Fork</a>-->
                 </div>
             </div>