Added todos in template