diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index d62be0ec7..12a5a8089 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -248,9 +248,12 @@ h2 {
 
 /* Rules for tabbed navigation bar */
 
-#tabnav {
-  height: 29px;
+#top-bar {
   border-bottom: 1px solid #ccc;
+  height: 29px;
+}
+
+#tabnav {
   padding: 0;
   margin: 0;
   overflow:hidden;
@@ -293,10 +296,10 @@ h2 {
 /* Rules for greeting bar in the top right corner */
 
 #greeting {
-  height: 30px;
+  height: 28px;
   margin: 0px;
   font-size: 13px;
-  line-height: 30px;
+  line-height: 28px;
 }
 
 .greeting-bar-unread {
diff --git a/app/assets/stylesheets/ltr.css.scss b/app/assets/stylesheets/ltr.css.scss
index 039d901c0..5eba8ddb9 100644
--- a/app/assets/stylesheets/ltr.css.scss
+++ b/app/assets/stylesheets/ltr.css.scss
@@ -68,7 +68,7 @@ html body {
 
 /* Rules for tabbed navigation bar */
 
-#tabnav {
+#top-bar {
   margin-left: 185px;
 }
 
diff --git a/app/assets/stylesheets/rtl.css.scss b/app/assets/stylesheets/rtl.css.scss
index 669889ce9..b9223e522 100644
--- a/app/assets/stylesheets/rtl.css.scss
+++ b/app/assets/stylesheets/rtl.css.scss
@@ -68,15 +68,15 @@ html body {
 
 /* Rules for tabbed navigation bar */
 
-#tabnav {
-  margin-right: 185px;
+#top-bar {
+  margin-right: 185px
 }
 
 #tabnav a,
 #tabnav a:link,
 #tabnav a:visited {
   float: right;
-  margin-left: 4px;
+  margin-left: 1px;
 }
 
 /* Rules for greeting bar in the top right corner */
diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss
index 59a6469ce..412cf7203 100644
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -17,9 +17,11 @@ h1 {
 }
 
 /* Rules for tabbed navigation bar */
+#top-bar {
+  margin: 0;
+}
 
-#tabnav
-{
+#tabnav {
   height: 14px;
   margin: 0px;
   padding-top: 5px;
@@ -28,8 +30,7 @@ h1 {
   line-height: 10px;
 }
 
-#tabnav a, #tabnav a:link, #tabnav a:visited 
-{
+#tabnav a, #tabnav a:link, #tabnav a:visited {
   font-size: 10px;
   line-height: 10px;
   padding: 2px 5px;
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index f43d3b395..b6fb08986 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -12,20 +12,19 @@
       <%= yield %>
     </div>
 
-    <span id="greeting">
-      <% if @user and @user.id %>
-        <span id="full-greeting"><%= raw(t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip'))) %></span> 
-        <span id="small-greeting"><%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %></span> | 
-        <%= yield :greeting %>
-        <%= render :partial => "layouts/inbox" %> |
-        <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.fullpath}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
-      <% else %>
-        <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.fullpath}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> |
-        <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>
-      <% end %>
-    </span>
-
-    <div>
+    <div id='top-bar'>
+      <span id="greeting">
+         <% if @user and @user.id %>
+           <span id="full-greeting"><%= raw(t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip'))) %></span> 
+           <span id="small-greeting"><%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %></span> | 
+           <%= yield :greeting %>
+           <%= render :partial => "layouts/inbox" %> |
+           <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.fullpath}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
+         <% else %>
+           <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.fullpath}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> |
+           <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>
+         <% end %>
+      </span>
       <ul id="tabnav">
         <%
         viewclass = 'geolink llz layers'