Added drawing include and fixed execute/undo.