Minor template fixes
Minor template fixes

ravimeda/cli,johnbeisner/cli,livarcocc/cli-1,dasMulli/cli,harshjain2/cli,svick/cli,johnbeisner/cli,Faizan2304/cli,harshjain2/cli,ravimeda/cli,svick/cli,svick/cli,harshjain2/cli,livarcocc/cli-1,Faizan2304/cli,ravimeda/cli,Faizan2304/cli,livarcocc/cli-1,johnbeisner/cli,dasMulli/cli,dasMulli/cli