Move around and simplify some settings.