diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 183d0db99ccd6f0e3650f04e9928f4077e39c71b..4bf1ade9de4f12ee2ea24c4a5522a791390dc65b 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -9,9 +9,7 @@ class DashboardController < ApplicationController
 
 
   def receive
-    xml = CGI::unescape(params[:xml])
-    puts xml
-    store_objects_from_xml xml
+    store_objects_from_xml CGI::unescape(params[:xml])
     render :nothing => true
   end
   
diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
index 0480c968f84593b0882c8ebd4960be89c432cd9e..b377602e3165f7e5b121f3adb0e6d9b913ff9752 100644
--- a/app/views/comments/_new_comment.html.haml
+++ b/app/views/comments/_new_comment.html.haml
@@ -1,7 +1,6 @@
 = form_for Comment.new, :remote => true do |f|
   = f.error_messages
   %p
-    /= f.label :message
     = f.text_field :text, :value => "dislike!"
     = f.hidden_field :post_id, :value => post.id
-    = f.submit 'comment', :class => 'button'
\ No newline at end of file
+    = f.submit 'comment', :class => 'button'
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 8377906d274e3fe8d67c2d23d97a777514911e8e..ed68a43bef77208711d8807153a14ce644d54750 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -2,7 +2,7 @@
 %html
   %head
     %title
-      = yield(:title) || "diaspora"
+      = "diaspora" 
     %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
     %meta{"http-equiv"=> "X-UA-Compatible", :content =>"chrome=1" }
     
diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
index 0eb914faface0f4684441d90226c4c57aace00d0..d1c6611c132095c80cefafe87d6b638aafe99ea5 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.haml
@@ -4,12 +4,7 @@
     = post.message
   %div.time
     = link_to "#{time_ago_in_words(post.updated_at)} ago", status_message_path(post)
-  %div.comments
-    = render "comments/new_comment", :post => post
-    %ul.comment_set
-      - for comment in post.comments
-        = render "comments/comment", :comment => comment
-    
+  = render "comments/comments", :post => post 
   - if mine?(post)
     = link_to 'Destroy', status_message_path(post), :confirm => 'Are you sure?', :method => :delete