EHO-206 replaced checkbox with buttons