Zoom box undo/redo working
Code cleanup and fixed access violation