Added ability to select list on new template