New dialogs and bug fixes