Rearrange components