Improvements to quiz-1 layout