Make the administrative settings form nicer and more translatable.
Merge branch 'refactor' into merge