Merge branch 'Re-organise-settings'

Moves settings together. Fixes #3497