code 5.2
5.3 finished
Finish layout and routes