Fixed how navigation works.