Beats.Modal Dialog refactored