4 files changed, 7 insertions, 24 deletions
diff --git a/_includes/git-wiki/sections/content/content.html b/_includes/git-wiki/sections/content/content.html
index 73c7b5b..b356968 100644
--- a/_includes/git-wiki/sections/content/content.html
+++ b/_includes/git-wiki/sections/content/content.html
@@ -3,15 +3,7 @@
 
     {% include git-wiki/sections/tools/tools.html %}
 
-    {% if site.inc_before_toc %}
-    {% include {{ site.inc_before_toc }} %}
-    {% endif %}
-
-    <div id="git-wiki-toc"></div>
-
-    {% if site.inc_after_toc %}
-    {% include {{ site.inc_after_toc }} %}
-    {% endif %}
+    {% include git-wiki/components/toc/toc.html %}
 
     {% if site.inc_before_content %}
     {% include {{ site.inc_before_content }} %}
diff --git a/_includes/git-wiki/sections/head/scripts.html b/_includes/git-wiki/sections/head/scripts.html
index 65ee4ff..9cf23f3 100644
--- a/_includes/git-wiki/sections/head/scripts.html
+++ b/_includes/git-wiki/sections/head/scripts.html
@@ -4,7 +4,6 @@
 
 <script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
     crossorigin="anonymous"></script>
-<script src="{{ '/assets/js/toc.js' | relative_url }}"></script>
 <script src="{{ '/assets/js/red-links.js' | relative_url }}"></script>
 <!--[if lt IE 9]>
     <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/_includes/git-wiki/sections/header/header.html b/_includes/git-wiki/sections/header/header.html
index 8612103..38ec85b 100644
--- a/_includes/git-wiki/sections/header/header.html
+++ b/_includes/git-wiki/sections/header/header.html
@@ -1,8 +1,10 @@
 <div class=" w3-xlarge w3-hide-large" id="git-wiki-mobile-header">
   <button class="w3-button w3-teal" onclick="sidebar_toggle()">&#9776;</button>
   <a href="{{ '/' | relative_url }}">
+    {% if site.logo_url %}
     <img src="{{ site.logo_url }}" width="20px">
-    {{ site.title }}
+    {% endif %}
+    {{ site.title | escape }}
   </a>
 </div>
 <header class="w3-sidebar w3-bar-block w3-collapse" id="git-wiki-sidebar">
@@ -15,6 +17,8 @@
     <div class="w3-hide-medium w3-hide-small">
       {% if site.logo_url %}
       {% include git-wiki/components/logo/logo.html %}
+      {% else %}
+      <h1>{{ site.title | escape }}</h1>
       {% endif %}
     </div>
 
@@ -50,4 +54,4 @@
       $(sidebar).attr('style', 'display: block;');
     }
   }
-</script>
-\ No newline at end of file
+</script>
diff --git a/_includes/git-wiki/sections/tail/tail.html b/_includes/git-wiki/sections/tail/tail.html
index fc8d46b..692867f 100644
--- a/_includes/git-wiki/sections/tail/tail.html
+++ b/_includes/git-wiki/sections/tail/tail.html
@@ -18,18 +18,6 @@
 </script>
 {% endif %}
 
-<script type="text/javascript">
-    $(document).ready(function () {
-        $('#git-wiki-toc').toc({
-            title: '<i>Contents</i>',
-            showSpeed: 0,
-            listType: "ul",
-            headers: '#git-wiki-content h1, #git-wiki-content h2'
-        });
-        $(document.body).redLinks();
-    });
-</script>
-
 {% if site.inc_after_tail %}
 {% include {{ site.inc_after_tail }} %}
 {% endif %}