Refactoring + fixes of visual events.