Hover management and refactoring
Merge pull request #1 from CyberCRI/Interactions

Hover management and refactoring
merge layer branch into master