Handlling links a bit better