some template fixes