use form templates
i18n and cleanup