cleaning up login screen
fixing merge