A few more minor tweaks to really clean up the picker