Add remove and complete functionality in place