Improving links functionality