[Sprint 20] fixed menu and login
[Sprint 20] fixed menu and login(2)