Finish layout and routes.
Merge branch 'filling-in-layout'