Fixes for link widget