Controlgroup: finish adding classes option