Added localization, form error handling