Tweaks to the picker