Messi and Mbappe reshape World Cup top scorers