Added Custom Template Name, Fixed Create Template