Modified some template files