Finish filling in layout and routes