Disabled links UI fixes

Fixes #3017, maybe #3016 

@rperezb