Added some navigation stuffs