Add links, reshuffle things