Updated UI and filter