reorganize todos and add items