Merge gil/chosen for overflow:hidden fix