Remove scaffolds, add some links