Changes to Generator to properly support UI custom row layout key