Added login screen and bug fixes