Refactored the event for the Apply button to its own event class.