Scaffolding for settings view
Merge branch 'feature-settings'