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