Improve the settings view and documentation.
Merge branch 'develop'