Added bubbling and updated Sitemap