diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 4572e2048..9a4b0cd69 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -17,7 +17,7 @@ class AspectsController < ApplicationController
   def index
     aspect_ids = (params[:a_ids] ? params[:a_ids] : [])
     @stream = AspectStream.new(current_user, aspect_ids,
-                               :order => session[:sort_order],
+                               :order => sort_order,
                                :max_time => params[:max_time].to_i)
 
     if params[:only_posts]
@@ -148,4 +148,8 @@ class AspectsController < ApplicationController
     end
   end
 
+  def sort_order
+    is_mobile_device? ? 'created_at' : session[:sort_order]
+  end
+
 end
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 46b906e01..8362ae018 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -6,7 +6,7 @@ class CommentsController < ApplicationController
   include ApplicationHelper
   before_filter :authenticate_user!
 
-  respond_to :html, :mobile, :only => [:create, :destroy]
+  respond_to :html, :mobile, :except => :show
   respond_to :js, :only => [:index]
 
   rescue_from ActiveRecord::RecordNotFound do
@@ -28,7 +28,7 @@ class CommentsController < ApplicationController
         respond_to do |format|
           format.js{ render(:create, :status => 201)}
           format.html{ render :nothing => true, :status => 201 }
-          format.mobile{ redirect_to post_url(@comment.post) }
+          format.mobile{ render :partial => 'comment', :locals => {:post => @comment.post, :comment => @comment} }
         end
       else
         render :nothing => true, :status => 422
@@ -64,4 +64,7 @@ class CommentsController < ApplicationController
     end
   end
 
+  def new
+    render :layout => false
+  end
 end
diff --git a/app/controllers/likes_controller.rb b/app/controllers/likes_controller.rb
index 1d647adb8..233e1dc2c 100644
--- a/app/controllers/likes_controller.rb
+++ b/app/controllers/likes_controller.rb
@@ -21,6 +21,7 @@ class LikesController < ApplicationController
           format.js { render 'likes/update', :status => 201 }
           format.html { render :nothing => true, :status => 201 }
           format.mobile { redirect_to post_path(@like.post_id) }
+          format.json { render :nothing => true, :status => 201 }
         end
       else
         render :nothing => true, :status => 422
@@ -34,13 +35,15 @@ class LikesController < ApplicationController
     if @like = Like.where(:id => params[:id], :author_id => current_user.person.id).first
       current_user.retract(@like)
       respond_to do |format|
-        format.all { }
+        format.any { }
         format.js { render 'likes/update' }
+        format.json { render :nothing => true, :status => :ok}
       end
     else
       respond_to do |format|
         format.mobile { redirect_to :back }
         format.js { render :nothing => true, :status => 403 }
+        format.json { render :nothing => true, :status => 403}
       end
     end
   end
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 905952665..997fe55f2 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -27,6 +27,10 @@ class PostsController < ApplicationController
         notification.save
       end
 
+      if is_mobile_device?
+        @comments = @post.comments
+      end
+
       respond_to do |format|
         format.xml{ render :xml => @post.to_diaspora_xml }
         format.mobile{render 'posts/show.mobile.haml'}	
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index d10d3f593..b6b12a842 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -9,20 +9,22 @@ class StatusMessagesController < ApplicationController
   respond_to :mobile
 
   # Called when a user clicks "Mention" on a profile page
-  # @option [Integer] person_id The id of the person to be mentioned
+  # @param person_id [Integer] The id of the person to be mentioned
   def new
-    @person = Person.find(params[:person_id])
-    @aspect = :profile
-    @contact = current_user.contact_for(@person)
-    @aspects_with_person = []
-    if @contact
-      @aspects_with_person = @contact.aspects
-      @aspect_ids = @aspects_with_person.map(&:id)
-      @contacts_of_contact = @contact.contacts
-
-      render :layout => nil
+    if params[:person_id] && @person = Person.where(params[:person_id]).first
+      @aspect = :profile
+      @contact = current_user.contact_for(@person)
+      @aspects_with_person = []
+      if @contact
+        @aspects_with_person = @contact.aspects
+        @aspect_ids = @aspects_with_person.map(&:id)
+        @contacts_of_contact = @contact.contacts
+        render :layout => nil
+      end
     else
-      redirect_to :back
+      @aspect = :all
+      @aspects = current_user.aspects
+      @aspect_ids = @aspects.map{ |a| a.id }
     end
   end
 
@@ -30,6 +32,9 @@ class StatusMessagesController < ApplicationController
     @aspects = current_user.aspects
     @selected_contacts = @aspects.map { |aspect| aspect.contacts }.flatten.uniq
     @aspect_ids = @aspects.map{|x| x.id}
+
+    pp @aspect_ids.inspect
+
     render :layout => nil
   end
 
@@ -48,7 +53,14 @@ class StatusMessagesController < ApplicationController
     if @status_message.save
       Rails.logger.info("event=create type=status_message chars=#{params[:status_message][:text].length}")
 
-      aspects = current_user.aspects_from_ids(params[:aspect_ids])
+      # always send to all aspects if public
+      if params[:status_message][:public] || params[:status_message][:aspect_ids].first == "all_aspects"
+        aspect_ids = current_user.aspects.map{|a| a.id}
+      else
+        aspect_ids = params[:aspect_ids]
+      end
+
+      aspects = current_user.aspects_from_ids(aspect_ids)
       current_user.add_to_streams(@status_message, aspects)
       receiving_services = current_user.services.where(:type => params[:services].map{|s| "Services::"+s.titleize}) if params[:services]
       current_user.dispatch_post(@status_message, :url => short_post_url(@status_message.guid), :services => receiving_services)
@@ -78,7 +90,8 @@ class StatusMessagesController < ApplicationController
   end
 
   def normalize_public_flag!
-    public_flag = params[:status_message][:public]
+    # mobile || desktop conditions
+    public_flag = params[:status_message][:aspect_ids].first == 'public' || params[:status_message][:public]
     public_flag.to_s.match(/(true)|(on)/) ? public_flag = true : public_flag = false
     params[:status_message][:public] = public_flag
     public_flag
diff --git a/app/helpers/stream_helper.rb b/app/helpers/stream_helper.rb
index bcb16a112..e84694c73 100644
--- a/app/helpers/stream_helper.rb
+++ b/app/helpers/stream_helper.rb
@@ -3,7 +3,7 @@
 #   the COPYRIGHT file.
 
 module StreamHelper
-  def next_page_path
+  def next_page_path(opts ={})
     if controller.instance_of?(TagsController)
       tag_path(@tag, :max_time => @posts.last.created_at.to_i)
     elsif controller.instance_of?(AppsController)
@@ -13,7 +13,13 @@ module StreamHelper
     elsif controller.instance_of?(TagFollowingsController) 
       tag_followings_path(:max_time => @stream.posts.last.created_at.to_i)
     elsif controller.instance_of?(AspectsController)
-      aspects_path(:max_time => @stream.posts.last.send(@stream.order.to_sym).to_i, :a_ids => @stream.aspect_ids)
+     if opts[:ajax_stream] 
+       time = (Time.now() + 1).to_i
+
+     else
+       time = @stream.posts.last.send(@stream.order.to_sym).to_i
+     end
+      aspects_path(:max_time => time, :a_ids => @stream.aspect_ids)
     else
       raise 'in order to use pagination for this new controller, update next_page_path in stream helper'
     end
diff --git a/app/views/aspects/_aspect_stream.haml b/app/views/aspects/_aspect_stream.haml
index 2feef09bc..fbd506ae6 100644
--- a/app/views/aspects/_aspect_stream.haml
+++ b/app/views/aspects/_aspect_stream.haml
@@ -23,7 +23,11 @@
   = render 'aspects/no_contacts_message'
 
 #main_stream.stream{:data => {:guids => stream.aspect_ids.join(',')}}
-  - if stream.posts.length > 0
+  - if defined?(no_posts) && no_posts
+    #pagination
+      =link_to(t('more'), next_page_path(:ajax_stream => true), :class => 'paginate')
+
+  - elsif stream.posts.length > 0
     = render 'shared/stream', :posts => stream.posts
     #pagination
       =link_to(t('more'), next_page_path, :class => 'paginate')
diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index d2b59a43f..4ba3eea39 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -26,7 +26,7 @@
 
 .span-13.append-1
   #aspect_stream_container.stream_container
-    = render 'aspects/aspect_stream', :stream => @stream
+    = render 'aspects/aspect_stream', :stream => @stream, :no_posts => true
 
 .span-5.rightBar.last
   = render 'aspects/selected_contacts', :stream => @stream
diff --git a/app/views/aspects/index.mobile.haml b/app/views/aspects/index.mobile.haml
index 4f13e4ea2..806b88d18 100644
--- a/app/views/aspects/index.mobile.haml
+++ b/app/views/aspects/index.mobile.haml
@@ -2,19 +2,17 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-#aspect_header
+%h2{:style => "padding:0 10px;display:none;"}
   - if @stream.for_all_aspects?
     = t('all_aspects')
   - else
     = @stream.aspect
-  = link_to t('.post_a_message'), '#publisher_page', :id => 'publisher_button'
-
 
 #main_stream.stream
   = render 'shared/stream', :posts => @stream.posts
   -if @stream.posts.length > 0
     #pagination
       %a.more-link.paginate{:href => next_page_path}
-        %h2= t("more")
-- content_for :subpages do
-  = render 'shared/publisher', :aspect_ids => @stream.aspect_ids, :selected_aspects => @stream.aspects, :aspect => @stream.aspect
+        %h1
+          = t("more")
+
diff --git a/app/views/comments/_comment.mobile.haml b/app/views/comments/_comment.mobile.haml
index a7adc99a1..5b622dfa6 100644
--- a/app/views/comments/_comment.mobile.haml
+++ b/app/views/comments/_comment.mobile.haml
@@ -3,17 +3,14 @@
 -#   the COPYRIGHT file.
 
 %li.comment{:data=>{:guid=>comment.id}, :class => ("hidden" if(defined? hidden))}
-  .right
-    %span.time
-      = comment.created_at ? time_ago_in_words(comment.created_at) : time_ago_in_words(Time.now)
-    -#.controls
-      -#= link_to image_tag('deletelabel.png'), comment, :confirm => t('are_you_sure'), :method => :delete, :class => "delete comment_delete", :title => t('delete')
-
-
-  = person_image_link(comment.author)
   .content
     .from
+      = person_image_link(comment.author)
       = person_link(comment.author)
-    %div{ :class => direction_for(comment.text) }
+      .info
+        %span.time.timeago{:datetime => comment.created_at}
+          = comment.created_at ? time_ago_in_words(comment.created_at) : time_ago_in_words(Time.now)
+
+    %div{:class => direction_for(comment.text)}
       = markdownify(comment, :youtube_maps => comment[:youtube_titles])
 
diff --git a/app/views/comments/_comments.haml b/app/views/comments/_comments.html.haml
similarity index 100%
rename from app/views/comments/_comments.haml
rename to app/views/comments/_comments.html.haml
diff --git a/app/views/comments/_new_comment.mobile.haml b/app/views/comments/_new_comment.mobile.haml
index 0bf41fff6..54f487d3b 100644
--- a/app/views/comments/_new_comment.mobile.haml
+++ b/app/views/comments/_new_comment.mobile.haml
@@ -2,10 +2,11 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-= form_tag( post_comments_path(post_id), :id => "new_comment_on_#{post_id}", :class => 'new_comment') do
+= form_tag( post_comments_path(post_id), :id => "new_comment_on_#{post_id}", :class => 'new_comment', :autocomplete => "off") do
   = hidden_field_tag :post_id,  post_id, :id => "post_id_on_#{post_id}"
-  = text_area_tag :text, nil, :rows => 2, :class => "comment_box",:id => "comment_text_on_#{post_id}"
+  = text_area_tag :text, nil, :class => "comment_box",:id => "comment_text_on_#{post_id}", :placeholder => t('.comment'), :autofocus => true
 
-  %div{:data => {:inline => 'true'}, :style => 'text-align:right;'}
-    = submit_tag t('.comment'), :id => "comment_submit_#{post_id}", :disable_with => t('.commenting'), "data-role" => 'button', 'data-theme' => 'b', 'data-inline' => true
+  .actions
+    = link_to "Cancel", post_path(post_id), :class => "cancel_new_comment btn"
+    = submit_tag t('.comment'), :id => "comment_submit_#{post_id}", :disable_with => t('.commenting'), :class => "action"
 
diff --git a/app/views/comments/index.haml b/app/views/comments/index.html.haml
similarity index 100%
rename from app/views/comments/index.haml
rename to app/views/comments/index.html.haml
diff --git a/app/views/comments/index.mobile.haml b/app/views/comments/index.mobile.haml
new file mode 100644
index 000000000..ce6d633b7
--- /dev/null
+++ b/app/views/comments/index.mobile.haml
@@ -0,0 +1,14 @@
+.comment_container
+  .post_stats
+    %span.comment_count
+      = @post.comments.size
+    %span.like_count
+      = @post.likes.size
+
+  %ul.comments
+    = render :partial => 'comments/comment', :collection => @comments, :locals => {:post => @post}
+
+    %li.comment.add_comment_bottom_link_container
+      = link_to "#", :class => "show_comments bottom_collapse active" do
+        = image_tag 'icons/arrow_up_small.png'
+      = link_to "Add a comment", new_post_comment_path(@post), :class => 'add_comment_bottom_link btn comment_action inactive'
diff --git a/app/views/comments/new.mobile.haml b/app/views/comments/new.mobile.haml
new file mode 100644
index 000000000..c34cdf84a
--- /dev/null
+++ b/app/views/comments/new.mobile.haml
@@ -0,0 +1 @@
+= new_comment_form(params[:post_id], current_user)
diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml
index b247e7758..275877e7f 100644
--- a/app/views/layouts/application.mobile.haml
+++ b/app/views/layouts/application.mobile.haml
@@ -8,105 +8,76 @@
     %title
       DIASPORA*
 
+    %meta{:name => "description", :content => "Diaspora* Mobile"}
+    %meta{:name => "author", :content => "Diaspora, Inc."}
+
     %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
