Improve link formatting even more!