Updated UI and interaction