diff --git a/static/june_2007_style/blue/panel_layout.css b/static/june_2007_style/blue/panel_layout.css
index c5e47fb9df1..0c52ef48a01 100644
--- a/static/june_2007_style/blue/panel_layout.css
+++ b/static/june_2007_style/blue/panel_layout.css
@@ -283,7 +283,8 @@ div.tab-group
 div.tab-group span.tab
 {
     position: relative;
-    display: inline-block;
+    display: block;
+    float: left;
     margin: 0;
     padding: 0 1em;
     height: 32px;
diff --git a/static/june_2007_style/panel_layout.css.tmpl b/static/june_2007_style/panel_layout.css.tmpl
index 63d0d607107..f8e754ef5cb 100644
--- a/static/june_2007_style/panel_layout.css.tmpl
+++ b/static/june_2007_style/panel_layout.css.tmpl
@@ -285,7 +285,8 @@ div.tab-group
 div.tab-group span.tab
 {
     position: relative;
-    display: inline-block;
+    display: block;
+    float: left;
     margin: 0;
     padding: 0 1em;
     height: 32px;
@@ -301,7 +302,6 @@ div.tab-group > span.tab:hover > a
 div.tab-group > span.active
 {
     background: rgb(1,1,1);
-    ## ,0.5);
 }
 
 div.tab-group span.tab div.submenu {
diff --git a/templates/base_panels.mako b/templates/base_panels.mako
index bbd3d642daf..738bd69db19 100644
--- a/templates/base_panels.mako
+++ b/templates/base_panels.mako
@@ -149,7 +149,7 @@
 	</span>
     
 	<span class="tab">
-	    <a>Account</a>
+	    <a>User</a>
 	    <%
 		if trans.user:
 		    user_email = trans.user.email
@@ -164,12 +164,12 @@
 		<ul class="loggedout-only" style="${style1}">
 		    <li><a target="galaxy_main" href="${h.url_for( controller='user', action='login' )}">Login</a></li>
 		    %if app.config.allow_user_creation:
-			<li><a target="galaxy_main" href="${h.url_for( controller='user', action='create' )}">Create new account</a></li>
+			<li><a target="galaxy_main" href="${h.url_for( controller='user', action='create' )}">Register</a></li>
 		    %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='user', action='index' )}">Manage Account</a></li>
+		    <li><a target="galaxy_main" href="${h.url_for( controller='user', action='index' )}">Preferences</a></li>
 		    <%
 			if app.config.require_login:
 			    logout_target = ""