Added more filters via Spinner
Fixed Merge Conflicts