Refactor the user settings
Renamed City to Village