Moved some settings to advanced settings