Finished layout and routes
Merge branch 'filling-in-layout'

Merging to join the branch.