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

Fill in layout

stq