#656 - Refactored the internationalizable field and terms and conditions