Moved some stuff around on the site