- finished the replacement of '_' symbols throughout the app which conflicted with the _() function used by the i18n