add support for links & usability enhancements