Added design changes and logic for login/signup