Finish layout and routes
fix conflicts