partial commit of Ch. 5
Finish layout and routes