Refactored customRow -> customControlGroup