chapter 3/4 changes
Finish layout and routes