Add tooltips
Improve link builder
Minor improvements