diff --git a/app/views/shared/_group_nav.haml b/app/views/shared/_group_nav.haml
index 8dee94dc9..6e400001d 100644
--- a/app/views/shared/_group_nav.haml
+++ b/app/views/shared/_group_nav.haml
@@ -1,7 +1,5 @@
 #group_nav
   %ul
-    %li{:class => ("selected" if @group == :all)}
-      = link_to "All Groups", root_url
     - for group in @groups
       %li{:id => group.id, :class => ("selected" if current_group?(group))}
         %span.group_name
@@ -12,6 +10,10 @@
     #group_edit_button
       = link_to "edit", edit_group_path(Group.first), :class => "edit_group_button", :title => "Manage your facets."
 
+  %ul{ :style => "position:absolute;right:0;bottom:0;"}
+    %li{:class => ("selected" if @group == :all)}
+      = link_to "All Groups", root_url
+
   .yo{ :style => "display:none;"}
     #add_group_pane
       = render "groups/new_group"
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 9a6a61cbc..709db609b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -458,9 +458,12 @@ h1.big_text {
       color: #999999; }
   #group_nav ul {
     margin-bottom: 0;
+    margin-right: 0;
     padding: 0;
       padding-bottom: 0px;
       padding-top: 35px;
+      padding-right: 0;
+    display: inline-block;
     list-style: none;
     font-size: 14px; }
     #group_nav ul > li {
@@ -469,6 +472,8 @@ h1.big_text {
       margin-right: 0.5em;
       padding: 3px 8px;
       border: 1px solid #555555; }
+      #group_nav ul > li.last-child {
+        margin-right: 0; }
       #group_nav ul > li a {
         color: #999999; }
         #group_nav ul > li a:hover {
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 76a14df91..2e9454234 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -583,9 +583,12 @@ h1.big_text
   ul
     :margin
       :bottom 0
+      :right 0
     :padding 0
       :bottom 0px
       :top 35px
+      :right 0
+    :display inline-block
     :list
       :style none
     :font
@@ -601,6 +604,10 @@ h1.big_text
 
       :border 1px solid #555
 
+      &.last-child
+        :margin
+          :right 0
+
       a
         :color #999
         &:hover
diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass
index ee01e08bc..e680232e6 100644
--- a/public/stylesheets/sass/ui.sass
+++ b/public/stylesheets/sass/ui.sass
@@ -89,8 +89,6 @@ ul.button_set
 .right
   :position absolute
   :right 0
-  :margin
-    :top 5px
 
 .contextual_pane
   :z-index 20
diff --git a/public/stylesheets/ui.css b/public/stylesheets/ui.css
index dd791bafb..6a0dd8850 100644
--- a/public/stylesheets/ui.css
+++ b/public/stylesheets/ui.css
@@ -57,8 +57,7 @@ ul.button_set {
 
 .right {
   position: absolute;
-  right: 0;
-  margin-top: 5px; }
+  right: 0; }
 
 .contextual_pane {
   z-index: 20;