make the picker work with correct form markup

class should not be on control-group