1) Fixed menu mess. 2) In the process of adding context menu to toolbar