Clean up and simplify the login screen