Working on layout ch 5
Finish layout and routes