Better formatting of links an references