nav bug fixes