Bug fix to form layouts for control sets.