Updated UI and added filtering