Fixed sitemap and navigation problems