Rearrange and update dates