Added style to Settings page
Merge branch 'feature-settings_style' into development