Finishing chapter 3
Finish layout and routes