refactor(modaldialog): Iteration 2