diff --git a/templates/base.html b/templates/base.html
index c26a2ad894..412b3be5c4 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -16,14 +16,16 @@ <h1>
                 src="/assets/{{ __version__ }}/logo.png" 
                 alt="Gittip - Personal Funding" /></a>
         </h1>
-        {% block heading %}
-        {% if not user.ANON and user.id != username %}
+        {% if user.ANON %}
+        <div id="you-are">Sign in using <a 
+                href="{{ github.oauth_url(website, u'opt-in') }}">GitHub</a>.</div>
+        {% else %}
         <div id="you-are">
-            You are <a href="/{{ user.id }}/">{{ user.id }}</a>.
-            <span class="small"><a href="/sign-out.html">Sign out</a></span>
+            You are <b><a href="/{{ user.id }}/">{{ user.id }}</a></b>.
+            <span class="small"><a href="/sign-out.html">Sign out</a>.</span>
         </div>
-        {% end %} 
         {% end %}
+        {% block heading %}{% end %}
         {% block body %}{% end %}
     </div>
     <script type="text/javascript">
diff --git a/www/about/leaderboard.html b/www/about/leaderboard.html
index 8cb763aa89..f4c83db75b 100644
--- a/www/about/leaderboard.html
+++ b/www/about/leaderboard.html
@@ -1,142 +1,3 @@
-from gittip import db
 ^L
-
-receivers = db.fetchall("""
-
-    SELECT tippee, claimed_time, sum(amount) AS amount
-      FROM (    SELECT DISTINCT ON (tipper, tippee)
-                       amount
-                     , tippee
-                  FROM tips 
-                  JOIN participants p ON p.id = tipper
-                  JOIN social_network_users snu ON snu.participant_id = tippee
-                 WHERE last_bill_result = ''
-                   AND snu.is_locked = false
-              ORDER BY tipper, tippee, mtime DESC
-              ) AS foo
-      JOIN participants p ON p.id = tippee
-  GROUP BY tippee, claimed_time
-  ORDER BY amount DESC
-  LIMIT 10
-
-""")
-
-givers = db.fetchall("""
-
-    SELECT tipper, shares_giving, sum(amount) AS amount
-      FROM (    SELECT DISTINCT ON (tipper, tippee)
-                       amount
-                     , tipper
-                  FROM tips 
-                  JOIN participants p ON p.id = tipper
-                  JOIN social_network_users snu ON snu.participant_id = tippee
-                 WHERE last_bill_result = ''
-                   AND snu.is_locked = false
-              ORDER BY tipper, tippee, mtime DESC
-              ) AS foo
-      JOIN participants p ON p.id = tipper
-  GROUP BY tipper, shares_giving
-  ORDER BY amount DESC
-  LIMIT 10
-
-""")
-
+request.redirect('/')
 ^L
