Handling events on layer level. Disabling event listener while moving.
Code refactoring.