Updated UI and controls