Minor fixes

+ Fixed some string according to the new template