finished layout and routes
cleaning up
Merge pull request #2 from i2097i/feature/filling_in_layout

Feature/filling in layout