Removing the hardcoded text and adding i18n keys