Rearrange some CSS