Finish layouts and pages
routes fix