Updated UI and Controller