-    = include_javascripts :mobile
-    %meta{'name' =>'viewport', 'content' => "width=device-width, minimum-scale=1, maximum-scale=1"}
+    / Viewport scale
+    %meta{:name =>'viewport', :content => "width=device-width, minimum-scale=1 maximum-scale=1"}
+    %meta{:name => "HandheldFriendly", :content => "True"}
+    %meta{:name => "MobileOptimized", :content => "320"}
+    / Force cleartype on WP7
+    %meta{'http-equiv' => "cleartype", :content => 'on'}
 
-    -if current_user
-      :javascript
-        Diaspora.I18n.loadLocale(#{get_javascript_strings_for(current_user.language).to_json}, "#{current_user.language}");
+    / Home screen icon (sized for retina displays)
+    %link{:rel => 'apple-touch-icon', :href => '/apple-touch-icon.png'}
+    / For Nokia devices
+    %link{:rel => 'shortcut icon', :href => '/apple-touch-icon.png'}
+
+    / iOS mobile web app indicator
+    %meta{:name => "apple-mobile-web-app-capable", :content => "yes"}
+    %link{:rel => "apple-touch-startup-image", :href => "/images/apple-splash.png"}
+
+    / Stylesheets
+    = include_stylesheets :mobile
+    = yield(:custom_css)
+
+    %script{:src => "/javascripts/vendor/mbp-modernizr-custom.js"}
+    / Media Queries Polyfill https://github.com/shichuan/mobile-html5-boilerplate/wiki/Media-Queries-Polyfill
+    :javascript
+      Modernizr.mq('(min-width:0)') || document.write('<script src="javascripts/vendor/mbp-respond.min.js">\x3C/script>')
 
-    =include_stylesheets :mobile
     = csrf_meta_tag
-    
+
     - if rtl?
       = include_stylesheets :rtl, :media => 'all'
 
     = yield(:head)
 
+  %body
+    %header
+      = link_to(image_tag('white@2x.png', :height => 20, :width => 127, :id => 'header_title'), aspects_path)
+      - if user_signed_in?
+        - if yield(:header_action).present?
+          = yield(:header_action)
+        - else
+          = link_to(image_tag('icons/compose_mobile2.png', :height => 28, :width => 28), new_status_message_path, :class => 'compose_icon')
+
+    #main{:role => "main"}
+      = yield
+
+    - if user_signed_in?
+      = render :partial =>'shared/footer'
+
+    / javascripts at the bottom
+    = include_javascripts :mobile
+
+    :javascript
+      MBP.hideUrlBar();
+
     -if AppConfig[:google_a_site]
       :javascript
-        var _gaq = _gaq || [];
-        _gaq.push(['_setAccount', '#{AppConfig[:google_a_site]}']);
-        _gaq.push(['_trackPageview']);
-
-        (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-        })();
+        var _gaq=[["_setAccount","#{AppConfig[:google_a_site]}"],["_trackPageview"]];
+        (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
+        g.src=("https:"==location.protocol?"//ssl":"//www")+".google-analytics.com/ga.js";
+        s.parentNode.insertBefore(g,s)}(document,"script"));
 
     -if AppConfig[:piwik_id]
       :javascript
         var pkBaseURL = (("https:" == document.location.protocol) ? "https://#{AppConfig[:piwik_url]}/" : "http://#{AppConfig[:piwik_url]}/");
         document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-      :javascript
         try {
         var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", #{AppConfig[:piwik_id]});
         piwikTracker.trackPageView();
         piwikTracker.enableLinkTracking();
         } catch( err ) {}
-
-
-  %body
-    #content{:data => {:role => 'page', :theme => 'c'}}
-      #header
-        - if current_user
-          .right
-            = link_to(image_tag('icons/list_white.png'), '#menu', :id => "menu_button")
-            = link_to(image_tag('icons/search_white.png'), people_path)
-        = link_to(image_tag('white@2x.png', :height => 22, :width => 136, :id => 'header_title'), aspects_path)
-      %p
-        - flash.each do |name, msg|
-          = content_tag :div, msg, :id => "flash_#{name}"
-
-      = yield
-
-      = render :partial =>'shared/footer' if user_signed_in?
-
-    -if current_user
-      #menu{:data => {:role => 'page', :theme => 'c'}}
-        #header
-          .right
-            = link_to(image_tag('icons/search_white.png'), people_path)
-          = link_to(image_tag('white.png'), aspects_path)
-
-        #content{:data => {:role => 'content'}}
-
-          %h2
-            = current_user.name
-
-          %ul{:data => {:role => 'listview', :inset => 'true'}}
-            %li
-              = link_to t('notifications.index.notifications'), notifications_path
-              .ui-li-count
-                = @notification_count
-            %li
-              = link_to t('conversations.index.message_inbox'), conversations_path
-              .ui-li-count
-                = @unread_message_count
-
-
-
-          - if AppConfig[:open_invitations]
-            %h4
-              = t('shared.invitations.invite_your_friends')
-            %ul{:data => {:role => 'listview', :inset => 'true'}}
-              %li
-                = link_to t('.by_email'), new_user_invitation_path                  
-
-          %h4
-            = t('.your_aspects')
-
-          %ul{:data => {:role => 'listview', :inset => 'true'}}
-            %li
-              = link_to t('all_aspects'), aspects_path
-            - for aspect in all_aspects
-              %li
-                = link_to aspect, aspects_path('a_ids[]' => aspect.id)
-
-
-        = render :partial =>'shared/footer'
-
-  = yield :subpages
-
diff --git a/app/views/people/show.mobile.haml b/app/views/people/show.mobile.haml
index 05948258f..69e902b63 100644
--- a/app/views/people/show.mobile.haml
+++ b/app/views/people/show.mobile.haml
@@ -8,12 +8,8 @@
 
 #author_info.profile
   = person_image_tag @person, :thumb_medium
-
-  .content
-    %h3
-      = @person.name
-      .description
-        = @person.diaspora_handle
+  %h2
+    = @person.name
 
 - if user_signed_in? && !(@contact.persisted? || current_user.person == @person)
   - if @incoming_request
diff --git a/app/views/posts/show.mobile.haml b/app/views/posts/show.mobile.haml
index 50a06979f..0dda0b357 100644
--- a/app/views/posts/show.mobile.haml
+++ b/app/views/posts/show.mobile.haml
@@ -2,30 +2,7 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-#show_content{:data=>{:guid=>@post.id}}
-  = render 'shared/author_info', :person => @post.author, :post => @post
-
-  - if @post.activity_streams?
-    = image_tag @post.image_url
-  - elsif reshare?(@post)
-    = render 'reshares/reshare', :reshare => @post, :post => @post.root
-  - else
-    %p
-      = markdownify(@post, :youtube_maps => @post[:youtube_titles])
-
-    - for photo in @post.photos
-      = link_to (image_tag photo.url(:thumb_small), :class => 'thumb_small'), photo.url(:thumb_medium)
-
-  .info
-    %span.time
-      = t('ago', :time => time_ago_in_words(@post.created_at))
-
-      %br
-      - if user_signed_in?
-        - if current_user.owns? @post
-          = link_to t('delete'), post_path(@post), :confirm => t('are_you_sure'), :method => :delete
-        - else
-          = link_to t('hide'), post_visibility_path(:id => "42", :post_id => @post.id), :confirm => t('are_you_sure'), :method => :put, :remote => true
-
-.stream.show{:data=>{:guid=>@post.id}}
-  = render "comments/comments", :post => @post, :comments => @post.comments, :comments_expanded => true
+.stream
+  = render :partial => 'shared/stream_element',
+    :locals => {:post => @post, :commenting_disabled => defined?(@commenting_disabled),
+    :expanded_info => true}
diff --git a/app/views/reshares/_reshare.mobile.haml b/app/views/reshares/_reshare.mobile.haml
index 796689b6f..32a9b1aa4 100644
--- a/app/views/reshares/_reshare.mobile.haml
+++ b/app/views/reshares/_reshare.mobile.haml
@@ -2,22 +2,41 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-
 .reshare
   - if post
+    .photo_area
+      - if post.is_a?(StatusMessage)
+        -if post.photos.size > 0
+          .photo_attachments
+            - if post.photos.size > 1
+              .additional_photo_count
+                = "+ #{post.photos.size-1}"
+            = image_tag post.photos.first.url(:thumb_large), :class => "stream-photo big-stream-photo"
+      - elsif post.activity_streams?
+        = image_tag post.image_url
+
     .content
       .from
-        = person_link(post.author, :class => "hovercardable")
-             
+        = person_image_link(post.author, :size => :thumb_small)
+        = person_link(post.author)
+        .info
+          %span.time{:integer => post.created_at.to_i}
+            = t('ago', :time => time_ago_in_words(post.created_at))
+          %span.via
+            - if post.activity_streams?
+              = t('shared.stream_element.via', :link => link_to("#{post.provider_display_name}", post.actor_url)).html_safe
+          &ndash;
+          %span.scope_scope
+            - if post.public?
+              = t('public')
+            - else
+              = t('limited')
 
-      - if post.activity_streams?
-        = link_to image_tag(post.image_url, 'data-small-photo' => post.image_url, 'data-full-photo' => post.image_url, :class => 'stream-photo'), post.object_url, :class => "stream-photo-link"
-      - else
+      - if !post.activity_streams?
         = render 'status_messages/status_message', :post => post, :photos => post.photos
-      - if defined?(current_user) && current_user && (post.author_id != current_user.person.id) && (post.public?) && !reshare?(post)
-        .reshare_action
-          = reshare_link(post)
-          = link_to t(".show_original"), post_path(post)
-
   - else
     = t('.deleted')
+
+  .reshare_via
+    %span
+      = t('.reshared_via')
diff --git a/app/views/sessions/new.mobile.haml b/app/views/sessions/new.mobile.haml
index cd29fc946..11919ee8a 100644
--- a/app/views/sessions/new.mobile.haml
+++ b/app/views/sessions/new.mobile.haml
@@ -2,20 +2,27 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-#login_form
-  = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
-    %div{:data => {:role => 'fieldcontain'}}
-      = f.label :username , t('username')
-      = f.text_field :username
-      %p.user_network
-        ="@#{AppConfig[:pod_uri].host}"
-    
-      = f.label :password , t('password')
-      = f.password_field :password
-    = f.submit t('devise.sessions.new.sign_in')
-    - if devise_mapping.rememberable?
-      = f.check_box :remember_me
-      = f.label :remember_me, t('devise.sessions.new.remember_me')
+.stream
+  #login_form
+    .login-container
+      %h2
+        Log in
+      = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+        .row
+          .row
+            = f.label :username, t('username')
+          .centered
+            = f.text_field :username
+        .row
+          .row
+            = f.label :password , t('password')
+          .centered
+            = f.password_field :password
+        .row
+          = f.submit t('devise.sessions.new.sign_in'), :class => 'login-submit'
+          - if devise_mapping.recoverable? && controller_name != 'passwords'
+            = link_to "Forgot password?", new_password_path(resource_name)
 
-  %p
-    = render :partial => "devise/shared/links"
+%footer
+  - if !AppConfig[:registrations_closed] && devise_mapping.registerable? && controller_name != 'registrations'
+    = link_to t('.sign_up'), new_registration_path(resource_name)
diff --git a/app/views/shared/_footer.mobile.haml b/app/views/shared/_footer.mobile.haml
index 579751148..bc7fd2a8e 100644
--- a/app/views/shared/_footer.mobile.haml
+++ b/app/views/shared/_footer.mobile.haml
@@ -1,12 +1,5 @@
-#footer{:data => {:role => 'footer'}}
-
-  .inset
-    %b= t('.your_aspects')
-    %div{:data => {:role => 'controlgroup', :type => 'horizontal'}}
-      - for aspect in all_aspects
-        = link_to aspect, aspects_path('a_ids[]' => aspect.id)
-        |
-  .ui-bar
-    = link_to t('.logged_in_as', :name => current_user.name), current_user.person
-    = link_to t('layouts.application.toggle'), toggle_mobile_path
-    = link_to t('layouts.header.logout'), destroy_user_session_path
+%footer
+  %strong
+    = link_to current_user.name, current_user.person
+  = link_to t('layouts.application.toggle'), toggle_mobile_path
+  = link_to t('layouts.header.logout'), destroy_user_session_path
diff --git a/app/views/shared/_publisher.mobile.haml b/app/views/shared/_publisher.mobile.haml
index 752816c6a..827191a97 100644
--- a/app/views/shared/_publisher.mobile.haml
+++ b/app/views/shared/_publisher.mobile.haml
@@ -2,52 +2,29 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-:javascript
-  $(document).ready(function(){
-    $("#status_message_text").bind("focus", function(){
-      $("#publisher fieldset:first").removeClass('hidden');
-    });
-  });
+- content_for :custom_css do
+  :css
+    body {
+      background-color: #eee;
+    }
 
-#publisher_page{:data => {:role => 'page', :theme => 'c'}}
-  #header
-    - if current_user
-      .left
-        = link_to(image_tag('icons/list_white.png'), '/aspects/#menu', :id => "menu_button")
+- content_for :header_action do
+  = submit_tag t('.share'), :class => 'action', :id => "submit_new_message"
 
-      .right
-        = link_to(image_tag('icons/search_white.png'), people_path)
-    = link_to(image_tag('white.png'), aspects_path)
-  %div{:data => {:role => 'content'}}
-    = form_for StatusMessage.new, {:data => {:ajax => false}}  do |status|
-      #publisher_text
-        = t('.whats_on_your_mind')
+= form_for StatusMessage.new, {:data => {:ajax => false}} do |status|
+  #message_container
+    = status.text_area :text, :placeholder => t('.whats_on_your_mind'), :style => "width:300px", :rows => 4, :autofocus => "autofocus"
 
-      = status.text_area :text
+  %fieldset
+    %select{:id => "aspect_ids_", :name => "aspect_ids[]", :style => "float:right;"}
+      %option{:value => 'public'}
+        = t('public')
 
