finished restructuring of login screen