Rearrange design