Changed some template elements