Bug fixes on site settings