Tuned advanced/non-advanced settings and changed a few labels