Beats.Modal.Dialog refactored