Derek/fix scrolling

Fixes loading problems and moves filter into partial.