Refactored Modal.