Fixed layout issues for SingleValueListCell and MultiValueListCell