Adding localized strings and fixing templates