MG dialog refactored