Added Undo/Redo and new toolbar