Improved the picker a bit.