Added some navigation logic.