Finished adding routes and layout