Updated UI and login code