Johnson climbs into top 20 as Donald returns to No. 1 in world ranking