Add undo an clean up some mess
Add clear all