Finish layouts and routes
fic conflicts
fix conflicts1