more improvements to link rendering