Finish layout & routes
Merge branch 'filling-in-layout'