#117: i18n on controllers. Minor message changes