Improved the link functionality.