Changing the way the challenge types are stored
Cleaning up the views