chapter 5 update
Finish layout and routes