Minor improvements and corrections in some dialogs

Added minor (but important) improvements and corrections in two dialogs.