Chapter 5 revision back
Chapter 5.3.2 revision
Finishing layout and routes