-      - for aspect_id in aspect_ids
-        = hidden_field_tag 'aspect_ids[]', aspect_id.to_s
+      %option{:value => 'all_aspects', :selected => true}
+        = t('all_aspects')
+
+      - current_user.aspects.each do |aspect|
+        %option{:value => aspect.id}
+          = "· #{aspect.name}"
 
 
-      %fieldset
-        - unless aspect_ids
-          %input{:type => 'checkbox', :name => 'status_message[public]', :id => 'public', :class => 'custom', :value => 'true'}
-          %label{:for => 'public'}
-            = t('.make_public')
-          - unless current_user.services.empty?
-            %div{:data => {:role => 'fieldcontain'}}
-              %label{:for => 'services', :class => 'select'}
-                choose services
-
-              - current_user.services.each do |service|
-                %input{:type => 'checkbox', :name => "services[]", :id => "#{service.provider}", :class => 'custom', :value => "#{service.provider}"}
-                %label{:for => "#{service.provider}"}
-                  = "#{service.provider}"
-              -#%select{:name => 'services', :multiple => 'multiple', :id => "services"}
-                -#%option
-                  -#Choose a Service
-                -#- current_user.services.each do |service|
-                  -#%option{:value => "#{service.provider}"}
-                    -#= service.provider.titleize
-        = status.submit t('.share'), 'data-theme' => 'c'
-
diff --git a/app/views/shared/_stream.haml b/app/views/shared/_stream.haml
index 9a2cd3ead..ac71ad100 100644
--- a/app/views/shared/_stream.haml
+++ b/app/views/shared/_stream.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-
 = render :partial => 'shared/stream_element',
          :collection => posts,
          :as => :post,
diff --git a/app/views/shared/_stream_element.mobile.haml b/app/views/shared/_stream_element.mobile.haml
index 0462a8e50..5a131251c 100644
--- a/app/views/shared/_stream_element.mobile.haml
+++ b/app/views/shared/_stream_element.mobile.haml
@@ -3,27 +3,69 @@
 -#   the COPYRIGHT file.
 
 .stream_element{:data=>{:guid=>post.id}}
-  = person_image_link(post.author, :size => :thumb_small)
+
+  - if post.is_a?(Reshare)
+    = render 'reshares/reshare', :reshare => post, :post => post.root
+
+  .photo_area
+    - if post.is_a?(StatusMessage)
+      -if post.photos.size > 0
+        .photo_attachments
+          - if post.photos.size > 1
+            .additional_photo_count
+              = "+ #{post.photos.size-1}"
+          = image_tag post.photos.first.url(:thumb_large), :class => "stream-photo big-stream-photo"
+    - elsif post.activity_streams?
+      = image_tag post.image_url
 
   .content
     .from
+      = person_image_link(post.author, :size => :thumb_small)
       = person_link(post.author)
+      .info
+        %span.time{:integer => post.created_at.to_i}
+          = t('ago', :time => time_ago_in_words(post.created_at))
+        &ndash;
+        %span.scope_scope
+          - if post.public?
+            = t('public')
+          - else
+            = t('limited')
 
-    - if post.activity_streams?
-      = image_tag post.image_url
-    - elsif reshare?(post)
-      = render 'reshares/reshare', :reshare => post, :post => post.root
-    - else
+        %span.via
+          - if post.activity_streams?
+            = t('.via', :link => link_to("#{post.provider_display_name}", post.actor_url)).html_safe
+
+    - if post.is_a?(StatusMessage)
       = render 'status_messages/status_message', :post => post, :photos => post.photos
 
-    .info
-      %span.time{:integer => post.created_at.to_i}
-        = t('ago', :time => time_ago_in_words(post.created_at))
-      %span.via
-        - if post.activity_streams?
-          = t('.via', :link => link_to("#{post.provider_display_name}", post.actor_url)).html_safe
+  .bottom_bar
+    .floater
+      = link_to '', new_post_comment_path(post), :class => "image_link comment_action inactive"
 
-      = link_to "#{t('comments', :count => post.comments.length)} →", post_path(post), :class => 'comment_link right'
-      - if post.activity_streams?
-        %br
+      - if current_user.liked?(post)
+        = link_to '', post_like_path(post.id, current_user.like_for(post).id), :class => "image_link like_action active"
+      - else
+        = link_to '', post_likes_path(post.id), :class => "image_link like_action inactive"
+
+    - if post.comments.length + post.likes_count > 0
+      = link_to "#{t('reactions', :count => (post.comments.length + post.likes_count))}", post_comments_path(post, :format => "mobile"), :class => 'show_comments'
+    - else
+      %span.show_comments
+        = "#{t('reactions', :count => (post.comments.length + post.likes_count))}"
+
+    - if defined?(expanded_info) && expanded_info
+      .comment_container
+        .post_stats
+          %span.comment_count
+            = @post.comments.size
+
+          %span.like_count
+            = @post.likes.size
+
+        %ul.comments
+          = render :partial => 'comments/comment', :collection => @comments, :locals => {:post => @post}
+
+          %li.comment.add_comment_bottom_link_container
+            = link_to "Add a comment", new_post_comment_path(@post), :class => 'add_comment_bottom_link btn comment_action inactive'
 
diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
new file mode 100644
index 000000000..ec8343327
--- /dev/null
+++ b/app/views/status_messages/_status_message.html.haml
@@ -0,0 +1,19 @@
+-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+
+- if photos.size > 0
+  .photo_attachments
+    .big_stream_photo
+      = link_to (image_tag photos.first.url(:scaled_full), :class => "stream-photo", 'data-small-photo' => photos.first.url(:thumb_medium), 'data-full-photo' => photos.first.url), photo_path(photos.first), :class => "stream-photo-link"
+    - if photos.size > 1
+      - if photos.size >= 8
+        - for photo in photos[1..8]
+          = link_to (image_tag photo.url(:thumb_small), :class => 'stream-photo thumb_small', 'data-small-photo' => photo.url(:thumb_medium), 'data-full-photo' => photo.url), photo_path(photo), :class => 'stream-photo-link'
+      - else
+        - for photo in photos[1..photos.size]
+          = link_to (image_tag photo.url(:thumb_small), :class => 'stream-photo thumb_small', 'data-small-photo' => photo.url(:thumb_medium), 'data-full-photo' => photo.url), photo_path(photo), :class => 'stream-photo-link'
+
+%div{:class => direction_for(post.text)}
+  != markdownify(post, :youtube_maps => post[:youtube_titles])
diff --git a/app/views/status_messages/_status_message.mobile.haml b/app/views/status_messages/_status_message.mobile.haml
new file mode 100644
index 000000000..8a34f126f
--- /dev/null
+++ b/app/views/status_messages/_status_message.mobile.haml
@@ -0,0 +1,18 @@
+-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+- if defined?(reshare) && reshare
+  .photo_area
+    - if post.is_a?(StatusMessage)
+      -if post.photos.size > 0
+        .photo_attachments
+          - if post.photos.size > 1
+            .additional_photo_count
+              = "+ #{post.photos.size-1}"
+          = image_tag post.photos.first.url(:thumb_large), :class => "stream-photo big-stream-photo"
+    - elsif post.activity_streams?
+      = image_tag post.image_url
+
+%div{:class => direction_for(post.text)}
+  != markdownify(post, :youtube_maps => post[:youtube_titles])
diff --git a/app/views/status_messages/new.mobile.haml b/app/views/status_messages/new.mobile.haml
new file mode 100644
index 000000000..91786f0ec
--- /dev/null
+++ b/app/views/status_messages/new.mobile.haml
@@ -0,0 +1,5 @@
+-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+= render :partial => 'shared/publisher', :locals => {:aspect => @aspects.first, :for_all_aspects => true, :aspect_ids => @aspect_ids, :selected_aspects => @aspects}
diff --git a/app/views/tags/show.mobile.haml b/app/views/tags/show.mobile.haml
new file mode 100644
index 000000000..2e2ced94c
--- /dev/null
+++ b/app/views/tags/show.mobile.haml
@@ -0,0 +1,15 @@
+-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+%h1
+  = "##{params[:name]}"
+
+#main_stream.stream
+  = render 'shared/stream', :posts => @posts
+  -if @posts.length > 0
+    #pagination
+      %a.more-link.paginate{:href => next_page_path}
+        %h1
+          = t("more")
+
diff --git a/config/assets.yml b/config/assets.yml
index 3be03471c..737e197cf 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -42,14 +42,16 @@ javascripts:
   login:
     - public/javascripts/login.js
   mobile:
+    #- public/javascripts/custom-mobile-scripting.js
+    #- public/javascripts/vendor/jquery.mobile-1.0b2.min.js
+    #- public/javascripts/jquery.infinitescroll-custom.js
+    #- public/javascripts/diaspora.js
+    #- public/javascripts/helpers/i18n.js
+    #- public/javascripts/widgets/infinite-scroll.js
     - public/javascripts/vendor/jquery162.min.js
-    - public/javascripts/custom-mobile-scripting.js
-    - public/javascripts/vendor/jquery.mobile-1.0b2.min.js
-    - public/javascripts/jquery.infinitescroll-custom.js
-    - public/javascripts/diaspora.js
-    - public/javascripts/helpers/i18n.js
-    - public/javascripts/widgets/infinite-scroll.js
     - public/javascripts/rails.js
+    - public/javascripts/vendor/mbp-helper.js
+    - public/javascripts/mobile.js
     
   mailchimp:
     - public/javascripts/vendor/mailchimp/jquery.form.js
@@ -88,6 +90,7 @@ stylesheets:
     - public/stylesheets/rtl.css
 
   mobile:
-    - public/stylesheets/vendor/jquery.mobile-1.0b2.min.css
+    #- public/stylesheets/vendor/jquery.mobile-1.0b2.min.css
+    - public/stylesheets/vendor/html5-boilerplate-mobile.css
     - public/stylesheets/mobile.css
- 
+
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 60c12d4b0..b04b2a44c 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -210,6 +210,14 @@ en:
       comment: "Comment"
       commenting: "Commenting..."
 
+  reactions:
+    zero: "0 reactions"
+    one: "1 reaction"
+    two: "%{count} reactions"
+    few: "%{count} reactions"
+    many: "%{count} reactions"
+    other: "%{count} reactions"
+
   contacts:
     zero: "no contacts"
     one: "1 contact"
@@ -331,7 +339,7 @@ en:
     application:
       powered_by: "POWERED BY DIASPORA*"
       whats_new: "what's new?"
-      toggle: "toggle mobile site"
+      toggle: "toggle mobile"
       public_feed: "Public Diaspora Feed for %{name}"
       your_aspects: "your aspects"
 
@@ -653,6 +661,7 @@ en:
         other: "%{count} new requests!"
   reshares:
     reshare:
+      reshared_via: "reshared via"
       reshare_original: "Reshare original"
       reshare:
         zero: "Reshare"
diff --git a/config/routes.rb b/config/routes.rb
index f8f8856b4..78c7cf23f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,7 +16,7 @@ Diaspora::Application.routes.draw do
 
   resources :posts, :only => [:show, :destroy] do
     resources :likes, :only => [:create, :destroy, :index]
-    resources :comments, :only => [:create, :destroy, :index]
+    resources :comments, :only => [:new, :create, :destroy, :index]
   end
   get 'p/:id' => 'posts#show', :as => 'short_post'
 
diff --git a/features/connects_users.feature b/features/connects_users.feature
index 841642432..bb0feacbf 100644
--- a/features/connects_users.feature
+++ b/features/connects_users.feature
@@ -96,7 +96,7 @@ Feature: following and being followed
     Given I sign in as "alice@alice.alice"
     And I am on "bob@bob.bob"'s page
 
-    Then I should see "Add to aspect"
+    Then I should see "Add contact"
     And I should not see "Mention"
     And I should not see "Message"
 
diff --git a/features/infinite_scroll.feature b/features/infinite_scroll.feature
index 8ed79b90a..d928b459d 100644
--- a/features/infinite_scroll.feature
+++ b/features/infinite_scroll.feature
@@ -41,7 +41,8 @@ Feature: infinite scroll
       Then I should see "No more"
 
     Scenario: on the main stream post created time
-      When I follow "posted"
+      When I wait for the ajax to finish
+      And I follow "posted"
       Then I should see 15 posts
       And I should see "alice - 15 - #seeded"
 
diff --git a/lib/postzord/receiver/local_batch.rb b/lib/postzord/receiver/local_batch.rb
index 6ac12eb44..361989f45 100644
--- a/lib/postzord/receiver/local_batch.rb
+++ b/lib/postzord/receiver/local_batch.rb
@@ -17,7 +17,8 @@ module Postzord
         end
         notify_mentioned_users if @object.respond_to?(:mentions)
 
-        socket_to_users if @object.respond_to?(:socket_to_user)
+        # 09/27/11 this is slow
+        #socket_to_users if @object.respond_to?(:socket_to_user)
         notify_users
       end
 
