diff --git a/app/views/templates/stream_element.ujs b/app/views/templates/stream_element.ujs
index 5a85545e2..a8f057de8 100644
--- a/app/views/templates/stream_element.ujs
+++ b/app/views/templates/stream_element.ujs
@@ -38,13 +38,18 @@
       </div>
 
       <% if(text !== null && text.match(/#nsfw/)) { %>
-        <div class="shield">
-          This post has been flagged as NSFW by its author. 
-        </div>
+        <div class="shield_wrapper">
+          <div class="shield">
+            This post has been flagged as NSFW by its author.
+          </div>
       <% } %>
 
       <div class="post-content"> </div>
 
+      <% if(text !== null && text.match(/#nsfw/)) { %>
+        </div>
+      <% } %>
+
       <div class="info">
         <% if(provider_display_name != null) { %>
           <span class="via">
diff --git a/public/javascripts/app/views/stream_view.js b/public/javascripts/app/views/stream_view.js
index 16189f1f8..ee3a553f5 100644
--- a/public/javascripts/app/views/stream_view.js
+++ b/public/javascripts/app/views/stream_view.js
@@ -32,9 +32,17 @@ App.Views.Stream = Backbone.View.extend({
   loadMore: function(evt) {
     if(evt) { evt.preventDefault(); }
 
+    this.addLoader();
+
     this.collection.fetch({
       add: true,
       success: this.collectionFetched
     });
+  },
+
+  addLoader: function(){
+    this.$("#paginate").html($("<img>", {
+      src : "/images/ajax-loader.gif"
+    }));
   }
 });
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 0b9116ae2..40927acb2 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -3496,9 +3496,16 @@ a.toggle_selector
   :position relative
 
 .shield
+  @include border-radius(3px)
   :z-index 3
   :background-color #eee
   :position absolute
   :width 100%
   :height 100%
   :padding 5px
+  :border 1px solid #ddd
+
+.shield_wrapper
+  :position relative
+  :margin
+    :bottom 15px