Add mouseover event
Refactor