Fix issues with the picker view. wip.