Fixed setting synchronization issue

Moved default settings to CSMSettings::UserSettings.
Other minor code changes / cleanup