Fixed some bugs with the template and the localization