Clean up and add links