Changes up to Chapter 5
Finish layout and routes