Settings updates

- Fixed country code saving
-