Updated UI and button functionality