QAART-381 Refactoring VE dialogs