Changes to pagination
diff --git a/templates/article.html b/templates/article.html
index bae03bf..1cfdd0d 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -42,6 +42,16 @@
   </div>
 
   {% if DISQUS_SITENAME %}
+
+    {% if COLLAPSE_COMMENTS %}
+    <script language="javascript">
+        function toggleComments() {
+            var commentDiv = document.getElementById("article_comments");
+            (commentDiv.style.display == "none") ? commentDiv.style.display = "block" : commentDiv.style.display = "none";
+            return false;
+        }
+    </script>
+    {% endif %}
     <div id="article_comments" style="display:{%if COLLAPSE_COMMENTS %}none{% else %}block{% endif %}">
         <div id="disqus_thread"></div>
         <script type="text/javascript">
@@ -54,17 +64,6 @@
         </script>
     </div>
     {% endif %}
-
 </article>
 {% endblock %}
 
-{% block footer %}
-<p><a href="{{ SITEURL }}/" class="button_accent">&larr; Back to Index</a></p>
-<script language="javascript">
-    function toggleComments() {
-        var commentDiv = document.getElementById("article_comments");
-        (commentDiv.style.display == "none") ? commentDiv.style.display = "block" : commentDiv.style.display = "none";
-        return false;
-    }
-</script>
-{% endblock %}
diff --git a/templates/base.html b/templates/base.html
index 151b2ab..297727c 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -87,10 +87,8 @@
     {% block content %}
     {% endblock %}
 
-    <footer>
-      {% block footer %}
-      {% endblock %}
-    </footer>
+    {% block footer %}
+    {% endblock %}
 
     <div id="ending_message">
         <p>&copy; {{ AUTHOR }}. Built using <a href="http://getpelican.com" target="_blank">Pelican</a>. Theme by Carey Metcalfe, availible on <a href="https://github.com/pR0Ps/pelican-svbhack" target="_blank">GitHub</a>. Based on <a href="https://github.com/giulivo/pelican-svbhack" target="_blank">svbhack</a> by Giulio Fidente.</p>
diff --git a/templates/index.html b/templates/index.html
index e2da6ee..d45d083 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -23,5 +23,7 @@
 {% endblock %}
 
 {% block footer %}
+<footer>
 {% include "modules/pagination.html" %}
+</footer>
 {% endblock %}
diff --git a/templates/modules/pagination.html b/templates/modules/pagination.html
index 638fea7..a1ea826 100644
--- a/templates/modules/pagination.html
+++ b/templates/modules/pagination.html
@@ -1,15 +1,12 @@
 {% if DEFAULT_PAGINATION %}
 <div id="paginator">
-{% if articles_page.has_next() %}
-<a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html" class="button_accent">&larr; Older Posts</a>
+{% if articles_page.has_previous() %}
+{% set num = articles_page.previous_page_number() %}
+<span id="left"><a href="{{ SITEURL }}/{{ page_name }}{{ num if num > 1 else '' }}.html"><i class="fa fa-arrow-circle-left"></i> Prev Page</a></span>
 {% endif %}
 
-{% if articles_page.has_previous() %}
-{% if articles_page.previous_page_number() == 1 %}
-<a href="{{ SITEURL }}/{{ page_name }}.html" class="button_accent">Newer Posts &rarr;</a>
-{% else %}
-<a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html" class="button_accent">Newer Posts &rarr;</a>
-{% endif %}
+{% if articles_page.has_next() %}
+<span id="right"><a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">Next Page <i class="fa fa-arrow-circle-right"></i></a></span>
 {% endif %}
 </div>
 {% endif %}