Improved link functionality