Chapter 5 layout and routes changes