Refactor challenge views and models
Resync