Refactoring a lot the user-settings