Correct Erase problem and remove the State structure
Fuse Paint and Erase buttons