Added localization and better form validation