diff --git a/app/assets/stylesheets/gitlab_bootstrap/lists.scss b/app/assets/stylesheets/gitlab_bootstrap/lists.scss
index 0fa4da44de5ddc20ec38c39f1fabc673b65caec1..cc7084d27d5678123fab0092eb1f492c4628c328 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/lists.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/lists.scss
@@ -75,7 +75,6 @@ ul.bordered-list {
     display: block;
     margin: 0px;
     &:last-child { border:none }
-
     &.active {
       background: #f9f9f9;
       a { font-weight: bold; }
diff --git a/app/assets/stylesheets/sections/snippets.scss b/app/assets/stylesheets/sections/snippets.scss
index feeca655cb18053df12ffc92f92aa503629f2ee9..7dab0bfe0146cd17ca224ad687411ae35485baa1 100644
--- a/app/assets/stylesheets/sections/snippets.scss
+++ b/app/assets/stylesheets/sections/snippets.scss
@@ -7,3 +7,9 @@
     }
   }
 }
+
+.my-snippets li:first-child {
+  h4 { margin-top: 0; }
+  padding-top: 0;
+}
+
diff --git a/app/views/snippets/_snippet.html.haml b/app/views/snippets/_snippet.html.haml
index cdad949f0bc4795bc54e3234253814406626c3ec..9689c9c4d38a9a532a908f5df58190cde909a238 100644
--- a/app/views/snippets/_snippet.html.haml
+++ b/app/views/snippets/_snippet.html.haml
@@ -17,6 +17,7 @@
     = "##{snippet.id}"
     %span
       by
-      = image_tag gravatar_icon(snippet.author_email), class: "avatar avatar-inline s16", alt: ''
-      = snippet.author_name
+      = link_to user_snippets_path(snippet.author) do
+        = image_tag gravatar_icon(snippet.author_email), class: "avatar avatar-inline s16", alt: ''
+        = snippet.author_name
       %span.light #{time_ago_in_words(snippet.created_at)} ago
diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml
index 1d9b60f73314d4a58f6d71472c57a4af8b46232b..b60026f458463d0d48e419f5bc7d31400c305300 100644
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@@ -19,6 +19,6 @@
       = nav_tab :scope, 'public' do
         = link_to "Public", user_snippets_path(@user, scope: 'public')
 
-  .span9
+  .span9.my-snippets
     = render 'snippets'
 
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 1502a6698fe1a160c3b43fdbfe510d5d5d8c74fa..c65ed4fb9df20add66243af0b0ecf243286ad635 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -9,7 +9,5 @@
       My snippets
 
 %hr
-.row
-  .span12
-    = render 'snippets'
+= render 'snippets'
 
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index 811e429d22a89438fc976238e7c4c966e4eff046..5cf1fefe5f08c54bc1160ddfc4e9acdbfd66da54 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -16,8 +16,9 @@
     = "##{@snippet.id}"
     %span.light
       by
-      = image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
-      = @snippet.author_name
+      = link_to user_snippets_path(@snippet.author) do
+        = image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
+        = @snippet.author_name
 
   .back-link
     - if @snippet.author == current_user
diff --git a/app/views/snippets/user_index.html.haml b/app/views/snippets/user_index.html.haml
index a9563b75e796bb97c4c75a3e2a5a68fd1f7b95ae..49636c3f5f0a7ddd52e496fd492c4d71dd67334a 100644
--- a/app/views/snippets/user_index.html.haml
+++ b/app/views/snippets/user_index.html.haml
@@ -4,7 +4,6 @@
   %span
     \/
     Snippets
-  %small share code pastes with others out of git repository
   = link_to new_snippet_path, class: "btn btn-small add_new pull-right", title: "New Snippet" do
     Add new snippet