diff --git a/templates/base_panels.mako b/templates/base_panels.mako
index 59096af2de9..7fae8751216 100644
--- a/templates/base_panels.mako
+++ b/templates/base_panels.mako
@@ -217,13 +217,12 @@
             %endif
         </ul>
         <ul class="loggedin-only" style="${style2}">
-            <li>Logged in as <span id="user-email">${user_email}</span></li>
-            <li><a target="galaxy_main" href="${h.url_for( controller='root', action='my_data' )}">My Data</a></li>
             %if app.config.use_remote_user:
                 %if app.config.remote_user_logout_href:
                     <li><a href="${app.config.remote_user_logout_href}" target="_top">Logout</a></li>
                 %endif
             %else:
+                <li>Logged in as <span id="user-email">${user_email}</span></li>
                 <li><a target="galaxy_main" href="${h.url_for( controller='user', action='index' )}">Preferences</a></li>
                 <%
                     if app.config.require_login:
@@ -233,7 +232,10 @@
                         logout_target = "galaxy_main"
                         logout_url = h.url_for( controller='user', action='logout' )
                 %>
-                <li><a target="${logout_target}" href="${logout_url}">Logout</a></li>
+                <li><a target="${logout_target}" href="${logout_url}">Logout ${user_email}</a></li>
+                <li><hr style="color: inherit; background-color: gray"/></li>
+                <li><a target="galaxy_main" href="${h.url_for( controller='history', action='list' )}">Histories</a></li>
+                <li><a target="galaxy_main" href="${h.url_for( controller='dataset', action='list' )}">Datasets</a></li>
             %endif
         </ul>
         </div>
diff --git a/templates/root/index.mako b/templates/root/index.mako
index 4a933af9b9d..562f241a1ca 100644
--- a/templates/root/index.mako
+++ b/templates/root/index.mako
@@ -7,10 +7,10 @@
         $("#history-options-button").css( "position", "relative" );
         make_popupmenu( $("#history-options-button"), {
             "History Lists": null,
-            "My Saved Histories": function() {
+            "Saved Histories": function() {
                 galaxy_main.location = "${h.url_for( controller='history', action='list')}";
             },
-            "My Shared Histories": function() {
+            "Shared Histories": function() {
                 galaxy_main.location = "${h.url_for( controller='history', action='list', operation='sharing' )}";
             },
             "Histories Shared with Me": function() {