Refactor settings rendering
Merge branch 'master' into builds
7.667