Improve link widget