Finished layout and routes pt2