added span to edit and condition
removed a condition that removes null task is to be not included