diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index a390514d0..79f7941aa 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -20,6 +20,15 @@ a {
     background-color: #556270;
     background-color: #019dbe; }
 
+h1 {
+  font-size: 21px;
+  font-weight: bold;
+  line-height: 36px; }
+
+h3 {
+  font-size: 18px;
+  font-weight: bold; }
+
 .avatar {
   width: 50px;
   height: 50px; }
@@ -82,26 +91,22 @@ header {
   padding: 0;
     padding-top: 5px;
   border-bottom: 1px solid #cccccc; }
+  header a {
+    color: #999999; }
+    header a:hover {
+      background: none;
+      color: #eeeeee; }
   header #diaspora_text {
     display: inline;
     font-family: "BrandonGrotesqueLightRegular";
     font-size: 16px;
     border: none;
     color: white; }
-    header #diaspora_text a {
-      color: #999999; }
-    header #diaspora_text a:hover {
-      color: white;
-      background: none; }
-    header #diaspora_text span.sub_text {
-      text-shadow: none; }
   header #session_action {
-    top: 0;
     position: absolute;
     display: inline;
+    top: 0;
     right: 0; }
-    header #session_action a {
-      color: #999999; }
     header #session_action ul {
       list-style: none;
       padding: 0;
@@ -113,7 +118,6 @@ header {
         header #session_action ul li:last-child {
           margin-right: 0; }
   header #group_header {
-    z-index: 5;
     text-shadow: 0 2px 0 white;
     background-color: #eeeeee;
     border-top: 1px solid #555555;
@@ -129,19 +133,6 @@ header {
     header #group_header .page_title {
       text-transform: uppercase; }
 
-#show_filters {
-  z-index: 100;
-  position: absolute;
-  right: 0;
-  text-align: right; }
-
-#show_filters > a {
-  border: 1px solid #666666;
-  padding: 5px; }
-
-#main {
-  width: 100%; }
-
 ul#stream {
   margin: 0;
   padding: 0; }
@@ -172,20 +163,6 @@ li.message {
     color: #bababa;
     font-size: 70%; }
 
