SettingsState finished and TextBox added
merge conflict