Fiiling layout
Finish layouts and routes
Merge branch 'filling-in-layout'