diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index eb5e5dd55..a567062a5 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -55,6 +55,8 @@
             %li= link_to "home", root_path
             %li= link_to "photos", albums_path
             %li= link_to "ostatus", ostatus_path
+            %li= "|"
+            %li= link_to "edit profile", edit_user_path(current_user)
 
     .container
       .span-24.last
@@ -63,9 +65,6 @@
           = yield
 
         .span-3.last
-          = link_to "Edit your profile", edit_user_path(current_user)
-          %br
-          %br
           = render 'people/sidebar' if user_signed_in?
 
         .span-24.last
diff --git a/app/views/people/_sidebar.html.haml b/app/views/people/_sidebar.html.haml
index cd0f3ab62..278b5f80b 100644
--- a/app/views/people/_sidebar.html.haml
+++ b/app/views/people/_sidebar.html.haml
@@ -5,10 +5,12 @@
 
   %li= link_to "view all", people_path
   
-  %hr
+  %br
+  %br
+
   %h3 following
 
   - for author in @subscribed_persons
     %li= link_to author.username, author_path(author)
 
-= link_to "add a new person", requests_path
\ No newline at end of file
+= link_to "add a new person", requests_path
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 4f9b560c2..c0467eeea 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -64,7 +64,7 @@ a {
 header {
   position: relative;
   margin: -2em;
-    margin-bottom: 60px;
+    margin-bottom: 30px;
   color: #555555;
   background-color: #2b2726;
   border-bottom: 3px solid #333333;
@@ -160,7 +160,7 @@ form {
   margin-left: 0em; }
 
 #user_name {
-  margin-bottom: 3em; }
+  margin-bottom: 20px; }
   #user_name img {
     margin-right: 10px;
     display: inline-block;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 64b37390f..408841d47 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -68,7 +68,7 @@ a
 header
   :position relative
   :margin -2em
-    :bottom 60px
+    :bottom 30px
   :color #555
   :background
     :color #2B2726
@@ -189,7 +189,7 @@ form
   
 #user_name
   :margin
-    :bottom 3em
+    :bottom 20px
   
   img
     :margin