Finish layout and routes
Merge branch 'filling-in-layout'
5.6 exercise
Merge branch '5.6-exercize'