diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 6f9fdbce3..3e3a37ecd 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -7,7 +7,7 @@
     %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
     
     = stylesheet_link_tag "blueprint/screen", :media => 'screen'
-    = stylesheet_link_tag "application", "ui", 'bubble'
+    = stylesheet_link_tag "application", "ui"
 
     = stylesheet_link_tag "/../javascripts/fancybox/jquery.fancybox-1.3.1" 
     = stylesheet_link_tag "fileuploader" 
diff --git a/public/images/diaspora.png b/public/images/diaspora.png
deleted file mode 100644
index 7241f0db3..000000000
Binary files a/public/images/diaspora.png and /dev/null differ
diff --git a/public/images/loader.gif b/public/images/loader.gif
deleted file mode 100644
index 570a3cb9e..000000000
Binary files a/public/images/loader.gif and /dev/null differ
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index a458f26d4..a390514d0 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -83,7 +83,6 @@ header {
     padding-top: 5px;
   border-bottom: 1px solid #cccccc; }
   header #diaspora_text {
-    z-index: 6;
     display: inline;
     font-family: "BrandonGrotesqueLightRegular";
     font-size: 16px;
@@ -101,6 +100,8 @@ header {
     position: absolute;
     display: inline;
     right: 0; }
+    header #session_action a {
+      color: #999999; }
     header #session_action ul {
       list-style: none;
       padding: 0;
@@ -356,7 +357,8 @@ label {
     margin-right: 15px; }
   #publisher p {
     position: absolute;
-    left: 0; }
+    left: 0;
+    top: 0; }
   #publisher form {
     display: inline; }
     #publisher form input[type='submit'] {
@@ -465,6 +467,7 @@ h1.big_text {
   display: none; }
 
 #group_nav {
+  z-index: 4;
   position: relative;
   color: black;
   margin-top: 8px;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index b0598db15..662e7f2d3 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -91,7 +91,6 @@ header
     :bottom 1px solid #ccc
 
   #diaspora_text
-    :z-index 6
     :display inline
     :font
       :family 'BrandonGrotesqueLightRegular'
@@ -116,6 +115,9 @@ header
     :display inline
     :right 0
 
+    a
+      :color #999
+
     ul
       :list
         :style none
@@ -452,6 +454,7 @@ label
   p
     :position absolute
     :left 0 
+    :top 0
   
   form
     :display inline
@@ -597,6 +600,7 @@ h1.big_text
     :display none
 
 #group_nav
+  :z-index 4
   :position relative
   :color #000
   :margin