diff --git a/mkdocs.yml b/mkdocs.yml
index 65940a5d..f0d5a36c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -13,3 +13,6 @@ pages:
 
 theme: 'mkdocs'
 theme_center_lead: true
+
+copyright: Copyright &copy; 2014, <a href="https://twitter.com/_tomchristie">Tom Christie</a>.
+google_analytics: ['example', 'foo']
diff --git a/mkdocs/__init__.py b/mkdocs/__init__.py
index 58d168b0..5a6f84c5 100644
--- a/mkdocs/__init__.py
+++ b/mkdocs/__init__.py
@@ -1 +1 @@
-__version__ = '0.4'
+__version__ = '0.5'
diff --git a/mkdocs/themes/mkdocs/base.html b/mkdocs/themes/mkdocs/base.html
index b73b1ac0..497a547e 100644
--- a/mkdocs/themes/mkdocs/base.html
+++ b/mkdocs/themes/mkdocs/base.html
@@ -23,14 +23,26 @@
             <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
         <![endif]-->
 
-        {% if config.theme_center_lead %}
+        {% if config.google_analytics %}
+        <script>
+            (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;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.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+            })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+            ga('create', '{{ config.google_analytics[0] }}', '{{ config.google_analytics[1] }}');
+            ga('send', 'pageview');
+        </script>
+        {% endif %}
+
+        {% if config.theme_center_lead
+            or current_page.is_homepage and config.theme_center_homepage_lead %}
         <style>
             div.col-md-9 h1:first-of-type {
                 text-align: center;
                 font-size: 60px;
                 font-weight: 300;
             }
-
             div.col-md-9 p:first-of-type {
                 text-align: center;
             }
@@ -47,6 +59,14 @@
             <div class="col-md-9" role="main">{% include "content.html" %}</div>
         </div>
 
+        <footer class="col-md-12">
+            <hr>
+            {% if config.copyright %}
+            <p>{{ config.copyright }}</p>
+            {% endif %}
+            <p>Documentation built with <a href="http://www.mkdocs.org/">MkDocs</a>.</p>
+        </footer>
+
         {% if include_search %}{% include "search.html" %}{% endif %}
 
         <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
diff --git a/mkdocs/themes/mkdocs/css/base.css b/mkdocs/themes/mkdocs/css/base.css
index 649c6ff8..a388e705 100644
--- a/mkdocs/themes/mkdocs/css/base.css
+++ b/mkdocs/themes/mkdocs/css/base.css
@@ -1,5 +1,12 @@
 body {
     padding-top: 70px;
+    background: url(../img/grid.png) repeat-x;
+    background-attachment: fixed;
+    background-color: #f8f8f8;
+}
+
+body > div.container {
+    min-height: 400px;
 }
 
 ul.nav li.main {
@@ -42,16 +49,26 @@ hr {
     border-top: 1px solid #aaa;
 }
 
-body {
-    background: url(../img/grid.png) repeat-x;
-    background-attachment: fixed;
-    background-color: #f8f8f8;
+pre {
+    overflow: auto;
+}
+
+pre code {
+    word-wrap: normal;
+    white-space: pre;
 }
 
 div.well, pre.well {
     background-color: #eee;
 }
 
+footer {
+    margin-top: 30px;
+    margin-bottom: 10px;
+    text-align: center;
+    font-weight: 200;
+}
+
 .modal-dialog {
     margin-top: 60px;
 }