Added more features to the Quiz