Finish Layout and Routes
Merge branch 'filling-in-layout'