diff --git a/pages/index.mako b/pages/index.mako
index e6503a1..84bf980 100644
--- a/pages/index.mako
+++ b/pages/index.mako
@@ -1,7 +1,9 @@
 <%include file="/support/header.mako" args="environ=environ, title='Home'"/>
             <div id="content">
-% for key, value in environ.items():
-                <p><b>${key}</b>: ${value}</p>
-% endfor
+            % for key, value in environ.items():
+                % if key != "PATH":
+                    <p><b>${key}</b>: ${value}</p>
+                % endif
+            % endfor
             </div>
-<%include file="/support/footer.mako"/>
+<%include file="/support/footer.mako" args="environ=environ"/>
diff --git a/pages/support/footer.mako b/pages/support/footer.mako
index 8372f4a..48975b8 100644
--- a/pages/support/footer.mako
+++ b/pages/support/footer.mako
@@ -1,9 +1,28 @@
-            <div id="footer">
-                <p>Copyright &copy; 2009&ndash;2012 <a href="http://earwig.github.com/">Ben Kurtovic</a> / <a href="http://en.wikipedia.org/wiki/User:The_Earwig">The Earwig</a> &bull; \
-                <a href="mailto:earwig@toolserver.org">Contact</a> &bull; \
-                <a href="https://github.com/earwig/toolserver">View Source</a> &bull; \
-                <a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0 Strict</a></p>
-            </div>
+<%page args="environ"/>\
+<%!
+    from os import path
+%>\
+<% root = path.dirname(environ["SCRIPT_NAME"]) %>\
+        </div>
+        <div id="footer">
+            <div id="foot-divider"></div>
+            <table id="footer">
+                <tr>
+                    <td>
+                        <a href="http://wiki.toolserver.org/"><img src="${root}/static/images/toolserver-button.png" title="Powered by the Wikimedia Toolserver" alt="Powered by the Wikimedia Toolserver" /></a>
+                    </td>
+                    <td>
+                        <p>Copyright &copy; 2009&ndash;2012 <a href="http://earwig.github.com/">Ben Kurtovic</a> &bull; \
+                            <a href="mailto:earwig@toolserver.org">Contact</a> &bull; \
+                            <a href="https://github.com/earwig/toolserver">View Source</a> &bull; \
+                            <a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0 Strict</a>
+                        </p>
+                    </td>
+                    <td>
+                        <a href="http://en.wikipedia.org/wiki/User:The_Earwig"><img src="${root}/static/images/earwig-button.png" title="Powered by Earwig Technology" alt="Powered by Earwig Technology" /></a>
+                    </td>
+                </tr>
+            </table>
         </div>
     </body>
 </html>
\ No newline at end of file
diff --git a/pages/support/header.mako b/pages/support/header.mako
index c27d970..a95c9af 100644
--- a/pages/support/header.mako
+++ b/pages/support/header.mako
@@ -8,7 +8,7 @@
     <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
         <title>${title} - earwig@toolserver</title>
-        <link rel="stylesheet" href="${root}/static/main.css" type="text/css" />
+        <link rel="stylesheet" href="${root}/static/css/main.css" type="text/css" />
     </head>
     <body>
         <div id="container">
\ No newline at end of file
diff --git a/static/main.css b/static/css/main.css
similarity index 65%
rename from static/main.css
rename to static/css/main.css
index 7a28934..2d0527d 100644
--- a/static/main.css
+++ b/static/css/main.css
@@ -2,12 +2,12 @@ body {
     font-family: helvetica, arial, clean, sans-serif;
     font-size: 14px;
     color: #000;
-    background-color: #E0E0E0;
+    background-color: #EEE;
 }
 
 div#container {
     width: 800px;
-    margin: 20px auto 32px auto;
+    margin: 20px auto 65px auto;
     border: 1px solid #999;
     border-radius: 10px;
     background-color: #FFF;
@@ -18,10 +18,21 @@ div#content {
 }
 
 div#footer {
-    font-size: 11px;
+    position: fixed;
+    width: 100%;
+    height: 45px;
+    bottom: 0;
+    font-size: 12px;
     text-align: center;
-    padding: 9px 4px 12px 4px;
-    color: #222;
+    background-color: #EEE;
+}
+
+div#foot-divider {
+    border-bottom: 1px solid #999;
+}
+
+table#footer {
+    width: 100%;
 }
 
 a:link { color: #373; text-decoration: none; }
diff --git a/static/images/earwig-button.png b/static/images/earwig-button.png
new file mode 100644
index 0000000..6eb786a
Binary files /dev/null and b/static/images/earwig-button.png differ
diff --git a/static/images/toolserver-button.png b/static/images/toolserver-button.png
new file mode 100644
index 0000000..48708c5
Binary files /dev/null and b/static/images/toolserver-button.png differ
