Reorganized task templates. Fixes closing tags issues.