URL optimizations for SEO and minor UI fix