Add links and some content reformatting