Add better link behaviour