SEO optimizing and some fix