Added more improvements

Added more improvements about i18n and Spanish translation.