diff --git a/public/images/apple-splash.png b/public/images/apple-splash.png
new file mode 100644
index 000000000..8ba65c01d
Binary files /dev/null and b/public/images/apple-splash.png differ
diff --git a/public/images/icons/arrow_down.png b/public/images/icons/arrow_down.png
new file mode 100644
index 000000000..440b4c6f9
Binary files /dev/null and b/public/images/icons/arrow_down.png differ
diff --git a/public/images/icons/arrow_down_small.png b/public/images/icons/arrow_down_small.png
new file mode 100644
index 000000000..392d82125
Binary files /dev/null and b/public/images/icons/arrow_down_small.png differ
diff --git a/public/images/icons/arrow_up_small.png b/public/images/icons/arrow_up_small.png
new file mode 100644
index 000000000..970a8e596
Binary files /dev/null and b/public/images/icons/arrow_up_small.png differ
diff --git a/public/images/icons/comment_mobile_grey.png b/public/images/icons/comment_mobile_grey.png
new file mode 100644
index 000000000..9053269aa
Binary files /dev/null and b/public/images/icons/comment_mobile_grey.png differ
diff --git a/public/images/icons/compose_mobile.png b/public/images/icons/compose_mobile.png
new file mode 100644
index 000000000..b3284d33b
Binary files /dev/null and b/public/images/icons/compose_mobile.png differ
diff --git a/public/images/icons/compose_mobile2.png b/public/images/icons/compose_mobile2.png
new file mode 100644
index 000000000..90c0db535
Binary files /dev/null and b/public/images/icons/compose_mobile2.png differ
diff --git a/public/images/icons/heart_mobile_grey.png b/public/images/icons/heart_mobile_grey.png
new file mode 100644
index 000000000..9e5ce387c
Binary files /dev/null and b/public/images/icons/heart_mobile_grey.png differ
diff --git a/public/images/icons/heart_mobile_red.png b/public/images/icons/heart_mobile_red.png
new file mode 100644
index 000000000..e2b5dc42b
Binary files /dev/null and b/public/images/icons/heart_mobile_red.png differ
diff --git a/public/images/icons/pencil_mobile_grey.png b/public/images/icons/pencil_mobile_grey.png
new file mode 100644
index 000000000..da72cc3d4
Binary files /dev/null and b/public/images/icons/pencil_mobile_grey.png differ
diff --git a/public/images/icons/pencil_mobile_grey_active.png b/public/images/icons/pencil_mobile_grey_active.png
new file mode 100644
index 000000000..5d4147ea0
Binary files /dev/null and b/public/images/icons/pencil_mobile_grey_active.png differ
diff --git a/public/images/icons/pencil_mobile_grey_mobile.png b/public/images/icons/pencil_mobile_grey_mobile.png
new file mode 100644
index 000000000..5d4147ea0
Binary files /dev/null and b/public/images/icons/pencil_mobile_grey_mobile.png differ
diff --git a/public/images/icons/reshare_mobile.png b/public/images/icons/reshare_mobile.png
new file mode 100644
index 000000000..7b53165ec
Binary files /dev/null and b/public/images/icons/reshare_mobile.png differ
diff --git a/public/images/mobile-spinner.gif b/public/images/mobile-spinner.gif
new file mode 100644
index 000000000..901564c3f
Binary files /dev/null and b/public/images/mobile-spinner.gif differ
diff --git a/public/javascripts/custom-mobile-scripting.js b/public/javascripts/custom-mobile-scripting.js
index 4a839ab6b..900347dd6 100644
--- a/public/javascripts/custom-mobile-scripting.js
+++ b/public/javascripts/custom-mobile-scripting.js
@@ -3,6 +3,7 @@
 *   the COPYRIGHT file.
 */
 
