More navigator changes