further work on settings views
merge conflict