labels saving correctly in settings view
Merge branch 'curtis'