UX improvements for Edit TODO