Finish chapter 5 - adding layout and routes