Finish new layout and routes