Finish layouts and routes
Removing unnecessary file
Merge branch 'filling-in-layout'