improved settings page
Merge branch 'develop'