Some settings changes
Merge branch 'settings'