Finish layout and routes
Add local changes
Merge branch 'filling-in-layout'