Finish layouts and routes
fix confl