Add todo & more rework on form