diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb
index bc4bba110..9b7c7bde5 100644
--- a/app/views/comments/create.js.erb
+++ b/app/views/comments/create.js.erb
@@ -1,5 +1,5 @@
-WebSocketReceiver.processComment(<%= @comment.post_id %>, 
-                                 <%= @comment.id %>,
+WebSocketReceiver.processComment("<%= @comment.post.guid %>", 
+                                 "<%= @comment.guid%>",
                                  "<%= escape_javascript(render(:partial => 'comments/comment', :locals => { :comment => @comment, :person => current_user.person}))%>",
                                  false);
 
diff --git a/app/views/status_messages/create.js.erb b/app/views/status_messages/create.js.erb
index cfd9a5ef0..02965ff00 100644
--- a/app/views/status_messages/create.js.erb
+++ b/app/views/status_messages/create.js.erb
@@ -8,4 +8,4 @@
       :all_aspects => current_user.aspects
     }
   ),
-  :post_id => @status_message.id}.to_json.html_safe%>
+  :post_id => @status_message.guid}.to_json.html_safe%>
diff --git a/public/javascripts/web-socket-receiver.js b/public/javascripts/web-socket-receiver.js
index 17dd6e62b..e7f32eeb2 100644
--- a/public/javascripts/web-socket-receiver.js
+++ b/public/javascripts/web-socket-receiver.js
@@ -85,11 +85,10 @@ var WebSocketReceiver = {
     }
   },
 
-  processComment: function(postId, commentId, html, opts) {
+  processComment: function(postGUID, commentGUID, html, opts) {
 
-    if( $("#"+commentId).length === 0 ) {
-
-      var post = $("#"+postId),
+    if( $("#"+commentGUID).length === 0 ) {
+      var post = $("#"+postGUID),
           prevComments = $('.comment.posted', post);
 
       if(prevComments.length > 0) {
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index b9892254a..0275ce0ad 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -667,6 +667,23 @@ form.new_comment
       :display inline-block
 
 
+  .likes,
+  .likes_container
+    :display inline
+    :padding 0
+    :margin 0
+    :font
+      :size 10px
+    a
+      :font
+        :weight normal
+
+    img
+      :margin 0
+      :height 9px
+      :width 9px
+      :top 1px
+
 .stream.show
   ul.comments
     li
@@ -2211,18 +2228,15 @@ ul.show_comments
 
 ul.show_comments,
 .likes_container
-  *
+  a
     :font
       :weight bold
-    :color #999
 
   img
     :position relative
-    :top 3px
+    :top 2px
     :height 12px
     :width 12px
-    :margin
-      :left 0.5em
 
 .mark_all_read
   :position relative