Finish layout and routes
:i
:cw
i
Merge branch 'filling-in-layout'