Make pretty and add links