Reorganize order of WB New Variant dialog controls