-{% extends templates/base.html %}
-{% block body %}
-<style>
-    TABLE {
-        font: 300 13pt/13pt Lato, sans-serif;
-        }
-    TD {
-        text-align: left;
-        vertical-align: top;
-        padding: 6pt 12pt 6pt 0;
-    }
-    TD.amount {
-        text-align: right;
-    }
-    TR.unclaimed,
-    TR.unclaimed A {
-        color: #B2A196;
-    }
-    TR.unclaimed TD SPAN {
-        font-size: 10pt;
-    }
-    #givers { 
-        float: left;
-    }
-    #receivers {
-        float: right;
-    }
-    H2.clear {
-        padding-top: 36pt;
-    }
-    H3 {
-        margin-top: 12pt;
-    }
-</style>
-
-<p class="below-header"><a href="./">About</a></p>
-
-<h2>Leaderboard
-    <span class="small"><a href="unclaimed.html">Unclaimed</a></span>
-</h2>
-
-<div id="givers">
-
-    <h3 class="first">Top Givers</h3>
-
-    <table>
-        {% for i, giver in enumerate(givers, start=1) %}
-        <tr>
-            <td>{{ i }}.</td>
-            <td class="amount">$</td>
-            <td class="amount">{{ giver['amount'] }}</td>
-            {% if giver['shares_giving'] %}
-            <td><a href="/{{ giver['tipper'] }}/">{{ giver['tipper'] }}</a></td>
-            {% else %}
-            <td class="unclaimed">anonymous</td>
-            {% end %}
-        </tr>
-        {% end %}
-    </table>
-
-</div>
-
-<div id="receivers">
-
-    <h3 class="first">Top Receivers</h3>
-
-    <table>
-        {% for i, receiver in enumerate(receivers, start=1) %}
-        <tr{% if receiver['claimed_time'] is None %} class="unclaimed"{% end %}>
-            <td>{{ i }}.</td>
-            <td class="amount">$</td>
-            <td class="amount">{{ receiver['amount'] }}</td>
-            <td><a href="/{{ receiver['tippee'] }}/">{{ receiver['tippee'] }}</a>
-                {% if receiver['claimed_time'] is None %}<br /><span class="small help">unclaimed!</span>{% end %}
-            </td>
-        </tr>
-        {% end %}
-    </table>
-
-</div>
-
-
-<h2 class="clear">Gittip happens every Friday.</h2>
-
-<p>The amounts above are what the Gittip community is willing to give as
-a weekly gift to each person, but only if the person accepts it. Gittip is
-<b>opt-in</b>. We never collect money on a person&rsquo;s behalf until that
-person opts in by claiming their account.</p>
-
-<p class="help">Amounts are based on tips from people with a 
-{% if user.ANON %}working credit card{% else %}<a href="/credit-card.html">working 
-    credit card</a>{% end %} on file. If a card stops working this week 
-then the actual amount distributed can be lower. If someone doesn&rsquo;t 
-have a working card but does have a positive Gittip balance themselves then
-the actual amount distributed can be higher.  Make sense?</p>
-
-
-{% end %}
diff --git a/www/about/stats b/www/about/stats
index 79d70e51ed..b3c9a1773f 100644
--- a/www/about/stats
+++ b/www/about/stats
@@ -176,7 +176,7 @@ names = ['ncc', 'pcc', 'statements', 'transfer_volume',
 <h2><b>${{ transfer_volume }}</b> changed hands <b>{{ last_friday }}</b>.</h2>
 
 <h2><b>${{ total_backed_tips }}</b> is ready for <b>{{ this_friday }}</b>.
-    <span class="small"><a href="leaderboard.html">Leaderboard</a></span>
+    <span class="small"><a href="unclaimed.html">Unclaimed</a></span>
 </h2>
 
 <p>On average, people who tip tip ${{ "%.2f" % average_tip }} each to 
diff --git a/www/about/unclaimed.html b/www/about/unclaimed.html
index 9c9ffd50c1..8c2bcbb70b 100644
--- a/www/about/unclaimed.html
+++ b/www/about/unclaimed.html
@@ -69,7 +69,7 @@
 <p class="below-header"><a href="./">About</a></p>
 
 <h2>Unclaimed
-    <span class="small"><a href="leaderboard.html">Leaderboard</a></span>
+    <span class="small"><a href="/">Leaderboard</a></span>
 </h2>
 
 <table>
diff --git a/www/assets/%version/gittip.css b/www/assets/%version/gittip.css
index 3ff81a4522..f957d599ad 100644
--- a/www/assets/%version/gittip.css
+++ b/www/assets/%version/gittip.css
@@ -92,7 +92,7 @@ BLOCKQUOTE {
 
 #you-are {
     position: absolute;
-    top: 34pt;
+    top: 0;
     right: 0;
 }
 #their-voice {
diff --git a/www/index.html b/www/index.html
index f8a7bf7c61..3f652849dc 100644
--- a/www/index.html
+++ b/www/index.html
@@ -1,6 +1,46 @@
-from gittip import AMOUNTS
+from gittip import db, AMOUNTS
 from gittip.networks import github
 ^L
+
+receivers = db.fetchall("""
+
+    SELECT tippee, claimed_time, sum(amount) AS amount
+      FROM (    SELECT DISTINCT ON (tipper, tippee)
+                       amount
+                     , tippee
+                  FROM tips 
+                  JOIN participants p ON p.id = tipper
+                  JOIN social_network_users snu ON snu.participant_id = tippee
+                 WHERE last_bill_result = ''
+                   AND snu.is_locked = false
+              ORDER BY tipper, tippee, mtime DESC
+              ) AS foo
+      JOIN participants p ON p.id = tippee
+  GROUP BY tippee, claimed_time
+  ORDER BY amount DESC
+  LIMIT 10
+
+""")
+
+givers = db.fetchall("""
+
+    SELECT tipper, shares_giving, sum(amount) AS amount
+      FROM (    SELECT DISTINCT ON (tipper, tippee)
+                       amount
+                     , tipper
+                  FROM tips 
+                  JOIN participants p ON p.id = tipper
+                  JOIN social_network_users snu ON snu.participant_id = tippee
+                 WHERE last_bill_result = ''
+                   AND snu.is_locked = false
+              ORDER BY tipper, tippee, mtime DESC
+              ) AS foo
+      JOIN participants p ON p.id = tipper
+  GROUP BY tipper, shares_giving
+  ORDER BY amount DESC
+  LIMIT 10
+
+""")
 ^L
 {% extends templates/base.html %}
 
@@ -19,65 +59,107 @@
         #jump INPUT {
             width: 6em;
         }
+
+        TABLE {
+            font: 300 13pt/13pt Lato, sans-serif;
+            }
+        TD {
+            text-align: left;
+            vertical-align: top;
+            padding: 6pt 12pt 6pt 0;
+        }
+        TD.amount {
+            text-align: right;
+        }
+        TR.unclaimed,
+        TR.unclaimed A {
+            color: #B2A196;
+        }
+        TR.unclaimed TD SPAN {
+            font-size: 10pt;
+        }
+        #givers { 
+            float: left;
+        }
+        #receivers {
+            float: right;
+        }
+        H2.clear {
+            padding-top: 36pt;
+        }
+        H3 {
+            margin-top: 12pt;
+        }
     </style>
 
 {% end %}
 {% block body %}
