Updated UI and login