settings page function code style and usage of core styling
Merge branch 'feature/settings-page' into develop