More progress on updating navigation