Add better link behaviour
Add better link behaviour