Finish layout in Chapter 5