Rearrange some links