Finished the new layout and routes