Rearrange some sections