Added working navigation