Edited some views/logic around Tasks