Dialogs fixes