Refactored the modal to allow for easier expansion for all other events