settings page
Merge branch 'settingsUI'