Put name in data model
Improve quiz component