Finish layout and routes from chp5