error messages localized and controller efactored