Finish layouts and routes
Merged a few files