settings view
Merge branch 'workshop-settings'
updates