Restructured default template to troubleshoot and issue