Some nav bug fixes