modified routes
Finish layout and routes