Refactored added mouseover/mouseleave