added support for links (though the design needs some help)