added routes and infobox
fixed merge conflicts