layout and routes with test errors
Merge branch 'filling-in-layout'