Improving add tasks template