Added some navigation features