Up to section 5.2
Finish layout and routes