fix layer sequencing
Merge branch 'quiz'