Added a working navigation