Major refactor of login screen