Few UI and SEO improvements