Chapter 4 changes
Finish layout and routes