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