Better image/number pickers

Test Plan:
- Use them, my people