Updates from middle Chapter 5
Finish layout and routes