Removed the activity indicator again

Messing up the layout
Split filtering model for reuse