Added filter system, improved visualization