rearrange some design and text