improve i18n, fix coupling of view and model
fix merge conflicts