Modified layout and routes
Finish layout and routes