-    {% if user.ANON %}
-    <h2 class="first">Step 1. Sign in using <a 
-            href="{{ github.oauth_url(website, u'opt-in') }}">GitHub</a>.</h2>
-
-    <h2>Step 2. Tip someone!</h2>
 
-    {% else %}
-    <div id="you-are">
-        You are <b><a href="/{{ user.id }}/">{{ user.id }}</a></b>.
-        <span class="small"><a href="/sign-out.html">Sign out</a>.</span>
-    </div>
+    <h2>Tip someone!</h3> 
+    <form id="jump">
+    Enter a GitHub username:
+        <input placeholder="" />
+        <button class="selected small" type="submit">Go</button>
+    </form>
 
-    <h2>Tip someone!</h2>
-    {% end %}
 
-    <p>Here are some great programmers, for example.<br />
-    <span class="help">Each has agreed to be listed here.</span></p>
+    <h2>Leaderboard
+        <span class="small"><a href="/about/unclaimed.html">Unclaimed</a></span>
+    </h2>
 
-    <ul>
+    <div id="givers">
 
-        <li><a href="/github/jeresig/"><b>John Resig</b></a>,
-        author of jQuery</a></li>
+        <h3 class="first">Top Givers</h3>
 
-        <li><a href="/antirez/"><b>Salvatore Sanfilippo</b></a>,
-        author of Redis</a></li>
+        <table>
+            {% for i, giver in enumerate(givers, start=1) %}
+            <tr>
+                <td>{{ i }}.</td>
+                <td class="amount">$</td>
+                <td class="amount">{{ giver['amount'] }}</td>
+                {% if giver['shares_giving'] %}
+                <td><a href="/{{ giver['tipper'] }}/">{{ giver['tipper'] }}</a></td>
+                {% else %}
+                <td class="unclaimed">anonymous</td>
+                {% end %}
+            </tr>
+            {% end %}
+        </table>
 
-        <li><a href="/wycats/"><b>Yehuda Katz</b></a>,
-        Rails and jQuery core dev</a></li>
+    </div>
 
-        <li><a href="/fabpot/"><b>Fabien Potencier</b></a>,
-        founder of Symfony</a></li>
+    <div id="receivers">
 
-        <li><a href="/mitsuhiko/"><b>Armin Ronacher</b></a>,
-        author of Flask, etc.</a></li>
+        <h3 class="first">Top Receivers</h3>
 
-        <li><a href="/jtauber/"><b>James Tauber</b></a>,
-        Pinax lead, Django core dev, etc.</a></li>
+        <table>
+            {% for i, receiver in enumerate(receivers, start=1) %}
+            <tr{% if receiver['claimed_time'] is None %} class="unclaimed"{% end %}>
+                <td>{{ i }}.</td>
+                <td class="amount">$</td>
+                <td class="amount">{{ receiver['amount'] }}</td>
+                <td><a href="/{{ receiver['tippee'] }}/">{{ receiver['tippee'] }}</a>
+                    {% if receiver['claimed_time'] is None %}<br /><span class="small help">unclaimed!</span>{% end %}
+                </td>
+            </tr>
+            {% end %}
+        </table>
 
-        <li><a href="/kennethreitz/"><b>Kenneth Reitz</b></a>,
-        author of Requests, etc.</a></li>
+    </div>
 
-        <li><a href="/alex/"><b>Alex Gaynor</b></a>,
-        Django and PyPy core dev</a></li>
 
-        <li><a href="/taylorotwell/"><b>Taylor Otwell</b></a>,
-        author of Laravel</a></li>
-    
-    </ul>
+    <h2 class="clear">Gittip happens every Friday.</h2>
 
+    <p>The amounts above are what the Gittip community is willing to give as
+    a weekly gift to each person, but only if the person accepts it. Gittip is
+    <b>opt-in</b>. We never collect money on a person&rsquo;s behalf until that
+    person opts in by claiming their account.</p>
 
-    <h3>Find someone else.</h3> 
-    <form id="jump">
-    Enter a GitHub username:
-        <input placeholder="" />
-        <button class="selected small" type="submit">Go</button>
-    </form>
+    <p class="help">Amounts are based on tips from people with a 
+    {% if user.ANON %}working credit card{% else %}<a href="/credit-card.html">working 
+        credit card</a>{% end %} on file. If a card stops working this week 
+    then the actual amount distributed can be lower. If someone doesn&rsquo;t 
+    have a working card but does have a positive Gittip balance themselves then
+    the actual amount distributed can be higher.  Make sense?</p>
 
 {% end %}