tooltip hides on second click

- tooltip hides on second click
- added some units to cic structure