#17043 - update layout of checkbox group