-h1 {
-  position: relative;
-  font-size: 21px;
-  font-weight: bold;
-  line-height: 36px; }
-  h1 p.description, h1 span.description, h1 .description {
-    font-weight: 200;
-    color: #999999; }
-
-h3 {
-  position: relativex;
-  font-size: 18px;
-  font-weight: bold; }
-
 form {
   position: relative;
   font-size: 120%;
@@ -437,7 +414,7 @@ h1.big_text {
 #content_bottom {
   position: relative;
   line-height: 36px;
-  margin: 0 25px;
+  margin: 0;
     margin-top: 25px;
     margin-bottom: 25px;
   min-height: 36px;
@@ -487,15 +464,11 @@ h1.big_text {
       #group_nav ul > li a {
         background-color: #444444;
         border: 1px solid #555555;
-        -webkit-border-radius: 3;
-        position: relative;
         padding: 3px 8px;
         color: #999999; }
         #group_nav ul > li a:hover {
-          background: none; }
-      #group_nav ul > li:hover a {
-        background-color: #555555;
-        color: #cccccc; }
+          background-color: #555555;
+          color: #cccccc; }
       #group_nav ul > li.selected a {
         padding-top: 5px;
         padding-bottom: 3px;
@@ -509,12 +482,6 @@ h1.big_text {
         #group_nav ul > li.selected a a {
           color: black; }
 
-#add_photo_loader {
-  position: absolute;
-  display: none;
-  left: -25px;
-  top: 4px; }
-
 #global_search {
   display: inline;
   position: relative;
@@ -538,11 +505,6 @@ h1.big_text {
       font-size: 12px;
       margin-top: -3px; }
 
-.editing,
-.editing:hover {
-  background-color: yellow;
-  border: 1px #666666 solid; }
-
 .group,
 .requests,
 .remove {
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 662e7f2d3..3e1e23c15 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -21,6 +21,18 @@ a
       :color #556270
       :color #019DBE
 
+h1
+  :font
+    :size 21px
+    :weight bold
+  :line
+    :height 36px
+
+h3
+  :font
+    :size 18px 
+    :weight bold
+
 .avatar
   :width 50px
   :height 50px
@@ -90,6 +102,13 @@ header
   :border
     :bottom 1px solid #ccc
 
+  a
+    :color #999
+
+    &:hover
+      :background none
+      :color #eee
+
   #diaspora_text
     :display inline
     :font
@@ -98,25 +117,12 @@ header
     :border none
     :color #fff
 
-    a
-      :color #999
-
-    a:hover
-      :color #fff
-      :background none
-
-    span.sub_text
-      :text
-        :shadow none
-      
   #session_action
-    :top 0
     :position absolute
     :display inline
-    :right 0
 
-    a
-      :color #999
+    :top 0
+    :right 0
 
     ul
       :list
@@ -135,7 +141,6 @@ header
             :right 0
 
   #group_header
-    :z-index 5
     :text-shadow 0 2px 0 #fff
     :background
       :color #eee
@@ -159,18 +164,6 @@ header
         :transform uppercase
 
 
-#show_filters
-  :z-index 100
-  :position absolute
-  :right 0
-  :text-align right
-
-#show_filters > a
-  :border 1px solid #666
-  :padding 5px
-#main
-  :width 100%
-
 ul#stream
   :margin 0
   :padding 0
@@ -214,24 +207,6 @@ li.message
       :color #bababa
       :font-size 70%
 
-h1
-  :position relative
-  :font
-    :size 21px
-    :weight bold
-  :line-height 36px
-
-  p.description, span.description, .description
-    :font
-      :weight 200
-    :color #999
-
-
-h3
-  :position relativex
-  :font
-    :size 18px 
-    :weight bold
 
 form
   :position relative
@@ -561,7 +536,7 @@ h1.big_text
   :position relative
   :line-height 36px
 
-  :margin 0 25px
+  :margin 0
     :top 25px
     :bottom 25px 
 
@@ -632,18 +607,13 @@ h1.big_text
           :color #444
         :border 1px solid #555
 
-        :-webkit-border-radius 3
-
-        :position relative
         :padding 3px 8px
         :color #999
-        &:hover
-          :background none
 
-      &:hover a
-        :background
-          :color #555
-        :color #ccc
+        &:hover
+          :background
+            :color #555
+          :color #ccc
 
       &.selected a
         :padding
@@ -664,12 +634,6 @@ h1.big_text
         a
           :color #000
 
-#add_photo_loader
-  :position absolute
-  :display none
-  :left -25px
-  :top 4px
-
 
 #global_search
   :display inline
@@ -703,13 +667,6 @@ h1.big_text
       :margin
         :top -3px
 
-.editing,
-.editing:hover
-  :background
-    :color yellow
-  :border 1px #666 solid
-
-
 .group,
 .requests,
 .remove
diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass
index 4ab3ace9d..57057a31a 100644
--- a/public/stylesheets/sass/ui.sass
+++ b/public/stylesheets/sass/ui.sass
@@ -48,10 +48,6 @@
     :border
       :top 1px solid #ccc
 
-input.button
-  :padding 5px
-    :bottom 6px
-
 ul.button_set
 
   :padding
diff --git a/public/stylesheets/ui.css b/public/stylesheets/ui.css
index 685087fbc..6a0dd8850 100644
--- a/public/stylesheets/ui.css
+++ b/public/stylesheets/ui.css
@@ -32,10 +32,6 @@
     background: -moz-linear-gradient(top, #f0f0f0, #fafafa);
     border-top: 1px solid #cccccc; }
 
-input.button {
-  padding: 5px;
-    padding-bottom: 6px; }
-
 ul.button_set {
   padding-left: 0;
   padding-right: 0; }