[REFACTORING] handle mouse moves through events
[MERGE] solved conflicts