Added some i18n for profile forms. Minor code cleanup