diff --git a/app/assets/javascripts/pagination.js.coffee b/app/assets/javascripts/pagination.js.coffee
index f9d1c14..1ae1daa 100644
--- a/app/assets/javascripts/pagination.js.coffee
+++ b/app/assets/javascripts/pagination.js.coffee
@@ -1,10 +1,16 @@
-jQuery ->
+
+$ ->
   if $('#infinite-scrolling').size() > 0
+    more_posts_url = $('.pagination .next_page a').attr('href')
+    b=$(document).height() - $(window).height() - 60
+    if more_posts_url && $(window).scrollTop() > b
+      $('.pagination').html('<b> Loading...</b>')
+      $.getScript more_posts_url
     $(window).on 'scroll', ->
       more_posts_url = $('.pagination .next_page a').attr('href')
       b=$(document).height() - $(window).height() - 60
       if more_posts_url && $(window).scrollTop() > b
         $('.pagination').html('<b> Loading...</b>')
         $.getScript more_posts_url
-    return
+      return  
   return
\ No newline at end of file
diff --git a/app/controllers/rubriken_controller.rb b/app/controllers/rubriken_controller.rb
index 5e629d7..7e94f1d 100755
--- a/app/controllers/rubriken_controller.rb
+++ b/app/controllers/rubriken_controller.rb
@@ -7,7 +7,7 @@ class RubrikenController < ApplicationController
       @neuigkeiten = Neuigkeit.paginate(page: params[:page], per_page:3)
     else
       @rubriken = Rubrik.where(:public=>true)
-      @neuigkeiten = Neuigkeit.public.recent
+      @neuigkeiten = Neuigkeit.public.published.paginate(page: params[:page], per_page:3)
     end   
     
       @calentries= @rubriken.collect(&:calentries).flatten
diff --git a/app/views/neuigkeiten/_neuigkeit.html.erb b/app/views/neuigkeiten/_neuigkeit.html.erb
index 3f23ff2..e72ca38 100755
--- a/app/views/neuigkeiten/_neuigkeit.html.erb
+++ b/app/views/neuigkeiten/_neuigkeit.html.erb
@@ -1,6 +1,6 @@
 <% if defined?(wrap_in) && !wrap_in.blank? %>
 <%= content_tag wrap_in do %>
-www
+
 <% c =[:linkbox] %>
 <% c << "color-"+neuigkeit.rubrik.color.to_s+"-dark" unless neuigkeit.rubrik.color.nil? %>
 <%= link_to [neuigkeit.rubrik,neuigkeit], {class: c} do %>
diff --git a/app/views/rubriken/show.html.erb b/app/views/rubriken/show.html.erb
index 0ef5b3e..be7f89d 100755
--- a/app/views/rubriken/show.html.erb
+++ b/app/views/rubriken/show.html.erb
@@ -22,9 +22,8 @@
 <ul class="unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
 <% @neuigkeiten.each do |neuigkeit| %>
 
-  <li>
-    <%= render neuigkeit %>
-  </li>
+
+    <%= render neuigkeit, wrap_in: "li" %>
 <% end %>
 </ul>
 
diff --git a/app/views/rubriken/show.js.erb b/app/views/rubriken/show.js.erb
index ab1cfde..632afb1 100644
--- a/app/views/rubriken/show.js.erb
+++ b/app/views/rubriken/show.js.erb
@@ -1,4 +1,4 @@
-$('#neuigkeiten').append('<%= j render @neuigkeiten, :locals => { :wrap_in => :li} %>');
+$('#neuigkeiten').append('<%= j render @neuigkeiten,  :wrap_in => :li %>');
 <% if @neuigkeiten.next_page %>
   $('.pagination').replaceWith('<%= j will_paginate @neuigkeiten %>');
 <% else %>