Improved settings and Contact page