fixed contest picker
Cleanup + tests