Add links and clean up formatting