Refactoring routes and links to match sitemap