diff --git a/app/assets/stylesheets/leftnavbar.scss b/app/assets/stylesheets/leftnavbar.scss
index e616aea91..1678a652c 100644
--- a/app/assets/stylesheets/leftnavbar.scss
+++ b/app/assets/stylesheets/leftnavbar.scss
@@ -4,6 +4,7 @@
   ul {
     margin: 0px;
     padding: 0px;
+    list-style: none;
   }
 
   a {
diff --git a/app/controllers/streams_controller.rb b/app/controllers/streams_controller.rb
index 0e4c156ca..924b985eb 100644
--- a/app/controllers/streams_controller.rb
+++ b/app/controllers/streams_controller.rb
@@ -7,6 +7,9 @@ class StreamsController < ApplicationController
   before_action :save_selected_aspects, :only => :aspects
   before_action :redirect_unless_admin, :only => :public
 
+  layout ->(c) { request.format == :mobile ? "application" : "with_header_with_footer" }
+  use_bootstrap_for :aspects, :public, :activity, :multi, :commented, :liked, :mentioned, :followed_tags
+
   respond_to :html,
              :mobile,
              :json
@@ -50,6 +53,7 @@ class StreamsController < ApplicationController
   private
 
   def stream_responder(stream_klass=nil)
+    
     if stream_klass.present?
       @stream ||= stream_klass.new(current_user, :max_time => max_time)
     end
diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml
index 0f0e796e6..0df23125d 100644
--- a/app/views/streams/main_stream.html.haml
+++ b/app/views/streams/main_stream.html.haml
@@ -24,38 +24,40 @@
   %br
   %br
 
-.span-5#leftNavBar
-  #home_user_badge
-    = owner_image_link
-    %h4
-      = link_to current_user.first_name, local_or_remote_person_path(current_user.person)
+.bootstrap_header_padding
+.container
+  .row-fluid
+    .span3#leftNavBar
+      #home_user_badge
+        = owner_image_link
+        %h4
+          = link_to current_user.first_name, local_or_remote_person_path(current_user.person)
 
-  %ul#stream_selection
-    %li{:data => {:stream => 'stream'}}
-      = link_to t("streams.multi.title"), stream_path, :rel => 'backbone', :class => 'hoverable'
-    %li{:data => {:stream => 'activity'}}
-      = link_to t("streams.activity.title"), activity_stream_path, :rel => 'backbone', :class => 'hoverable'
-    %li{:data => {:stream => 'mentions'}}
-      = link_to t('streams.mentions.title'), mentioned_stream_path, :rel => 'backbone', :class => 'hoverable'
-    %li.all_aspects
-      = render 'aspects/aspect_listings', :stream => @stream
-    %li
-      = render 'tags/followed_tags_listings'
+      %ul#stream_selection
+        %li.hoverable{:data => {:stream => 'stream'}}
+          = link_to t("streams.multi.title"), stream_path, :rel => 'backbone'
+        %li.hoverable{:data => {:stream => 'activity'}}
+          = link_to t("streams.activity.title"), activity_stream_path, :rel => 'backbone'
+        %li.hoverable{:data => {:stream => 'mentions'}}
+          = link_to t('streams.mentions.title'), mentioned_stream_path, :rel => 'backbone'
+        %li.all_aspects
+          = render 'aspects/aspect_listings', :stream => @stream
+        %li
+          = render 'tags/followed_tags_listings'
+    
+    .span6
+      #aspect_stream_container.stream_container
+        = render 'aspects/aspect_stream', :stream => @stream
 
+    .span3.rightBar
+      #selected_aspect_contacts.section
+        .title.no_icon
+          %h5.stream_title
+            = @stream.title
+        .content
 
+      = render 'shared/right_sections'
 
-.span-13.append-1
-  #aspect_stream_container.stream_container
-    = render 'aspects/aspect_stream', :stream => @stream
+      %a{:id=>"back-to-top", :title=>"#{t('layouts.application.back_to_top')}", :href=>"#"}
+        &#8679;
 
-.span-5.rightBar.last
-  #selected_aspect_contacts.section
-    .title.no_icon
-      %h5.stream_title
-        = @stream.title
-    .content
-
-  = render 'shared/right_sections'
-
-  %a{:id=>"back-to-top", :title=>"#{t('layouts.application.back_to_top')}", :href=>"#"}
-    &#8679;