some fix on login/logout and start to work on navigation