Finish layouts and routes

Slim templates used
Merge branch 'filling-in-layout'