diff --git a/Gemfile.lock b/Gemfile.lock
index 98f12a800..88238b6d0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -118,6 +118,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.3)
+    columnize (0.3.1)
     crack (0.1.8)
     cucumber (0.9.2)
       builder (~> 2.1.2)
@@ -156,6 +157,7 @@ GEM
     i18n (0.4.1)
     json (1.4.6)
     json_pure (1.4.6)
+    linecache (0.43)
     mail (2.2.7)
       activesupport (>= 2.3.6)
       mime-types
@@ -218,6 +220,11 @@ GEM
     rspec-rails (2.0.0.beta.17)
       rspec (>= 2.0.0.beta.14)
       webrat (>= 0.7.0)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
     rubyzip (0.9.4)
     selenium-webdriver (0.0.28)
       ffi (>= 0.6.1)
@@ -277,6 +284,7 @@ DEPENDENCIES
   roxml!
   rspec (>= 2.0.0.beta.17)
   rspec-rails (= 2.0.0.beta.17)
+  ruby-debug
   sprinkle!
   thin
   webmock
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 4e5f7c3c6..6596fd00d 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -15,6 +15,8 @@ a {
   text-decoration: none; }
   a:hover {
     color: #22aae0; }
+  a:active {
+    color: #005d9c; }
 
 h1, h2, h3, h4 {
   color: #444444; }
@@ -174,6 +176,8 @@ li.message {
           color: #bbbbbb; }
           li.message .content .from .aspect a:hover {
             text-decoration: underline; }
+          li.message .content .from .aspect a:active {
+            color: #999999; }
         li.message .content .from .aspect ul {
           display: inline;
           margin: 0;
@@ -199,6 +203,10 @@ li.message {
           color: #bbbbbb; }
   li.message:hover div.info a, li.message:hover .time a {
     color: #107fc9; }
+    li.message:hover div.info a:hover, li.message:hover .time a:hover {
+      color: #22aae0; }
+    li.message:hover div.info a:active, li.message:hover .time a:active {
+      color: #005d9c; }
 
 .reshare_pane {
   margin-left: 5px;
@@ -709,6 +717,7 @@ ul#settings_nav {
   background-color: transparent; }
 
 #friend_pictures {
+  margin-top: 12px;
   line-height: 1em; }
   #friend_pictures img {
     margin-right: -1px;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 46f533b82..8c4480cd7 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -20,6 +20,9 @@ a
     :decoration none
   &:hover
     :color #22AAE0
+  &:active
+    :color #005D9C
+    
 
 h1, h2, h3, h4
   :color #444
@@ -225,6 +228,8 @@ li.message
           &:hover
             :text
               :decoration underline
+          &:active
+            :color #999
         ul
           :display inline
           :margin 0
@@ -264,6 +269,10 @@ li.message
     div.info, .time
       a
         :color #107FC9
+        &:hover
+          :color #22AAE0
+        &:active
+          :color #005D9C
 
 .reshare_pane
   :margin
@@ -916,6 +925,8 @@ ul#settings_nav
 
 
 #friend_pictures
+  :margin
+    :top 12px
   :line-height 1em
   img
     :margin-right -1px