UserSettings refactor