Removed expansion animation

(maybe we add this later)

Also, basic filtering approach.