Updated UI and functionality