Tooltips integrated

- Tooltips integrated to be used later