Move some stuff, make sure to use expanded links