Make advanced settings UI a bit more intuitive