Tidying up and fix ToDo's duplicated tasks bugs