reformatted MainController for clarity and consistency
AGPUSH-628: base for Add Variant dialog