New template to display links

also, fixes #1665.