Revert "Revert "Added links feature""

This reverts commit ef59352e61f9db0190be2d0a95d3400847a3caa1.