Nav bug fixes