Some changes with the tooltips