Add numbers to categories to get them displayed in the wanted order in the UI
Change the names of the setting properties as decided in the PR discussion.

Cleanup settings ui #212