Fixed layout issues on selector cell.
Merge branch 'value-label'