Final changes for translations and formatting