refactor(modal,dialog): Harmonize $dialog and modal

Closes #128, #13