some changes from chap. 4
Finish layout and routes