More improvement on tooltip in the home