New motion template and some template improvements