Finish layout and routes
fix errors