Updated UI and matches
Update