Fix links, change content