Revamp advanced settings