Changes in components to fix the language...