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