diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 6adb2fe3..6250bf3c 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -37,11 +37,9 @@
                   {% endblock %}{% block mediagoblin_header_title %}{% endblock %}
             <div class="mediagoblin_header_right">
               {% if request.user %}
-                    {{ request.user['username'] }}'s account 
                     <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
-                                                user= request.user['username']) }}">home</a> 
-                    <a href="{{ request.urlgen('mediagoblin.user_pages.user_gallery',
-                                                user= request.user['username']) }}">gallery</a> 
+                                                user= request.user['username']) }}">
+                                                {{ request.user['username'] }}</a>'s account 
                     (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)
               {% else %}
                     <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
index 1d8fbdaa..33732d0d 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
@@ -26,9 +26,9 @@
 
 {% block mediagoblin_content -%}
   {% if user %}
-    <h1>gallery for <a href="{{ request.urlgen(
+    <h1><a href="{{ request.urlgen(
 	                            'mediagoblin.user_pages.user_home',
-                                 user=user.username) }}">{{ user.username }}</a></h1>
+                                 user=user.username) }}">{{ user.username }}</a>'s media</h1>
 
     {% include "mediagoblin/utils/object_gallery.html" %}
 
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index f7a9f3c9..99e46a72 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -26,12 +26,16 @@
 
 {% block mediagoblin_content -%}
   {% if user %}
-    <h1>User page for '{{ user.username }}'</h1>
+    <h1>{{ user.username }}'s profile</h1>
     
     {% include "mediagoblin/utils/profile.html" %}
 
     {% include "mediagoblin/utils/object_gallery.html" %}
 
+    <p><a href="{{ request.urlgen('mediagoblin.user_pages.user_gallery',
+                    user= request.user['username']) }}">View all of {{ user.username }}'s media</a></p> 
+
+
     <a href={{ request.urlgen(
                    'mediagoblin.user_pages.atom_feed',
                    user=user.username) }}> atom feed</a>