diff --git a/alchemy/static/css/style.css b/alchemy/static/css/style.css
index 762a9a7..a7c2220 100644
--- a/alchemy/static/css/style.css
+++ b/alchemy/static/css/style.css
@@ -71,6 +71,7 @@ blockquote {
 
 .header {
   border-bottom: 1px solid #ddd;
+  padding-bottom: 10px;
 }
 
 .main {
@@ -102,12 +103,12 @@ blockquote {
 
 .header p {
   font-size: 1.1em;
-  margin: 20px 0;
+  margin-top: 20px;
 }
 
 .header ul {
   font-family: Montserrat, 'Helvetica Neue', sans-serif;
-  margin-bottom: 10px;
+  margin-bottom: 0;
 }
 
 .header li {
diff --git a/alchemy/templates/base.html b/alchemy/templates/base.html
index 26abc2f..ca47687 100644
--- a/alchemy/templates/base.html
+++ b/alchemy/templates/base.html
@@ -118,11 +118,13 @@
             {% endif %}
             <li><a href="{{ SITEURL }}/archives.html">Archives</a></li>
             <li><a href="{{ SITEURL }}/categories.html">Categories</a></li>
+            {% if tags|length %}
             <li><a href="{{ SITEURL }}/tags.html">Tags</a></li>
+            {% endif %}
           </nav>
         </div>
         <div class="col-sm-6 hidden-xs text-right text-muted">
-          Generated by <a href="https://github.com/getpelican/pelican" target="_blank">Pelican</a> using <a href="https://github.com/nairobilug/pelican-alchemy">&#x2728; alchemy</a>
+          Generated by <a href="https://github.com/getpelican/pelican" target="_blank">Pelican</a> using <a href="https://github.com/nairobilug/pelican-alchemy" target="_blank">&#x2728; alchemy</a>
         </div>
       </div>
     </div>
diff --git a/alchemy/templates/include/analytics.html b/alchemy/templates/include/analytics.html
index edd6efe..c41baa5 100644
--- a/alchemy/templates/include/analytics.html
+++ b/alchemy/templates/include/analytics.html
@@ -5,9 +5,10 @@
     i[r] = i[r] || function() {
       (i[r].q = i[r].q || []).push(arguments)
     }, i[r].l = 1 * new Date();
-    a = s.createElement(o), m = s.getElementsByTagName(o)[0];
+    a = s.createElement(o);
     a.async = 1;
     a.src = g;
+    m = s.getElementsByTagName(o)[0];
     m.parentNode.insertBefore(a, m)
   })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
   ga('create', '{{ GOOGLE_ANALYTICS }}', 'auto');
diff --git a/alchemy/templates/include/comments.html b/alchemy/templates/include/comments.html
index 39384cd..7bb3c6b 100644
--- a/alchemy/templates/include/comments.html
+++ b/alchemy/templates/include/comments.html
@@ -2,12 +2,13 @@
 <hr>
 <div id="disqus_thread"></div>
 <script>
-  var disqus_config = function () {
+  var disqus_config = function() {
     this.page.url = '{{ SITEURL }}/{{ output_file }}';
     this.page.identifier = '{{ article.slug }}';
   };
   (function() {
-    var d = document, s = d.createElement('script');
+    var d = document;
+    var s = d.createElement('script');
     s.src = '//{{ DISQUS_SITENAME }}.disqus.com/embed.js';
     s.setAttribute('data-timestamp', +new Date());
     (d.head || d.body).appendChild(s);
diff --git a/alchemy/templates/include/pagination.html b/alchemy/templates/include/pagination.html
index b2dcf83..167969b 100644
--- a/alchemy/templates/include/pagination.html
+++ b/alchemy/templates/include/pagination.html
@@ -1,4 +1,4 @@
-{% if DEFAULT_PAGINATION %}
+{% if articles_paginator.num_pages > 1 %}
 <hr>
 <ul class="pagination">
   {% if articles_page.has_previous() %}
diff --git a/alchemy/templates/index.html b/alchemy/templates/index.html
index 66b4f99..b69a7e3 100644
--- a/alchemy/templates/index.html
+++ b/alchemy/templates/index.html
@@ -2,7 +2,9 @@
 
 {% block head %}
 {{ super() }}
+{% if DESCRIPTION %}
 <meta name="description" content="{{ DESCRIPTION|striptags }}">
+{% endif %}
 {% endblock %}
 
 {% block title %}