DAR-811: i18n for components
DAR-946: Code cleanup