Finish majority of layout and routes