Refinements to settings system