More settings/plugins improvements