Filter added, improved ui