Change page links, move stuff around a bit