Finish Layouts and Routes
Merge pull request #1 from Peege151/filling-in-layout

Finish Layouts and Routes