+
 $(document).bind("mobileinit", function() {
    $.extend($.mobile, {
      ajaxLinksEnabled: false,
@@ -12,3 +13,40 @@ $(document).bind("mobileinit", function() {
    });
 	$.mobile.selectmenu.prototype.options.nativeMenu = false;
 });
+
+
+$(document).ready(function(){
+  $(".like_action.inactive").bind('tap', function(evt){
+    evt.preventDefault();
+    var target = $(this),
+        postId = target.data('post-id');
+
+    $.ajax({
+      url: '/posts/'+postId+'/likes.json',
+      type: 'POST',
+      complete: function(data){
+        target.addClass('inactive')
+              .removeClass('active')
+              .data('post-id', postId);
+      }
+    });
+  });
+
+  $(".like_action.active").bind('tap', function(evt){
+    evt.preventDefault();
+    var target = $(this),
+        postId = $(this).data('post-id'),
+        likeId = $(this).data('like-id');
+
+
+    $.ajax({
+      url: '/posts/'+postId+'/likes/'+likeId+'.json',
+      type: 'DELETE',
+      complete: function(data){
+        target.addClass('inactive')
+              .removeClass('active')
+              .data('like-id', '');
+      }
+    });
+  });
+});
diff --git a/public/javascripts/mobile.js b/public/javascripts/mobile.js
new file mode 100644
index 000000000..f6b563c25
--- /dev/null
+++ b/public/javascripts/mobile.js
@@ -0,0 +1,198 @@
+$(document).ready(function(){
+  $(".stream").delegate(".like_action.inactive", "tap click", function(evt){
+    evt.preventDefault();
+    var link = $(this),
+        likeCounter = $(this).closest(".stream_element").find("like_count"),
+        postId = link.closest(".stream_element").data("post-guid");
+
+    $.ajax({
+      url: link.attr("href"),
+      dataType: 'json',
+      type: 'POST',
+      beforeSend: function(){
+        link.removeClass('inactive')
+              .addClass('loading');
+      },
+      complete: function(data){
+        link.removeClass('loading')
+             .removeClass('inactive')
+             .addClass('active')
+             .data('post-id', postId);
+
+        if(likeCounter){
+          likeCounter.text(parseInt(likeCounter.text) + 1);
+        }
+      }
+    });
+  });
+
+  $(".stream").delegate(".like_action.active", "tap click", function(evt){
+    evt.preventDefault();
+    var link = $(this);
+        likeCounter = $(this).closest(".stream_element").find("like_count");
+
+    $.ajax({
+      url: link.attr("href"),
+      dataType: 'json',
+      type: 'DELETE',
+      beforeSend: function(){
+        link.removeClass('active')
+              .addClass('loading');
+      },
+      complete: function(data){
+        link.removeClass('loading')
+              .removeClass('active')
+              .addClass('inactive')
+              .data('like-id', '');
+
+        if(likeCounter){
+          likeCounter.text(parseInt(likeCounter.text) - 1);
+        }
+      }
+    });
+  });
+
+  $(".stream").delegate(".show_comments", "tap click", function(evt){
+    evt.preventDefault();
+    var link = $(this),
+        parent = link.closest(".bottom_bar").first(),
+        commentsContainer = function(){ return parent.find(".comment_container").first(); }
+        existingCommentsContainer = commentsContainer();
+
+    if( link.hasClass('active') ) {
+      existingCommentsContainer.hide();
+      if(!link.hasClass('bottom_collapse')){
+        link.removeClass('active');
+      } else {
+        parent.find(".show_comments").first().removeClass('active');
+      }
+
+      $('html,body').scrollTop(parent.offset().top - parent.closest(".stream_element").height() - 8);
+
+    } else if( existingCommentsContainer.length > 0) {
+
+      if(!existingCommentsContainer.hasClass('noComments')) {
+        $.ajax({
+          url: link.attr('href'),
+          success: function(data){
+            parent.append($(data).find('.comments_container').html());
+            link.addClass('active');
+            existingCommentsContainer.show();
+            scrollToOffset(parent, commentsContainer());
+          }
+        });
+      } else {
+        existingCommentsContainer.show();
+      }
+
+      link.addClass('active');
+
+    } else {
+      $.ajax({
+        url: link.attr('href'),
+        success: function(data){
+          parent.append(data);
+          link.addClass('active');
+          scrollToOffset(parent, commentsContainer());
+        }
+      });
+    }
+
+  });
+
+  var scrollToOffset = function(parent, commentsContainer){
+    var commentCount = commentsContainer.find("li.comment").length;
+    if( commentCount > 3 ) {
+      var lastComment = commentsContainer.find("li:nth-child("+(commentCount-4)+")");
+      $('html,body').animate({
+        scrollTop: lastComment.offset().top
+      }, 1000);
+    }
+  };
+
+  $(".stream").delegate("a.comment_action", "tap click", function(evt){
+    evt.preventDefault();
+    var link = $(this);
+
+    if(link.hasClass('inactive')) {
+      var parent = link.closest(".bottom_bar").first(),
+          container = link.closest('.bottom_bar').find('.add_comment_bottom_link_container').first();
+
+      $.ajax({
+        url: link.attr('href'),
+        beforeSend: function(){
+          link.addClass('loading');
+        },
+        context: link,
+        success: function(data){
+          var textarea = function(target) { return target.closest(".stream_element").find('textarea.comment_box').first()[0] };
+          link.removeClass('loading')
+
+          if(!link.hasClass("add_comment_bottom_link")){
+            link.removeClass('inactive');
+          }
+
+          container.hide();
+          parent.append(data);
+
+          console.log($(this).closest(".stream_element").find('textarea'));
+
+          MBP.autogrow(textarea($(this)));
+        }
+      });
+    }
+  });
+
+  $(".stream").delegate("a.cancel_new_comment", "tap click", function(evt){
+    evt.preventDefault();
+    var link = $(this);
+        form = link.closest("form"),
+        commentActionLink = link.closest(".bottom_bar").find("a.comment_action").first();
+        container = link.closest('.bottom_bar').find('.add_comment_bottom_link_container');
+
+    if(container.length > 0 ){
+      container.first().show();
+    }
+
+    commentActionLink.addClass("inactive");
+    form.remove();
+  });
+
+  $(".new_comment").live("submit", function(evt){
+    evt.preventDefault();
+    var form = $(this);
+
+    $.post(form.attr('action')+"?format=mobile", form.serialize(), function(data){
+      var bottomBar = form.closest('.bottom_bar').first(),
+          container = bottomBar.find('.add_comment_bottom_link_container'),
+          commentActionLink = bottomBar.find("a.comment_action").first();
+          reactionLink = bottomBar.find(".show_comments").first(),
+          commentCount = bottomBar.find(".comment_count");
+
+      if(container.length > 0) {
+        container.before(data);
+        form.remove();
+        container.show();
+
+      } else {
+        var container = $("<div class='comments_container not_all_present'></div>"),
+            comments = $("<ul class='comments'></ul>");
+
+        comments.html(data);
+        container.append(comments);
+        form.remove();
+        container.appendTo(bottomBar)
+      }
+
+      reactionLink.text(reactionLink.text().replace(/(\d+)/, function(match){ return parseInt(match) + 1; }));
+      commentCount.text(commentCount.text().replace(/(\d+)/, function(match){ return parseInt(match) + 1; }));
+      commentActionLink.addClass("inactive");
+    }, 'html');
+  });
+
+  $("#submit_new_message").bind("tap click", function(evt){
+    evt.preventDefault();
+    $("#new_status_message").submit();
+  });
+
+});
diff --git a/public/javascripts/vendor/mbp-helper.js b/public/javascripts/vendor/mbp-helper.js
new file mode 100644
index 000000000..026baea4f
--- /dev/null
+++ b/public/javascripts/vendor/mbp-helper.js
@@ -0,0 +1,171 @@
+/*
+ * MBP - Mobile boilerplate helper functions
+ */
+(function(document){
+
+window.MBP = window.MBP || {}; 
+
+// Fix for iPhone viewport scale bug 
+// http://www.blog.highub.com/mobile-2/a-fix-for-iphone-viewport-scale-bug/
+
+MBP.viewportmeta = document.querySelector && document.querySelector('meta[name="viewport"]');
+MBP.ua = navigator.userAgent;
+
+MBP.scaleFix = function () {
+  if (MBP.viewportmeta && /iPhone|iPad/.test(MBP.ua) && !/Opera Mini/.test(MBP.ua)) {
+    MBP.viewportmeta.content = "width=device-width, minimum-scale=1.0, maximum-scale=1.0";
+    document.addEventListener("gesturestart", MBP.gestureStart, false);
+  }
+};
+MBP.gestureStart = function () {
+    MBP.viewportmeta.content = "width=device-width, minimum-scale=0.25, maximum-scale=1.6";
+};
+
+
+// Hide URL Bar for iOS and Android by Scott Jehl
+// https://gist.github.com/1183357
+
+MBP.hideUrlBar = function () {
+	var win = window,
+		doc = win.document;
+
+	// If there's a hash, or addEventListener is undefined, stop here
+	if( !location.hash || !win.addEventListener ){
+
+		//scroll to 1
+		window.scrollTo( 0, 1 );
+		var scrollTop = 1,
+
+		//reset to 0 on bodyready, if needed
+		bodycheck = setInterval(function(){
+			if( doc.body ){
+				clearInterval( bodycheck );
+				scrollTop = "scrollTop" in doc.body ? doc.body.scrollTop : 1;
+				win.scrollTo( 0, scrollTop === 1 ? 0 : 1 );
+			}	
+		}, 15 );
+
+		win.addEventListener( "load", function(){
+			setTimeout(function(){
+				//reset to hide addr bar at onload
+				win.scrollTo( 0, scrollTop === 1 ? 0 : 1 );
+			}, 0);
+		}, false );
+	}
+};
+
+
+// Fast Buttons - read wiki below before using
+// https://github.com/shichuan/mobile-html5-boilerplate/wiki/JavaScript-Helper
+
+MBP.fastButton = function (element, handler) {
+    this.element = element;
+    this.handler = handler;
+    if (element.addEventListener) {
+      element.addEventListener('touchstart', this, false);
+      element.addEventListener('click', this, false);
+    }
+};
+
+MBP.fastButton.prototype.handleEvent = function(event) {
+    switch (event.type) {
+        case 'touchstart': this.onTouchStart(event); break;
+        case 'touchmove': this.onTouchMove(event); break;
+        case 'touchend': this.onClick(event); break;
+        case 'click': this.onClick(event); break;
+    }
+};
+
+MBP.fastButton.prototype.onTouchStart = function(event) {
+    event.stopPropagation();
+    this.element.addEventListener('touchend', this, false);
+    document.body.addEventListener('touchmove', this, false);
+    this.startX = event.touches[0].clientX;
+    this.startY = event.touches[0].clientY;
+    this.element.style.backgroundColor = "rgba(0,0,0,.7)";
+};
+
+MBP.fastButton.prototype.onTouchMove = function(event) {
+    if(Math.abs(event.touches[0].clientX - this.startX) > 10 || 
+       Math.abs(event.touches[0].clientY - this.startY) > 10    ) {
+        this.reset();
+    }
+};
+
+MBP.fastButton.prototype.onClick = function(event) {
+    event.stopPropagation();
+    this.reset();
+    this.handler(event);
+    if(event.type == 'touchend') {
+        MBP.preventGhostClick(this.startX, this.startY);
+    }
+    this.element.style.backgroundColor = "";
+};
+
+MBP.fastButton.prototype.reset = function() {
+    this.element.removeEventListener('touchend', this, false);
+    document.body.removeEventListener('touchmove', this, false);
+    this.element.style.backgroundColor = "";
+};
+
+MBP.preventGhostClick = function (x, y) {
+    MBP.coords.push(x, y);
+    window.setTimeout(function (){
+        MBP.coords.splice(0, 2);
+    }, 2500);
+};
+
+MBP.ghostClickHandler = function (event) {
+    for(var i = 0, len = MBP.coords.length; i < len; i += 2) {
+        var x = MBP.coords[i];
+        var y = MBP.coords[i + 1];
+        if(Math.abs(event.clientX - x) < 25 && Math.abs(event.clientY - y) < 25) {
+            event.stopPropagation();
+            event.preventDefault();
+        }
+    }
+};
+
+if (document.addEventListener) {
+    document.addEventListener('click', MBP.ghostClickHandler, true);
+}
+                            
+MBP.coords = [];
+
+
+// iOS Startup Image
+// https://github.com/shichuan/mobile-html5-boilerplate/issues#issue/2
+
+MBP.splash = function () {
+    var filename = navigator.platform === 'iPad' ? 'h/' : 'l/';
+    document.write('<link rel="apple-touch-startup-image" href="/img/' + filename + 'splash.png" />' );
+};
+
+
+// Autogrow
+// http://googlecode.blogspot.com/2009/07/gmail-for-mobile-html5-series.html
+
+MBP.autogrow = function (element, lh) {
+
+    function handler(e){
+        var newHeight = this.scrollHeight,
+            currentHeight = this.clientHeight;
+        if (newHeight > currentHeight) {
+            this.style.height = newHeight + 3 * textLineHeight + "px";
+        }
+    }
+
+    var setLineHeight = (lh) ? lh : 12,
+        textLineHeight = element.currentStyle ? element.currentStyle.lineHeight : 
+                         getComputedStyle(element, null).lineHeight;
+
+    textLineHeight = (textLineHeight.indexOf("px") == -1) ? setLineHeight :
+                     parseInt(textLineHeight, 10);
+
+    element.style.overflow = "hidden";
+    element.addEventListener ? element.addEventListener('keyup', handler, false) :
+                               element.attachEvent('onkeyup', handler);
+};
+
+})(document);
+
diff --git a/public/javascripts/vendor/mbp-modernizr-custom.js b/public/javascripts/vendor/mbp-modernizr-custom.js
new file mode 100644
index 000000000..806fa2351
--- /dev/null
+++ b/public/javascripts/vendor/mbp-modernizr-custom.js
@@ -0,0 +1,14 @@
+/*!
+ * Modernizr v1.8pre
+ * http://www.modernizr.com
+ *
+ * Developed by: 
+ * - Faruk Ates  http://farukat.es/
+ * - Paul Irish  http://paulirish.com/
+ *
+ * Copyright (c) 2009-2011
+ * Dual-licensed under the BSD or MIT licenses.
+ * http://www.modernizr.com/license/
+ */
+window.Modernizr=(function(o,v,k){var e="1.8pre",H={},x=true,F=v.documentElement,h=v.head||v.getElementsByTagName("head")[0],G="modernizr",D=v.createElement(G),B=D.style,g=v.createElement("input"),E=":)",y=Object.prototype.toString,z=" -webkit- -moz- -o- -ms- -khtml- ".split(" "),q="Webkit Moz O ms Khtml".split(" "),I={svg:"http://www.w3.org/2000/svg"},j={},d={},w={},C=[],A,m=v.getElementsByTagName("script")[0],c=(function(L){var J={},M=v.createElement("body"),K=v.createElement("div");K.id=G+"-mqtest";M.appendChild(K);return function(O){if(J[O]==k){if(o.matchMedia){return(J[O]=matchMedia(O).matches)}var N=v.createElement("style"),P="@media "+O+" { #"+G+"-mqtest { position: absolute; } }";N.type="text/css";if(N.styleSheet){N.styleSheet.cssText=P}else{N.appendChild(v.createTextNode(P))}m.parentNode.insertBefore(M,m);m.parentNode.insertBefore(N,m);J[O]=(o.getComputedStyle?getComputedStyle(K,null):K.currentStyle)["position"]=="absolute";M.parentNode.removeChild(M);N.parentNode.removeChild(N)}return J[O]}})(),t=(function(){var K={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};function J(L,N){N=N||v.createElement(K[L]||"div");L="on"+L;var M=(L in N);if(!M){if(!N.setAttribute){N=v.createElement("div")}if(N.setAttribute&&N.removeAttribute){N.setAttribute(L,"");M=l(N[L],"function");if(!l(N[L],k)){N[L]=k}N.removeAttribute(L)}}N=null;return M}return J})();var r=({}).hasOwnProperty,p;if(!l(r,k)&&!l(r.call,k)){p=function(J,K){return r.call(J,K)}}else{p=function(J,K){return((K in J)&&l(J.constructor.prototype[K],k))}}function u(J){B.cssText=J}function b(K,J){return u(z.join(K+";")+(J||""))}function l(K,J){return typeof K===J}function n(K,J){return !!~(""+K).indexOf(J)}function f(K,L){for(var J in K){if(B[K[J]]!==k&&(!L||L(K[J],D))){return true}}}function a(M,L){var K=M.charAt(0).toUpperCase()+M.substr(1),J=(M+" "+q.join(K+" ")+K).split(" ");return !!f(J,L)}j.flexbox=function(){function K(P,R,Q,O){R+=":";P.style.cssText=(R+z.join(Q+";"+R)).slice(0,-R.length)+(O||"")}function M(P,R,Q,O){P.style.cssText=z.join(R+":"+Q+";")+(O||"")}var N=v.createElement("div"),L=v.createElement("div");K(N,"display","box","width:42px;padding:0;");M(L,"box-flex","1","width:10px;");N.appendChild(L);F.appendChild(N);var J=L.offsetWidth===42;N.removeChild(L);F.removeChild(N);return J};j.canvas=function(){var J=v.createElement("canvas");return !!(J.getContext&&J.getContext("2d"))};j.canvastext=function(){return !!(H.canvas&&l(v.createElement("canvas").getContext("2d").fillText,"function"))};j.webgl=function(){return !!o.WebGLRenderingContext};j.touch=function(){return("ontouchstart" in o)||c("("+z.join("touch-enabled),(")+"modernizr)")};j.geolocation=function(){return !!navigator.geolocation};j.postmessage=function(){return !!o.postMessage};j.websqldatabase=function(){var J=!!o.openDatabase;return J};j.indexedDB=function(){for(var K=-1,J=q.length;++K<J;){if(o[q[K].toLowerCase()+"IndexedDB"]){return true}}return !!o.indexedDB};j.hashchange=function(){return t("hashchange",o)&&(v.documentMode===k||v.documentMode>7)};j.history=function(){return !!(o.history&&history.pushState)};j.draganddrop=function(){return t("dragstart")&&t("drop")};j.websockets=function(){return("WebSocket" in o)};j.rgba=function(){u("background-color:rgba(150,255,150,.5)");return n(B.backgroundColor,"rgba")};j.hsla=function(){u("background-color:hsla(120,40%,100%,.5)");return n(B.backgroundColor,"rgba")||n(B.backgroundColor,"hsla")};j.multiplebgs=function(){u("background:url(//:),url(//:),red url(//:)");return new RegExp("(url\\s*\\(.*?){3}").test(B.background)};j.backgroundsize=function(){return a("backgroundSize")};j.borderimage=function(){return a("borderImage")};j.borderradius=function(){return a("borderRadius","",function(J){return n(J,"orderRadius")})};j.boxshadow=function(){return a("boxShadow")};j.textshadow=function(){return v.createElement("div").style.textShadow===""};j.opacity=function(){b("opacity:.55");return/^0.55$/.test(B.opacity)};j.cssanimations=function(){return a("animationName")};j.csscolumns=function(){return a("columnCount")};j.cssgradients=function(){var L="background-image:",K="gradient(linear,left top,right bottom,from(#9f9),to(white));",J="linear-gradient(left top,#9f9, white);";u((L+z.join(K+L)+z.join(J+L)).slice(0,-L.length));return n(B.backgroundImage,"gradient")};j.cssreflections=function(){return a("boxReflect")};j.csstransforms=function(){return !!f(["transformProperty","WebkitTransform","MozTransform","OTransform","msTransform"])};j.csstransforms3d=function(){var J=!!f(["perspectiveProperty","WebkitPerspective","MozPerspective","OPerspective","msPerspective"]);if(J&&"webkitPerspective" in F.style){J=c("("+z.join("transform-3d),(")+"modernizr)")}return J};j.csstransitions=function(){return a("transitionProperty")};j.fontface=function(){var N,K,M=h||F,O=v.createElement("style"),J=v.implementation||{hasFeature:function(){return false}};O.type="text/css";M.insertBefore(O,M.firstChild);N=O.sheet||O.styleSheet;var L=J.hasFeature("CSS2","")?function(R){if(!(N&&R)){return false}var P=false;try{N.insertRule(R,0);P=(/src/i).test(N.cssRules[0].cssText);N.deleteRule(N.cssRules.length-1)}catch(Q){}return P}:function(P){if(!(N&&P)){return false}N.cssText=P;return N.cssText.length!==0&&(/src/i).test(N.cssText)&&N.cssText.replace(/\r+|\n+/g,"").indexOf(P.split(" ")[0])===0};K=L('@font-face { font-family: "font"; src: url("//:"); }');M.removeChild(O);return K};j.video=function(){var L=v.createElement("video"),J=!!L.canPlayType;if(J){J=new Boolean(J);J.ogg=L.canPlayType('video/ogg; codecs="theora"');var K='video/mp4; codecs="avc1.42E01E';J.h264=L.canPlayType(K+'"')||L.canPlayType(K+', mp4a.40.2"');J.webm=L.canPlayType('video/webm; codecs="vp8, vorbis"')}return J};j.audio=function(){var K=v.createElement("audio"),J=!!K.canPlayType;if(J){J=new Boolean(J);J.ogg=K.canPlayType('audio/ogg; codecs="vorbis"');J.mp3=K.canPlayType("audio/mpeg;");J.wav=K.canPlayType('audio/wav; codecs="1"');J.m4a=K.canPlayType("audio/x-m4a;")||K.canPlayType("audio/aac;")}return J};j.localstorage=function(){try{return !!localStorage.getItem}catch(J){return false}};j.sessionstorage=function(){try{return !!sessionStorage.getItem}catch(J){return false}};j.webWorkers=function(){return !!o.Worker};j.applicationcache=function(){return !!o.applicationCache};j.svg=function(){return !!v.createElementNS&&!!v.createElementNS(I.svg,"svg").createSVGRect};j.inlinesvg=function(){var J=v.createElement("div");J.innerHTML="<svg/>";return(J.firstChild&&J.firstChild.namespaceURI)==I.svg};j.smil=function(){return !!v.createElementNS&&/SVG/.test(y.call(v.createElementNS(I.svg,"animate")))};j.svgclippaths=function(){return !!v.createElementNS&&/SVG/.test(y.call(v.createElementNS(I.svg,"clipPath")))};function s(){H.input=(function(L){for(var K=0,J=L.length;K<J;K++){w[L[K]]=!!(L[K] in g)}return w})("autocomplete autofocus list placeholder max min multiple pattern required step".split(" "));H.inputtypes=(function(M){for(var L=0,K,O,N,J=M.length;L<J;L++){g.setAttribute("type",O=M[L]);K=g.type!=="text";if(K){g.value=E;g.style.cssText="position:absolute;visibility:hidden;";if(/^range$/.test(O)&&g.style.WebkitAppearance!==k){F.appendChild(g);N=v.defaultView;K=N.getComputedStyle&&N.getComputedStyle(g,null).WebkitAppearance!=="textfield"&&(g.offsetHeight!==0);F.removeChild(g)}else{if(/^(search|tel)$/.test(O)){}else{if(/^(url|email)$/.test(O)){K=g.checkValidity&&g.checkValidity()===false}else{if(/^color$/.test(O)){F.appendChild(g);F.offsetWidth;K=g.value!=E;F.removeChild(g)}else{K=g.value!=E}}}}}d[M[L]]=!!K}return d})("search tel url email datetime date month week time datetime-local number range color".split(" "))}for(var i in j){if(p(j,i)){A=i.toLowerCase();H[A]=j[i]();C.push((H[A]?"":"no-")+A)}}if(!H.input){s()}H.crosswindowmessaging=H.postmessage;H.historymanagement=H.history;H.addTest=function(J,K){J=J.toLowerCase();if(H[J]){return}K=!!(K());F.className+=" "+(K?"":"no-")+J;H[J]=K;return H};u("");D=g=null;if(x&&o.attachEvent&&(function(){var J=v.createElement("div");J.innerHTML="<elem></elem>";return J.childNodes.length!==1})()){(function(P,aa){P.iepp=P.iepp||{};var Q=P.iepp,Z=Q.html5elements||"abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",K=Z.split("|"),Y=K.length,X=new RegExp("(^|\\s)("+Z+")","gi"),W=new RegExp("<(/*)("+Z+")","gi"),O=/^\s*[\{\}]\s*$/,J=new RegExp("(^|[^\\n]*?\\s)("+Z+")([^\\n]*)({[\\n\\w\\W]*?})","gi"),M=aa.createDocumentFragment(),U=aa.documentElement,R=U.firstChild,S=aa.createElement("body"),N=aa.createElement("style"),V=/print|all/,T;function L(ac){var ab=-1;while(++ab<Y){ac.createElement(K[ab])}}Q.getCSS=function(af,ad){if(af+""===k){return""}var ac=-1,ab=af.length,ag,ae=[];while(++ac<ab){ag=af[ac];if(ag.disabled){continue}ad=ag.media||ad;if(V.test(ad)){ae.push(Q.getCSS(ag.imports,ad),ag.cssText)}ad="all"}return ae.join("")};Q.parseCSS=function(ac){var ab=[],ad;while((ad=J.exec(ac))!=null){ab.push(((O.exec(ad[1])?"\n":ad[1])+ad[2]+ad[3]).replace(X,"$1.iepp_$2")+ad[4])}return ab.join("\n")};Q.writeHTML=function(){var ac=-1;T=T||aa.body;while(++ac<Y){var ad=aa.getElementsByTagName(K[ac]),ae=ad.length,ab=-1;while(++ab<ae){if(ad[ab].className.indexOf("iepp_")<0){ad[ab].className+=" iepp_"+K[ac]}}}M.appendChild(T);U.appendChild(S);S.className=T.className;S.id=T.id;S.innerHTML=T.innerHTML.replace(W,"<$1font")};Q._beforePrint=function(){N.styleSheet.cssText=Q.parseCSS(Q.getCSS(aa.styleSheets,"all"));Q.writeHTML()};Q.restoreHTML=function(){S.innerHTML="";U.removeChild(S);U.appendChild(T)};Q._afterPrint=function(){Q.restoreHTML();N.styleSheet.cssText=""};L(aa);L(M);if(Q.disablePP){return}R.insertBefore(N,R.firstChild);N.media="print";N.className="iepp-printshim";P.attachEvent("onbeforeprint",Q._beforePrint);P.attachEvent("onafterprint",Q._afterPrint)})(o,v)}H._enableHTML5=x;H._version=e;H.mq=c;H.isEventSupported=t;F.className=F.className.replace(/\bno-js\b/,"")+" js "+C.join(" ");return H})(this,this.document);
+/*yepnope1.0.1|WTFPL*/(function(a,b,c){function H(){var a=z;a.loader={load:G,i:0};return a}function G(a,b,c){var e=b=="c"?r:q;i=0,b=b||"j",u(a)?F(e,a,b,this.i++,d,c):(h.splice(this.i++,0,a),h.length==1&&E());return this}function F(a,c,d,g,j,l){function q(){!o&&A(n.readyState)&&(p.r=o=1,!i&&B(),n.onload=n.onreadystatechange=null,e(function(){m.removeChild(n)},0))}var n=b.createElement(a),o=0,p={t:d,s:c,e:l};n.src=n.data=c,!k&&(n.style.display="none"),n.width=n.height="0",a!="object"&&(n.type=d),n.onload=n.onreadystatechange=q,a=="img"?n.onerror=q:a=="script"&&(n.onerror=function(){p.e=p.r=1,E()}),h.splice(g,0,p),m.insertBefore(n,k?null:f),e(function(){o||(m.removeChild(n),p.r=p.e=o=1,B())},z.errorTimeout)}function E(){var a=h.shift();i=1,a?a.t?e(function(){a.t=="c"?D(a):C(a)},0):(a(),B()):i=0}function D(a){var c=b.createElement("link"),d;c.href=a.s,c.rel="stylesheet",c.type="text/css",!a.e&&(o||j)?function g(a){e(function(){if(!d)try{a.sheet.cssRules.length?(d=1,B()):g(a)}catch(b){b.code==1e3||b.message=="security"||b.message=="denied"?(d=1,e(function(){B()},0)):g(a)}},0)}(c):(c.onload=function(){d||(d=1,e(function(){B()},0))},a.e&&c.onload()),e(function(){d||(d=1,B())},z.errorTimeout),!a.e&&f.parentNode.insertBefore(c,f)}function C(a){var c=b.createElement("script"),d;c.src=a.s,c.onreadystatechange=c.onload=function(){!d&&A(c.readyState)&&(d=1,B(),c.onload=c.onreadystatechange=null)},e(function(){d||(d=1,B())},z.errorTimeout),a.e?c.onload():f.parentNode.insertBefore(c,f)}function B(){var a=1,b=-1;while(h.length- ++b)if(h[b].s&&!(a=h[b].r))break;a&&E()}function A(a){return!a||a=="loaded"||a=="complete"}var d=b.documentElement,e=a.setTimeout,f=b.getElementsByTagName("script")[0],g=({}).toString,h=[],i=0,j="MozAppearance"in d.style,k=j&&!!b.createRange().compareNode,l=j&&!k,m=k?d:f.parentNode,n=a.opera&&g.call(a.opera)=="[object Opera]",o="webkitAppearance"in d.style,p=o&&"async"in b.createElement("script"),q=j?"object":n||p?"img":"script",r=o?"img":q,s=Array.isArray||function(a){return g.call(a)=="[object Array]"},t=function(a){return typeof a=="object"},u=function(a){return typeof a=="string"},v=function(a){return g.call(a)=="[object Function]"},w=[],x={},y,z;z=function(a){function h(a,b){function i(a){if(u(a))g(a,f,b,0,c);else if(t(a))for(h in a)a.hasOwnProperty(h)&&g(a[h],f,b,h,c)}var c=!!a.test,d=c?a.yep:a.nope,e=a.load||a.both,f=a.callback,h;i(d),i(e),a.complete&&b.load(a.complete)}function g(a,b,d,e,g){var h=f(a),i=h.autoCallback;if(!h.bypass){b&&(b=v(b)?b:b[a]||b[e]||b[a.split("/").pop().split("?")[0]]);if(h.instead)return h.instead(a,b,d,e,g);d.load(h.url,h.forceCSS||!h.forceJS&&/css$/.test(h.url)?"c":c,h.noexec),(v(b)||v(i))&&d.load(function(){H(),b&&b(h.origUrl,g,e),i&&i(h.origUrl,g,e)})}}function f(a){var b=a.split("!"),c=w.length,d=b.pop(),e=b.length,f={url:d,origUrl:d,prefixes:b},g,h;for(h=0;h<e;h++)g=x[b[h]],g&&(f=g(f));for(h=0;h<c;h++)f=w[h](f);return f}var b,d,e=this.yepnope.loader;if(u(a))g(a,0,e,0);else if(s(a))for(b=0;b<a.length;b++)d=a[b],u(d)?g(d,0,e,0):s(d)?z(d):t(d)&&h(d,e);else t(a)&&h(a,e)},z.addPrefix=function(a,b){x[a]=b},z.addFilter=function(a){w.push(a)},z.errorTimeout=1e4,b.readyState==null&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",y=function(){b.removeEventListener("DOMContentLoaded",y,0),b.readyState="complete"},0)),a.yepnope=H()})(this,this.document);
diff --git a/public/javascripts/vendor/mbp-respond.min.js b/public/javascripts/vendor/mbp-respond.min.js
new file mode 100644
index 000000000..1e017d255
--- /dev/null
+++ b/public/javascripts/vendor/mbp-respond.min.js
@@ -0,0 +1,7 @@
+/*
+ * respond.js - A small and fast polyfill for min/max-width CSS3 Media Queries
+ * Copyright 2011, Scott Jehl, scottjehl.com
+ * Dual licensed under the MIT or GPL Version 2 licenses. 
+ * Usage: Check out the readme file or github.com/scottjehl/respond
+*/
+(function(e,h){e.respond={};respond.update=function(){};respond.mediaQueriesSupported=h;if(h){return}var u=e.document,r=u.documentElement,i=[],k=[],p=[],o={},g=30,f=u.getElementsByTagName("head")[0]||r,b=f.getElementsByTagName("link"),d=[],a=function(){var B=b,w=B.length;for(var z=0;z<w;z++){var y=B[z],x=y.href,A=y.media,v=y.rel&&y.rel.toLowerCase()==="stylesheet";if(!!x&&v&&!o[x]){if(!/^([a-zA-Z]+?:(\/\/)?(www\.)?)/.test(x)||x.replace(RegExp.$1,"").split("/")[0]===e.location.host){d.push({href:x,media:A})}else{o[x]=true}}}t()},t=function(){if(d.length){var v=d.shift();n(v.href,function(w){m(w,v.href,v.media);o[v.href]=true;t()})}},m=function(G,v,x){var E=G.match(/@media ([^\{]+)\{([\S\s]+?)(?=\}[\s]*\/\*\/mediaquery\*\/)/gmi),H=E&&E.length||0,v=v.substring(0,v.lastIndexOf("/")),w=function(I){return I.replace(/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,"$1"+v+"$2$3")},y=!H&&x;if(v.length){v+="/"}if(y){H=1}for(var B=0;B<H;B++){var C;if(y){C=x;k.push(w(G))}else{C=E[B].match(/@media ([^\{]+)\{([\S\s]+?)$/)&&RegExp.$1;k.push(RegExp.$2&&w(RegExp.$2))}var z=C.split(","),F=z.length;for(var A=0;A<F;A++){var D=z[A];i.push({media:D.match(/(only\s+)?([a-zA-Z]+)(\sand)?/)&&RegExp.$2,rules:k.length-1,minw:D.match(/\(min\-width:[\s]*([\s]*[0-9]+)px[\s]*\)/)&&parseFloat(RegExp.$1),maxw:D.match(/\(max\-width:[\s]*([\s]*[0-9]+)px[\s]*\)/)&&parseFloat(RegExp.$1)})}}j()},l,q,j=function(E){var v="clientWidth",x=r[v],D=u.compatMode==="CSS1Compat"&&x||u.body[v]||x,z={},C=u.createDocumentFragment(),B=b[b.length-1],w=(new Date()).getTime();if(E&&l&&w-l<g){clearTimeout(q);q=setTimeout(j,g);return}else{l=w}for(var y in i){var F=i[y];if(!F.minw&&!F.maxw||(!F.minw||F.minw&&D>=F.minw)&&(!F.maxw||F.maxw&&D<=F.maxw)){if(!z[F.media]){z[F.media]=[]}z[F.media].push(k[F.rules])}}for(var y in p){if(p[y]&&p[y].parentNode===f){f.removeChild(p[y])}}for(var y in z){var G=u.createElement("style"),A=z[y].join("\n");G.type="text/css";G.media=y;if(G.styleSheet){G.styleSheet.cssText=A}else{G.appendChild(u.createTextNode(A))}C.appendChild(G);p.push(G)}f.insertBefore(C,B.nextSibling)},n=function(v,x){var w=c();if(!w){return}w.open("GET",v,true);w.onreadystatechange=function(){if(w.readyState!=4||w.status!=200&&w.status!=304){return}x(w.responseText)};if(w.readyState==4){return}w.send()},c=(function(){var v=false,w=[function(){return new ActiveXObject("Microsoft.XMLHTTP")},function(){return new ActiveXObject("Msxml3.XMLHTTP")},function(){return new ActiveXObject("Msxml2.XMLHTTP")},function(){return new XMLHttpRequest()}],y=w.length;while(y--){try{v=w[y]()}catch(x){continue}break}return function(){return v}})();a();respond.update=a;function s(){j(true)}if(e.addEventListener){e.addEventListener("resize",s,false)}else{if(e.attachEvent){e.attachEvent("onresize",s)}}})(this,(function(f){if(f.matchMedia){return true}var e,i=document,c=i.documentElement,g=c.firstElementChild||c.firstChild,h=!i.body,d=i.body||i.createElement("body"),b=i.createElement("div"),a="only all";b.id="mq-test-1";b.style.cssText="position:absolute;top:-99em";d.appendChild(b);b.innerHTML='_<style media="'+a+'"> #mq-test-1 { width: 9px; }</style>';if(h){c.insertBefore(d,g)}b.removeChild(b.firstChild);e=b.offsetWidth==9;if(h){c.removeChild(d)}else{d.removeChild(b)}return e})(this));
\ No newline at end of file
diff --git a/public/javascripts/widgets/infinite-scroll.js b/public/javascripts/widgets/infinite-scroll.js
index 9dbee19e6..36ca113c5 100644
--- a/public/javascripts/widgets/infinite-scroll.js
+++ b/public/javascripts/widgets/infinite-scroll.js
@@ -19,6 +19,12 @@
         var newPath = pathStr.replace("?", "?only_posts=true&"),
         	lastTime = $('#main_stream .stream_element').last().find(".time").attr("integer");
 
+        if(lastTime === undefined){
+          var currentTime = new Date,
+          unixtimeMs = currentTime.getTime(),
+          lastTime = parseInt(unixtimeMs / 1000);
+        }
+
         return newPath.replace(/max_time=\d+/, "max_time=" + lastTime);
       }
     };
diff --git a/public/stylesheets/sass/mobile.sass b/public/stylesheets/sass/mobile.sass
deleted file mode 100755
index bc2b108b5..000000000
--- a/public/stylesheets/sass/mobile.sass
+++ /dev/null
@@ -1,368 +0,0 @@
-//   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-//   licensed under the Affero General Public License version 3 or later.  See
-//   the COPYRIGHT file.
-
-
-@import "mixins"
-
-$blue: #3F8FBA
-
-a:not([role='button']):not(.arrow)
-  :text
-    :decoration none
-  :font
-    :weight normal !important
-  :-webkit-tap-highlight-color rgba(200, 200, 200, 1) !important
-a.ui-link-inherit
-  :font
-    :weight bold !important
-  :color #000 !important
-
-.ui-body-c a
-  :color #2489CE
-
-#landing_content
-  :text-align center
-
-  .info_pane
-    :text-align left
-#login_form
-  :padding 15px
-  :padding-top 0px
-
-#diaspora_description
-  :background
-    :image url('../images/ball_small.png')
-    :repeat no-repeat
-    :position top center
-
-  :padding
-    :top 195px
-  :margin
-    :top -18px
-
-  :font
-    :size 1.3em
-    :weight bold
-  :text-shadow 0 1px 3px #999
-  :line-height 1.5
-
-  p
-    :padding 12px
-    :background
-      :color #fff
-    :-webkit-box-shadow 0 1px 3px #ccc
-    :-moz-box-shadow 0 1px 3px #ccc
-    :box-shadow 0 1px 3px #ccc
-
-.tapped
-  :background
-    :color rgba(100, 103, 103, .2)
-  :border-radius 5px
-a
-  :padding 2px
-.alpha-warning
-  @include mobile-box
-
-.login_form
-  @include mobile-box
-  :padding 10px
-  label
-    :font-weight bold
-
-.message
-  :padding
-    :left 2px
-.stream_element,
-.comment
-  :overflow auto
-  :position relative
-
-  :background
-    :color #fff
-
-  *
-    :max-width 100%
-
-  :min-height 34px
-
-  .avatar
-    :float left
-    :height 48px
-    :width 48px
-
-  .from
-    a
-      :margin
-        :left -2px
-      :color #000 !important
-      :font
-        :weight bold !important
-
-    :margin-bottom 2px
-
-  .content
-    :padding
-      :left 58px
-
-  :border
-    :bottom 1px solid #eee
-
-  :padding 10px
-
-  .info
-    :margin
-      :top 0.5em
-    :font
-      :size smaller
-
-  .photo_attachments
-    :margin
-      :top 6px
-
-  .time
-    :font
-      :weight normal
-  p
-    :margin 0 auto
-    :line-height 1.4em
-
-  .black
-    :color #333
-    
-.reshare
-  .content
-    :padding
-      :left 15px
-      :top 10px
-    .from
-      :font
-        :style italic
-  .reshare_action
-    :font
-      :size 0.8em
-
-.comment
-  :padding
-    :top 12px
-    :bottom 12px
-
-#main_stream
-  :font
-    :size 0.95em
-
-.stream_element.person
-  .from
-    :font
-      :size larger
-
-.more-link
-  :line-height 4em
-  :text-align center
-
-.time, .via
-  :color #ccc
-  :font
-    :size smaller
-    :weight bold
-  a
-    :color #ccc
-
-.info
-  :font
-    :size smaller
-
-#show_content
-  :padding 12px
-    :bottom 24px
-  :border
-    :bottom 1px solid #bbb
-  :background
-    :color #fff
-
-  :font
-    :size larger
-
-  img
-    :max-width 100%
-
-  .photo
-    :text-align center
-
-  .controls
-    :font
-      :size smaller
-
-  &.photo
-    :background
-      :color #000
-
-#photo_controls
-  :margin
-    :bottom -42px
-
-.arrow
-  :color white !important
-  :font
-    :size 26pt
-  :text
-    :shadow 0 1px 2px #333
-    :decoration none
-  :padding 0
-
-ul
-  :margin 0
-  :padding 0
-  :list
-    :style none
-
-#author_info.show
-  :margin
-    :bottom 24px
-  a
-    :color #000
-    :font
-      :weight bold !important
-
-  img
-    :float left
-    :height 36px
-    :width 36px
-    :margin
-      :right 6px
-
-  :font
-    :size smaller
-
-  .diaspora_handle
-    :font
-      :size 14px
-    :color #999
-
-#author_info.profile
-  :background
-    :color #eee
-  :border
-    :bottom 2px solid #ccc
-  :height 90px
-  :padding 6px
-  :margin
-    :bottom 6px
-
-  img
-    :float left
-    :height 90px
-    :width 90px
-
-  .content
-    :padding
-      :left 100px
-
-  .description
-    :font
-      :weight normal
-      :size small
-    :color #999
-
-.comments
-  :border
-    :top 2px solid #D2DBE1
-  :background
-    :color #EDF5FB
-  :font
-    :size smaller
-
-  .comment
-    :background
-      :color #EDF5FB
-
-.stream_marker
-  :background
-    :color #eee
-  :border
-    :bottom 1px solid #aaa
-    :top 1px solid #ccc
-  :font
-    :weight bold
-    :size smaller
-  :color #666
-  :padding 3px 6px
-
-.right
-  :float right
-  
-.hidden
-  :display none
-
-.grey_back
-  :background
-    :color #eee
-  :border
-    :bottom 1px solid #999
-  :padding 8px
-    :top 3px
-  :margin
-    :bottom 12px
-
-  #publisher
-    :text
-      :align center
-
-#publisher_text
-  :text
-    :align left
-  :font
-    :weight bold
-  :margin
-    :bottom 3px
-
-#aspect_title
-  :padding 0 6px
-    :bottom 6px
-  :font
-    :weight bold
-  :text
-    :align left
-
-#header
-  @include linear-gradient(#222, #000)
-
-  :padding 11px 5px
-    :bottom 7px
-  :border
-    :bottom 1px solid #444
-
-  .right
-    :position absolute
-    :top 0px
-    :padding 6px
-      :top 4px
-    :right 0
-
-#footer
-  :background
-    :color #ccc
-  .inset
-    :padding 10px
-
-.notification_day_header
-  :padding 6px
-  :background
-    :color #eee
-  :border
-    :top 1px solid #ddd
-    :bottom 1px solid #ccc
-  :font
-    :weight bold
-  :color #666
-
-#aspect_header
-  :padding 4px 7px 
-    :bottom 7px
-  :font
-    :weight bold
-  :text
-    :shadow none
-  :background
-    :color #eee
-  :color #999
diff --git a/public/stylesheets/sass/mobile.scss b/public/stylesheets/sass/mobile.scss
new file mode 100644
index 000000000..4b0235ec5
--- /dev/null
+++ b/public/stylesheets/sass/mobile.scss
@@ -0,0 +1,581 @@
+//   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+//   licensed under the Affero General Public License version 3 or later.  See
+//   the COPYRIGHT file.
+
+@import "mixins";
+
+$blue: #3f8fba;
+
+a {
+  color: #2489ce;
+  text: {
+    decoration: none; };
+}
+
+body {
+  background: #555555;
+  max-width: 100%;
+  margin-top: 55px;
+}
+
+.message {
+  padding: {
+    left: 2px; };
+}
+
+#main {
+  text-align: center;
+}
+
+.stream {
+  text-align: left;
+  max-width: 700px;
+}
+
+
+.stream_element,
+.comments {
+  overflow: auto;
+  position: relative;
+  * {
+    max-width: 100%; }
+  min-height: 34px;
+  .avatar {
+    float: left;
+    height: 35px;
+    width: 35px;
+    margin: {
+      right: 10px; }; }
+  .from {
+    a {
+      margin: {
+        left: -2px; };
+      color: #aaaaaa !important;
+      font: {
+        weight: bold !important; }; }
+    margin-bottom: 2px;
+    height: 45px; }
+
+  > .content,
+  .reshare > .content {
+    padding: 10px {
+      bottom: 0; }; }
+  padding: 10px 0;
+  .info {
+    margin: {
+      top: 0; }; }
+  .photo_attachments {
+    margin: {
+      top: 6px; }; }
+  .time {
+    font: {
+      weight: normal; }; }
+  p {
+    margin: 0 auto;
+    font-size: 14px;
+    line-height: 19px; }
+  margin: 10px {
+    top: 10px;
+    bottom: 0; };
+  padding: 0 !important; }
+
+.new_comment {
+  padding: 10px;
+}
+
+.stream_element .comments {
+  padding: 0;
+  margin: 0;
+  top: 8px;
+  width: 100%;
+  .content {
+    padding: 0;
+  }
+
+  .comment {
+    padding: {
+      top: 10px;
+      bottom: 5px;
+    }
+  }
+}
+
+.comment {
+  border: {
+    top: 1px solid #ccc; };
+}
+
+#login_form {
+  @include border-radius(3px);
+  @include box-shadow(0, 1px, 5px, rgba(0, 0, 0, 1));
+  padding: 0;
+  padding-bottom: 10px;
+  background: {
+    color: #fff;
+  }
+
+  margin: auto 20px;
+
+  .login-container {
+    padding: 10px;
+  }
+
+  .row {
+    margin-bottom: 10px;
+    .login-submit {
+      float: right;
+    }
+  }
+
+  .centered{
+    text-align: center;
+  }
+
+  label {
+    color: #ccc;
+    font-size: larger;
+    font-weight: bold;
+  }
+
+  input[type='text'],
+  input[type='password'] {
+    font-size: 18px;
+    font-weight: bold;
+    max-width:90%;
+
+  }
+}
+
+.stream_element {
+  @include border-radius(3px);
+  @include box-shadow(0, 1px, 5px, rgba(0, 0, 0, 1));
+  background: {
+    color: #fff; };
+  border: {
+    bottom: 1px solid black; };
+}
+
+.photo_attachments {
+  position: relative;
+  left: 0;
+  top: 0;
+  padding: 0;
+  margin: 0;
+  img {
+    @include border-radius(3px);
+    margin: 0;
+    padding: 0; } }
+
+
+#main_stream {
+  font: {
+    size: 0.95em; }; }
+
+.from {
+  font: {
+    size: larger; }; }
+
+.more-link {
+  -webkit-box-shadow: inset 0 1px 5px #111, 0 1px 1px #999;
+  display: block;
+  text-align: center;
+  padding: 0 10px;
+  margin: 0 10px;
+  border-radius: 3px;
+  background: {
+    color: #333333; };
+  h1 {
+    color: #cccccc;
+    padding: 20px;
+    text-shadow: 0 -2px 0 black; } }
+
+.info {
+  color: #ccc;
+  font: {
+    size: smaller;
+  };
+}
+
+.via {
+  font: {
+    weight: bold;
+  }
+}
+
+.via {
+  a {
+    color: #ccc; } }
+
+.comment {
+  .time {
+    color: #777; } }
+
+.info {
+  margin: {
+    top: -2px; }; }
+
+#author_info.profile {
+  box-shadow: inset 0 -1px 3px #111;
+  margin-top: -10px;
+  text-align: left;
+
+  h2 {
+    color: #ccc;
+  }
+
+  background: {
+    color: #333; };
+  border: {
+    bottom: 1px solid black; };
+  height: 90px;
+  padding: 10px;
+  margin: {
+    bottom: 6px; };
+  img {
+    float: left;
+    height: 90px;
+    width: 90px;
+    margin: {
+      right: 10px;
+    }
+  }
+  .content {
+    padding: {
+      left: 100px; }; }
+  .description {
+    font: {
+      weight: normal;
+      size: small; };
+    color: #999999; } }
+
+.right {
+  float: right; }
+
+header {
+  @include linear-gradient(#444444, black);
+  @include box-shadow(0,1px,1px,rgba(0,0,0,0.7));
+  width: 100%;
+  position: fixed;
+  z-index: 10;
+  top: 0;
+
+  border: {
+    bottom: 1px solid #222;
+  }
+  padding: 12px 5px;
+  .right {
+    float: right; } }
+
+footer {
+  text-align: center;
+  a,
+  a:visited {
+    color: #999;
+    margin: 10px;
+  }
+  padding: {
+    top: 20px;
+    bottom: 30px;
+  }
+}
+
+.bottom_bar {
+  @include border-radius(0, 0, 3px, 3px);
+  display: block;
+  position: relative;
+  padding: 10px;
+  background: #eeeeee;
+  margin: {
+    top: 10px; };
+  border: {
+    top: 1px solid #dddddd; };
+  min-height: 24px;
+
+  > a,
+  .show_comments {
+    @include transition(color);
+    color: #999;
+    font-weight: bold;
+  }
+
+  .show_comments {
+    position: relative;
+    top: 3px;
+    font: {
+      size: larger;
+    }
+    color: #ccc;
+  }
+
+  a.show_comments {
+    color: #999;
+
+    &.active:not(.bottom_collapse) {
+      color: #444;
+      padding: {
+        right: 14px;
+      }
+      background: {
+        image: url("/images/icons/arrow_down_small.png");
+        position: center right;
+        repeat: no-repeat;
+      }
+    }
+  }
+
+  .show_comments.bottom_collapse {
+    position: absolute;
+    right: 10px;
+    top: 14px;
+    padding: 5px 10px;
+  }
+
+  #bottom_bar_tabs {
+    display: table;
+    width: 100%;
+    text: {
+      align: center;
+    }
+    border: {
+      bottom: 1px solid #ccc;
+    }
+    font: {
+      size: 28px;
+    }
+    color: #ccc;
+
+    .tab {
+      display: table-cell;
+      position:relative;
+      top: -5px;
+
+      border: {
+        right: 1px solid #ccc;
+      }
+
+      &:last-child {
+        border: none;
+      }
+    }
+  }
+}
+
+.floater {
+  float: right; }
+
+.stream_element .photo_attachments {
+  @include border-radius(3px);
+
+  background: {
+    color: #999;
+  }
+  border: {
+    bottom: 1px solid #ccc;
+  }
+
+  img.big-stream-photo {
+    @include border-radius(3px, 3px, 0, 0);
+    width: 100%;
+  }
+  a {
+    padding: 0; }
+  margin-top: 0; }
+
+.photo_area {
+  @include border-radius(3px);
+  text-align: center; }
+
+.image_link {
+  display: inline-block;
+  background: {
+    size: 24px;
+    repeat: no-repeat;
+    position: center; };
+  height: 16px;
+  width: 24px;
+  padding: 5px;
+  margin: {
+    left: 5px; }; }
+
+.like_action {
+  &.inactive{
+    background-image: url("/images/icons/heart_mobile_grey.png");
+  }
+  &.active {
+    background-image: url("/images/icons/heart_mobile_red.png");
+  }
+  &.loading {
+    background-image: url("/images/mobile-spinner.gif");
+  }
+}
+
+.comment_action.image_link {
+  background-image: url("/images/icons/pencil_mobile_grey_active.png");
+
+  &.inactive {
+    background-image: url("/images/icons/pencil_mobile_grey.png");
+  }
+  &.loading {
+    background-image: url("/images/mobile-spinner.gif");
+  }
+}
+
+.compose_icon {
+  position: absolute;
+  top: 8px;
+  right: 15px;
+}
+
+#new_status_message {
+  text-align: left;
+  position: absolute;
+  left: 0;
+  top: 40px;
+  width: 100%;
+
+  fieldset {
+    padding: 10px;
+  }
+
+  #message_container {
+    @include box-shadow(0, 2px, 3px, #999);
+    background-color: #fff;
+    padding: 5px;
+    border: {
+      bottom: 1px solid #999;
+    }
+  }
+
+  textarea {
+    @include border-radius(0);
+    left: 0;
+    border: none;
+    margin: 10px 0;
+    font-size: larger;
+    padding: 0;
+    min-width: 100%;
+  }
+}
+
+textarea {
+  font-size: larger !important;
+}
+
+form {
+  input:not([type='checkbox']),
+  textarea {
+    -webkit-appearance: none;
+    text-size: larger;
+  }
+}
+
+.btn,
+input[type=submit] {
+  @include border-radius(3px);
+  background-color: #ddd;
+  color: #666;
+  font-weight: bold;
+  padding: 10px;
+  border: 1px solid #ccc;
+  min-width: 100px;
+
+  &.action {
+    color: #fff;
+    background-color: green;
+    border: 1px solid #888;
+  }
+}
+
+select {
+  font-size: larger;
+    padding: 7px;
+}
+
+.new_comment {
+  padding: 10px 0;
+  padding-top: 20px;
+
+  textarea {
+    width: 98%;
+  }
+
+  .actions {
+    text-align: right;
+    margin-top: 10px;
+  }
+}
+
+.comment.add_comment_bottom_link_container {
+  position: relative;
+  text-align: center;
+  padding: 25px !important;
+}
+
+.post_stats {
+  position: absolute;
+  font-size: larger;
+  right: 10px;
+  top: 36px;
+  z-index: 2;
+  span {
+    color: #666;
+    font-weight: bold;
+    padding: 2px 7px;
+    margin: 5px 6px;
+    background: {
+      color: #eee;
+    }
+  }
+}
+
+.additional_photo_count {
+  @include opacity(0.5);
+
+  position: absolute;
+  padding: 3px 8px;
+  font-weight: bold;
+  background: #fff;
+  border: 1px solid #222;
+  border-bottom: 2px solid #111;
+  bottom: 10px;
+  right: 10px;
+  line-height: 16px;
+}
+
+header {
+  input {
+    position: absolute;
+    top: 8px;
+    right: 15px;
+    padding: 5px !important;
+    min-width: 75px !important;
+    border: 1px solid #444 !important;
+  }
+}
+
+.new_status_message {
+  min-height: 300px;
+}
+
+.reshare {
+  border-bottom: 1px solid #ccc;
+  padding: {
+    bottom: 10px;
+  }
+  position: relative;
+
+  .reshare_via {
+    width: 100%;
+    position: absolute;
+    bottom: -7px;
+    text-align: center;
+    span {
+      padding: 2px 10px;
+      font-weight: bold;
+      color: #999;
+      background: {
+        color: #fff;
+      }
+    }
+  }
+}
diff --git a/public/stylesheets/vendor/html5-boilerplate-mobile.css b/public/stylesheets/vendor/html5-boilerplate-mobile.css
new file mode 100644
index 000000000..22c33391c
--- /dev/null
+++ b/public/stylesheets/vendor/html5-boilerplate-mobile.css
@@ -0,0 +1,315 @@
+/*
+ * HTML5 ✰ Boilerplate
+ *
+ * What follows is the result of much research on cross-browser styling.
+ * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal,
+ * Kroc Camen, and the H5BP dev community and team.
+ *
+ * Detailed information about this CSS: h5bp.com/css
+ *
+ * ==|== normalize ==========================================================
+ */
+
+
+/* =============================================================================
+   HTML5 display definitions
+   ========================================================================== */
+
+article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { display: block; }
+audio, canvas, video { display: inline-block; *display: inline; *zoom: 1; }
+audio:not([controls]) { display: none; }
+[hidden] { display: none; }
+
+
+/* =============================================================================
+   Base
+   ========================================================================== */
+
+/*
+ * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
+ * 2. Force vertical scrollbar in non-IE
+ * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g
+ */
+
+html { font-size: 100%; overflow-y: scroll; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
+
+body { margin: 0; font-size: 13px; line-height: 1.231; }
+
+body, button, input, select, textarea { font-family: sans-serif; color: #222; }
+
+/*
+ * Remove text-shadow in selection highlight: h5bp.com/i
+ * These selection declarations have to be separate
+ * Also: hot pink! (or customize the background color to match your design)
+ */
+
+::-moz-selection { background: #fe57a1; color: #fff; text-shadow: none; }
+::selection { background: #fe57a1; color: #fff; text-shadow: none; }
+
+
+/* =============================================================================
+   Links
+   ========================================================================== */
+
+a { color: #00e; }
+a:visited { color: #551a8b; }
+a:hover { color: #06e; }
+a:focus { outline: thin dotted; }
+
+/* Improve readability when focused and hovered in all browsers: h5bp.com/h */
+a:hover, a:active { outline: 0; }
+
+
+/* =============================================================================
+   Typography
+   ========================================================================== */
+
+abbr[title] { border-bottom: 1px dotted; }
+
+b, strong { font-weight: bold; }
+
+blockquote { margin: 1em 40px; }
+
+dfn { font-style: italic; }
+
+hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; }
+
+ins { background: #ff9; color: #000; text-decoration: none; }
+
+mark { background: #ff0; color: #000; font-style: italic; font-weight: bold; }
+
+/* Redeclare monospace font family: h5bp.com/j */
+pre, code, kbd, samp { font-family: monospace, serif; _font-family: 'courier new', monospace; font-size: 1em; }
+
+/* Improve readability of pre-formatted text in all browsers */
+pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; }
+
+q { quotes: none; }
+q:before, q:after { content: ""; content: none; }
+
+small { font-size: 85%; }
+
+/* Position subscript and superscript content without affecting line-height: h5bp.com/k */
+sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
+sup { top: -0.5em; }
+sub { bottom: -0.25em; }
+
+
+/* =============================================================================
+   Lists
+   ========================================================================== */
+
+ul, ol { margin: 1em 0; padding: 0 0 0 40px; }
+dd { margin: 0 0 0 40px; }
+nav ul, nav ol { list-style: none; list-style-image: none; margin: 0; padding: 0; }
+
+
+/* =============================================================================
+   Embedded content
+   ========================================================================== */
+
+/*
+ * 1. Improve image quality when scaled in IE7: h5bp.com/d
+ * 2. Remove the gap between images and borders on image containers: h5bp.com/e
+ */
+
+img { border: 0; -ms-interpolation-mode: bicubic; vertical-align: middle; }
+
+/*
+ * Correct overflow not hidden in IE9
+ */
+
+svg:not(:root) { overflow: hidden; }
+
+
+/* =============================================================================
+   Figures
+   ========================================================================== */
+
+figure { margin: 0; }
+
+
+/* =============================================================================
+   Forms
+   ========================================================================== */
+
+form { margin: 0; }
+fieldset { border: 0; margin: 0; padding: 0; }
+
+/* Indicate that 'label' will shift focus to the associated form element */
+label { cursor: pointer; }
+
+/*
+ * 1. Correct color not inheriting in IE6/7/8/9
+ * 2. Correct alignment displayed oddly in IE6/7
+ */
+
+legend { border: 0; *margin-left: -7px; padding: 0; }
+
+/*
+ * 1. Correct font-size not inheriting in all browsers
+ * 2. Remove margins in FF3/4 S5 Chrome
+ * 3. Define consistent vertical alignment display in all browsers
+ */
+
+button, input, select, textarea { font-size: 100%; margin: 0; vertical-align: baseline; *vertical-align: middle; }
+
+/*
+ * 1. Define line-height as normal to match FF3/4 (set using !important in the UA stylesheet)
+ * 2. Correct inner spacing displayed oddly in IE6/7
+ */
+
+button, input { line-height: normal; *overflow: visible; }
+
+/*
+ * Reintroduce inner spacing in 'table' to avoid overlap and whitespace issues in IE6/7
+ */
+
+table button, table input { *overflow: auto; }
+
+/*
+ * 1. Display hand cursor for clickable form elements
+ * 2. Allow styling of clickable form elements in iOS
+ */
+
+button, input[type="button"], input[type="reset"], input[type="submit"], [role="button"] { cursor: pointer; -webkit-appearance: button; }
+
+/*
+ * Consistent box sizing and appearance
+ */
+
+input[type="checkbox"], input[type="radio"] { box-sizing: border-box; padding: 0; }
+input[type="search"] { -webkit-appearance: textfield; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; }
+input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
+
+/*
+ * Remove inner padding and border in FF3/4: h5bp.com/l
+ */
+
+button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
+
+/*
+ * 1. Remove default vertical scrollbar in IE6/7/8/9
+ * 2. Allow only vertical resizing
+ */
+
+textarea { overflow: auto; vertical-align: top; resize: vertical; }
+
+/* Colors for form validity */
+input:valid, textarea:valid {  }
+input:invalid, textarea:invalid { background-color: #f0dddd; }
+
+
+/* =============================================================================
+   Tables
+   ========================================================================== */
+
+table { border-collapse: collapse; border-spacing: 0; }
+td { vertical-align: top; }
+
+
+/* ==|== primary styles =====================================================
+   Author:
+   ========================================================================== */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/*
+ * Media queries for responsive design https://github.com/shichuan/mobile-html5-boilerplate/wiki/The-Style
+ */
+
+
+/* Styles for desktop and large screen ----------- */
+
+/*styles for 800px and up!*/
+@media only screen and (min-width: 800px) {
+  /* Styles */
+}/*/mediaquery*/
+
+
+/* iPhone 4, Opera Mobile 11 and other high pixel ratio devices ----------- */
+@media
+only screen and (-webkit-min-device-pixel-ratio: 1.5),
+only screen and (-o-min-device-pixel-ratio: 3/2),
+only screen and (min--moz-device-pixel-ratio: 1.5),
+only screen and (min-device-pixel-ratio: 1.5) {
+  /* Styles */
+}
+
+
+
+/* ==|== non-semantic helper classes ========================================
+   Please define your styles before this section.
+   ========================================================================== */
+
+/* prevent callout */
+.nocallout {-webkit-touch-callout: none;}
+
+/* Text overflow with ellipsis */
+.ellipsis {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+/* A hack for HTML5 contenteditable attribute on mobile */
+textarea[contenteditable] {-webkit-appearance: none;}
+
+/* A workaround for S60 3.x and 5.0 devices which do not animated gif images if they have been set as display: none */
+.gifhidden {position: absolute; left: -100%;}
+
+/* For image replacement */
+.ir { display: block; border: 0; text-indent: -999em; overflow: hidden; background-color: transparent; background-repeat: no-repeat; text-align: left; direction: ltr; }
+.ir br { display: none; }
+
+/* Hide from both screenreaders and browsers: h5bp.com/u */
+.hidden { display: none !important; visibility: hidden; }
+
+/* Hide only visually, but have it available for screenreaders: h5bp.com/v */
+.visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
+
+/* Extends the .visuallyhidden class to allow the element to be focusable when navigated to via the keyboard: h5bp.com/p */
+.visuallyhidden.focusable:active, .visuallyhidden.focusable:focus { clip: auto; height: auto; margin: 0; overflow: visible; position: static; width: auto; }
+
+/* Hide visually and from screenreaders, but maintain layout */
+.invisible { visibility: hidden; }
+
+/* Contain floats: h5bp.com/q */
+.clearfix:before, .clearfix:after { content: ""; display: table; }
+.clearfix:after { clear: both; }
+.clearfix { *zoom: 1; }
+
+
+
+/* ==|== print styles =======================================================
+   Print styles.
+   Inlined to avoid required HTTP connection: h5bp.com/r
+   ========================================================================== */
+
+@media print {
+  * { background: transparent !important; color: black !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; } /* Black prints faster: h5bp.com/s */
+  a, a:visited { text-decoration: underline; }
+  a[href]:after { content: " (" attr(href) ")"; }
+  abbr[title]:after { content: " (" attr(title) ")"; }
+  .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; }  /* Don't show links for images, or javascript/internal links */
+  pre, blockquote { border: 1px solid #999; page-break-inside: avoid; }
+  thead { display: table-header-group; } /* h5bp.com/t */
+  tr, img { page-break-inside: avoid; }
+  img { max-width: 100% !important; }
+  @page { margin: 0.5cm; }
+  p, h2, h3 { orphans: 3; widows: 3; }
+  h2, h3 { page-break-after: avoid; }
+}
diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb
index e7807873f..e668fe1b2 100644
--- a/spec/controllers/aspects_controller_spec.rb
+++ b/spec/controllers/aspects_controller_spec.rb
@@ -154,18 +154,6 @@ describe AspectsController do
       end
     end
 
-    context "mobile" do
-      it "renders a share button when you don't pass aspect IDs" do
-        get :index, :format => :mobile
-        response.body.should =~ /#{Regexp.escape('id="status_message_submit"')}/
-      end
-      
-      it "renders a share button when you pass aspect IDs" do
-        get :index, :a_ids => [@alices_aspect_1], :format => :mobile
-        response.body.should =~ /#{Regexp.escape('id="status_message_submit"')}/
-      end
-    end
-
     describe 'performance', :performance => true do
       before do
         require 'benchmark'
@@ -357,7 +345,6 @@ describe AspectsController do
     it 'should not 500' do
       get :index, :format => :mobile
       response.should be_success
-
     end
   end
 end
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index e18769861..6207440f7 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -29,7 +29,7 @@ describe CommentsController do
       end
       it 'responds to format mobile' do
         post :create, comment_hash.merge(:format => 'mobile')
-        response.should be_redirect
+        response.should be_success
       end
     end
 
diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb
index 32bc27900..ab3d6a9c3 100644
--- a/spec/controllers/status_messages_controller_spec.rb
+++ b/spec/controllers/status_messages_controller_spec.rb
@@ -65,7 +65,6 @@ describe StatusMessagesController do
         post :create, status_message_hash.merge(:format => 'js')
         json = JSON.parse(response.body)
         save_fixture(json['html'], "created_status_message")
-
       end
 
       it 'escapes XSS' do
@@ -76,6 +75,14 @@ describe StatusMessagesController do
       end
     end
 
+    it 'takes public in aspect ids' do
+      post :create, status_message_hash.merge(:aspect_ids => ['public'])
+    end
+
+    it 'takes all_aspects in aspect ids' do
+      post :create, status_message_hash.merge(:aspect_ids => ['all_aspects'])
+    end
+
     it "dispatches the post to the specified services" do
       s1 = Services::Facebook.new
       alice.services << s1