Fix all routes
Merge branches 'master' and 'filling-in-layout'