Fix rearrange span