Add links, markup and simplify things