Undo and Redo fix
Refactory ToolBar and MenuBar