added support for Multiple controls on the same row