Adding filters & UI improv