Adding a toolbar to the picker, other changes.