Refactored clicking in event areas

More intuitive