Better formatting of document-annotations