working navigation and fix login issue