Latest changes on navigation