Modal dialogs, app fixes