finish Chapter 5.1.3
Finish layout and routes