Refactored templates and improved translations.