Added country field
Improved translation
Improved design